Merge branch 'branch_1.0.1' of gitlab.huolea.com:lmi/shorthandmaster into branch_1.0.1

ShorthandMaster/Record/Model/SHRecordModel.swift

@@ -26,9 +26,9 @@ class SHRecordModel: NSObject{
     //录音时间 估算
     @objc var during: NSInteger = 0
     //照片资源
-    @objc var images: [String] = []
+//    @objc var images: [UIImage] = []
     @objc var imagesPath: [String] = []
-    @objc var imagesIndex: [String] = []
+    @objc var imagesIndex: [NSInteger] = []
     
     @objc var selected: Bool = false
     @objc var icloud: Bool = false

ShorthandMaster/Record/SHRecordShowViewController.swift

@@ -52,20 +52,12 @@ class SHRecordShowViewController: SHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-//        AVAudioSession.sharedInstance().requestRecordPermission { (allowed) in
-//            if !allowed {
-//                return
-//             }
-//        }
-//        let session:AVAudioSession = AVAudioSession.sharedInstance()
-//        do {
-//            try session.setCategory(AVAudioSession.Category.playAndRecord, options: .defaultToSpeaker)
-//        }catch{
-//            print("session config failed")
-//        }
-//
-//        do { try AVAudioSession.sharedInstance().setActive(true) }
-//        catch { print("session active failed") }
+        for path in model!.imagesPath{
+            let s = DocumentPath+path
+            if let image = UIImage.init(contentsOfFile: s){
+                
+            }
+        }
         
         setupUI()
         play()

ShorthandMaster/Record/SHRecordViewController.swift

@@ -48,7 +48,10 @@ class SHRecordViewController: SHBaseViewController{
     var wav_file_path = DocumentPath.appending("/record.wav")
     var mp3_file_path = DocumentPath.appending("/record.mp3")
     var pcm_file_path = DocumentPath.appending("/xbMixData.caf")
-    var images_file_path:[String] = []
+    
+    var image_file_path = ""
+    var image_file_paths: [String] = []
+    var image_indexs: [NSInteger] = []
 
     var session:AVAudioSession {
         let session:AVAudioSession = AVAudioSession.sharedInstance()
@@ -333,6 +336,7 @@ class SHRecordViewController: SHBaseViewController{
         let subFile = Date().format("yyyyMMdd")
         var exist = false
         let time = Date.init().timeStamp
+        
         for (_, documentsFile) in fileArr!.enumerated() {
          
             if documentsFile == DocumentPath.appending("/\(subFile)")  {
@@ -341,6 +345,8 @@ class SHRecordViewController: SHBaseViewController{
                 mp3_file_path = "/"+subFile+time+"/record.mp3"
                 pcm_file_path = "/"+subFile+time+"/xbMixData.caf"
                 
+                image_file_path = "/"+subFile+time+"/"
+   
                 try! fileManager.createDirectory(atPath: path, withIntermediateDirectories: true, attributes: nil)
                 
                 recorder_mp3.configMp3Path(DocumentPath+mp3_file_path, pcmPath: DocumentPath+pcm_file_path)
@@ -355,6 +361,8 @@ class SHRecordViewController: SHBaseViewController{
             mp3_file_path = "/"+subFile+time+"/record.mp3"
             pcm_file_path = "/"+subFile+time+"/xbMixData.caf"
             
+            image_file_path = "/"+subFile+time+"/"
+
             try! fileManager.createDirectory(atPath: path, withIntermediateDirectories: true, attributes: nil)
             
             recorder_mp3.configMp3Path(DocumentPath+mp3_file_path, pcmPath: DocumentPath+pcm_file_path)
@@ -489,6 +497,20 @@ class SHRecordViewController: SHBaseViewController{
         model.pcmPathFile = pcm_file_path
         model.during = seconds
         
+        image_file_paths = []
+        image_indexs = []
+        let images = ["recordlist_no_data_search", "recordlist_no_data"]
+        for (index, imageStr) in images.enumerated(){
+            let image = UIImage.init(named: imageStr)
+            let filePath = DocumentPath+image_file_path+"\(index).jpeg"
+            let imageData = image!.jpegData(compressionQuality: 1)
+            try? imageData?.write(to: URL(fileURLWithPath: filePath))
+            image_file_paths.append(image_file_path+"\(index).jpeg")
+            image_indexs.append(index)
+        }
+        model.imagesPath = image_file_paths
+        model.imagesIndex = image_indexs
+        
         var contains = false
         if folderModel.dataSources.count != 0 {
             

ShorthandMaster/Share/Managers/SHCloudManager.swift

@@ -142,6 +142,29 @@ class SHCloudManager: NSObject {
                         let asset = record["recordAsset"] as! CKAsset
                         recordModel.assetFileUrlPath = asset.fileURL?.path ?? ""
                         
+                        recordModel.imagesIndex = record["imagesIndex"] as? Array<NSInteger> ?? []
+                        recordModel.imagesPath = record["imagesPath"] as? Array<String> ?? []
+                        let assets = record["imagesAsset"] as? [CKAsset] ?? []
+                        for (index, asset) in assets.enumerated(){
+                            if index > recordModel.imagesIndex.count-1 {
+                                break
+                            }
+                            if index > recordModel.imagesPath.count-1 {
+                                break
+                            }
+                            let path = recordModel.imagesPath[index]
+                            var filePath = path.components(separatedBy: "/")[1]
+                            filePath = DocumentPath+"/"+filePath
+//                            if let image = UIImage.init(contentsOfFile: asset.fileURL!.path){
+//                                recordModel.images.append(image)
+//                            }
+                            if FileManager.default.fileExists(atPath: filePath) == false {
+                                if let imageData = try? Data(contentsOf: asset.fileURL!){
+                                    try! FileManager.default.createDirectory(atPath: filePath, withIntermediateDirectories: true, attributes: nil)
+                                    try? imageData.write(to: URL(fileURLWithPath: DocumentPath+path))
+                                }
+                            }
+                        }
                         folderModel.dataSources.append(recordModel)
                     }
                 }
@@ -210,9 +233,16 @@ class SHCloudManager: NSObject {
             record.setValue(nowDate, forKey: "modifyDate")
             record.setValue(asset, forKey: "recordAsset")
             
-            for image in recordModel.images {
-                
+            record.setValue(recordModel.imagesIndex, forKey: "imagesIndex")
+            record.setValue(recordModel.imagesPath, forKey: "imagesPath")
+            var imageAssets:[CKAsset] = []
+            for path in recordModel.imagesPath {
+                let imageFile = DocumentPath.appending(path)
+                let url = URL.init(fileURLWithPath: imageFile)
+                let asset = CKAsset.init(fileURL: url)
+                imageAssets.append(asset)
             }
+            record.setValue(imageAssets, forKey: "imagesAsset")
             
             dateBase.save(record) { (subscription, saveError) in
                 if let error = saveError {