diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index da0e47e..acaf376 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index da0e47e..acaf376 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Util/RealmConfiguration.swift b/LaserMethane/Util/RealmConfiguration.swift index 54d8b83..1952ee3 100644 --- a/LaserMethane/Util/RealmConfiguration.swift +++ b/LaserMethane/Util/RealmConfiguration.swift @@ -13,6 +13,7 @@ let config = Realm.Configuration() let directory = config.fileURL!.deletingLastPathComponent() let url = directory.appendingPathComponent("inspection.realm") + print("巡检记录本地数据库路径：\(url)") return Realm.Configuration(fileURL: url) } @@ -20,6 +21,7 @@ let config = Realm.Configuration() let directory = config.fileURL!.deletingLastPathComponent() let url = directory.appendingPathComponent("eventTask.realm") + print("事件记录本地数据库路径：\(url)") return Realm.Configuration(fileURL: url) } } diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index da0e47e..acaf376 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Util/RealmConfiguration.swift b/LaserMethane/Util/RealmConfiguration.swift index 54d8b83..1952ee3 100644 --- a/LaserMethane/Util/RealmConfiguration.swift +++ b/LaserMethane/Util/RealmConfiguration.swift @@ -13,6 +13,7 @@ let config = Realm.Configuration() let directory = config.fileURL!.deletingLastPathComponent() let url = directory.appendingPathComponent("inspection.realm") + print("巡检记录本地数据库路径：\(url)") return Realm.Configuration(fileURL: url) } @@ -20,6 +21,7 @@ let config = Realm.Configuration() let directory = config.fileURL!.deletingLastPathComponent() let url = directory.appendingPathComponent("eventTask.realm") + print("事件记录本地数据库路径：\(url)") return Realm.Configuration(fileURL: url) } } diff --git a/LaserMethane/ViewController/Event/SingModeEventDetailViewController.swift b/LaserMethane/ViewController/Event/SingModeEventDetailViewController.swift index 237c91d..74ad1ea 100644 --- a/LaserMethane/ViewController/Event/SingModeEventDetailViewController.swift +++ b/LaserMethane/ViewController/Event/SingModeEventDetailViewController.swift @@ -5,6 +5,7 @@ // Created by 203 on 2021/8/25. // +import DefaultsKit import Kingfisher import UIKit import ZLPhotoBrowser @@ -19,6 +20,7 @@ @IBOutlet var dataLabel: UILabel! @IBOutlet var imageCollectionView: UICollectionView! + private let defaults = Defaults.shared private var createTime: String? private var desc: String? private var maxValue: Int? @@ -56,17 +58,11 @@ imageView.isHidden = true } else { imageView.isHidden = false - // 绑定图片 - /** - /Users/a203/Library/Developer/CoreSimulator/Devices/6D8DE765-161A-4B92-A6A9-D19E3A508484/data/Containers/Data/Application/01FD13DB-5604-46AB-ADA1-B76168902C70/Library/Caches/IMG_20210825141112_2.png, - /Users/a203/Library/Developer/CoreSimulator/Devices/6D8DE765-161A-4B92-A6A9-D19E3A508484/data/Containers/Data/Application/01FD13DB-5604-46AB-ADA1-B76168902C70/Library/Caches/IMG_20210825141112_2.png - */ // 分割逗号并拼接字符串 imageUrlArray.removeAll() - images?.components(separatedBy: ",").forEach { path in - print("图片地址: \(path)") -// imageUrlArray.append(URL(string: path)!) -// imageUrlArray.append(URL(fileURLWithPath: path)) + images?.components(separatedBy: ",").forEach { imageName in + let imageData = defaults.get(for: Key(imageName))! + imageUrlArray.append(imageData.fromLocalImage(imageName: imageName)) } } } diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index da0e47e..acaf376 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Util/RealmConfiguration.swift b/LaserMethane/Util/RealmConfiguration.swift index 54d8b83..1952ee3 100644 --- a/LaserMethane/Util/RealmConfiguration.swift +++ b/LaserMethane/Util/RealmConfiguration.swift @@ -13,6 +13,7 @@ let config = Realm.Configuration() let directory = config.fileURL!.deletingLastPathComponent() let url = directory.appendingPathComponent("inspection.realm") + print("巡检记录本地数据库路径：\(url)") return Realm.Configuration(fileURL: url) } @@ -20,6 +21,7 @@ let config = Realm.Configuration() let directory = config.fileURL!.deletingLastPathComponent() let url = directory.appendingPathComponent("eventTask.realm") + print("事件记录本地数据库路径：\(url)") return Realm.Configuration(fileURL: url) } } diff --git a/LaserMethane/ViewController/Event/SingModeEventDetailViewController.swift b/LaserMethane/ViewController/Event/SingModeEventDetailViewController.swift index 237c91d..74ad1ea 100644 --- a/LaserMethane/ViewController/Event/SingModeEventDetailViewController.swift +++ b/LaserMethane/ViewController/Event/SingModeEventDetailViewController.swift @@ -5,6 +5,7 @@ // Created by 203 on 2021/8/25. // +import DefaultsKit import Kingfisher import UIKit import ZLPhotoBrowser @@ -19,6 +20,7 @@ @IBOutlet var dataLabel: UILabel! @IBOutlet var imageCollectionView: UICollectionView! + private let defaults = Defaults.shared private var createTime: String? private var desc: String? private var maxValue: Int? @@ -56,17 +58,11 @@ imageView.isHidden = true } else { imageView.isHidden = false - // 绑定图片 - /** - /Users/a203/Library/Developer/CoreSimulator/Devices/6D8DE765-161A-4B92-A6A9-D19E3A508484/data/Containers/Data/Application/01FD13DB-5604-46AB-ADA1-B76168902C70/Library/Caches/IMG_20210825141112_2.png, - /Users/a203/Library/Developer/CoreSimulator/Devices/6D8DE765-161A-4B92-A6A9-D19E3A508484/data/Containers/Data/Application/01FD13DB-5604-46AB-ADA1-B76168902C70/Library/Caches/IMG_20210825141112_2.png - */ // 分割逗号并拼接字符串 imageUrlArray.removeAll() - images?.components(separatedBy: ",").forEach { path in - print("图片地址: \(path)") -// imageUrlArray.append(URL(string: path)!) -// imageUrlArray.append(URL(fileURLWithPath: path)) + images?.components(separatedBy: ",").forEach { imageName in + let imageData = defaults.get(for: Key(imageName))! + imageUrlArray.append(imageData.fromLocalImage(imageName: imageName)) } } } diff --git a/LaserMethane/ViewController/Map/SingModeNewEventViewController.swift b/LaserMethane/ViewController/Map/SingModeNewEventViewController.swift index 24addf8..92da9e4 100644 --- a/LaserMethane/ViewController/Map/SingModeNewEventViewController.swift +++ b/LaserMethane/ViewController/Map/SingModeNewEventViewController.swift @@ -6,6 +6,7 @@ // import Alamofire +import DefaultsKit import HXPHPicker import Kingfisher import UIKit @@ -13,6 +14,7 @@ class SingModeNewEventViewController: UIViewController, TransferValueDelegate, UITextFieldDelegate { private let taskShared = EventTaskRealmManager.shared + private let defaults = Defaults.shared private var isWarning: Bool! private var inspectionId: String! private var inspectionName: String! @@ -32,7 +34,7 @@ private let dateformatter = DateFormatter() private var imageUrlArray = [URL]() // 完整的图片url - private var imageArray = [String]() // 上传图片成功后服务器返回的图片数组 + private var imageNameArray = [String]() private var index: Int = 0 private var eventType = "" @@ -190,7 +192,7 @@ lng: longitude!, lat: latitude!, data: eventValueData, - images: imageArray.reformat(), + images: imageNameArray.reformat(), description: eventDesc!, user: "智巡宝" ) @@ -216,10 +218,11 @@ dateformatter.dateFormat = "yyyyMMddHHmmss" let imageName = "IMG_\(dateformatter.string(from: Date()))_\(index).png" - let imageData = image.pngData() - let url = imageData?.fromLocalImage(imageName: imageName) - imageArray.append(url!.path) - imageUrlArray.append(url!) // 用于本地展示 + let imageData = image.pngData()! + imageNameArray.append(imageName) + defaults.set(imageData, for: Key(imageName)) + + imageUrlArray.append((imageData.fromLocalImage(imageName: imageName))) // 用于本地展示 imageCollectionView.reloadData() } } @@ -275,7 +278,7 @@ } @objc func delImageAction(sender: UIButton) { - imageArray.remove(at: sender.tag) + imageNameArray.remove(at: sender.tag) imageUrlArray.remove(at: sender.tag) imageCollectionView.reloadData() }