Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 我的证件

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateResourceUploadVC.swift

@@ -128,14 +128,14 @@ extension YHCertificateResourceUploadVC: UITableViewDelegate, UITableViewDataSou
             let item = items[indexPath.section]
             
             if item.checkStatus == YHCertificateUploadStatus.preUpload { // 待上传
-                showUploadSheetView(item.templateInfo)
+                showUploadSheetView(item)
                 return
             }
             // 非待上传的进入详情
             let vc = YHUploadContentVC()
             vc.orderId = orderId
             vc.categoryInfo = categoryInfo
-            vc.uploadInfo = item
+            vc.supplementInfo = item
             self.navigationController?.pushViewController(vc)
         }
     }
@@ -223,29 +223,92 @@ extension YHCertificateResourceUploadVC {
         }
     }
     
-    func showUploadSheetView(_ template: YHTemplateInfo) {
+    func uploadImage(_ img: UIImage, supplementInfo:YHSupplementInfo)  {
+        
+        // 先OSS上传得到URL
+        YHHUD.show(.progress(message: "上传中..."))
+        self.viewModel.uploadImage(img) {
+            [weak self] url, error in
+            guard let self = self else { return }
+            YHHUD.hide()
+            if let url = url, !url.isEmpty {
+                let imgName = url.lastPathComponent
+                var suffix = "jpg"
+                let suffixName = url.pathExtension.lowercased()
+                if !suffixName.isEmpty {
+                    suffix = suffixName
+                }
+                
+                // 再调用业务接口
+                let model = YHContentUrl()
+                model.name = imgName
+                model.url = url
+                model.suffix = suffix
+                self.viewModel.updateCertificateItem(supplementId:supplementInfo.id, urlModel:model, operation: "add", rename: "") {
+                    self.requestList(status: self.status)
+                }
+                return
+            }
+            //
+            var msg = "上传图片失败"
+            if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
+                msg = errorMsg
+            }
+            YHHUD.flash(message: msg)
+        }
+    }
+    
+    func uploadFile(_ fileUrl:URL, supplementInfo:YHSupplementInfo) {
+        if let fileData = try? Data(contentsOf: fileUrl) {
+            // 将文件数据上传到服务器
+            let size = String(format: "%.2fM", Double(fileData.count)/(1024.0 * 1024.0))
+            print("\(size)")
+            // 先OSS上传得到URL
+            self.viewModel.uploadFile(fileUrl.absoluteString) {
+                [weak self] successUrl, error in
+                guard let self = self else { return }
+                
+                // 再调用业务接口
+                if let successUrl = successUrl, !successUrl.isEmpty {
+                    let fileName = successUrl.lastPathComponent
+                    let suffixName = successUrl.pathExtension.lowercased()
+                    let model = YHContentUrl()
+                    model.name = fileName
+                    model.url = successUrl
+                    model.suffix = suffixName
+                    self.viewModel.updateCertificateItem(supplementId:supplementInfo.id, urlModel:model, operation: "add", rename: "") {
+                        self.requestList(status:self.status)
+                    }
+                    return
+                }
+                var msg = "上传图片失败"
+                if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
+                    msg = errorMsg
+                }
+                YHHUD.flash(message: msg)
+
+            }
+        } else {
+            YHHUD.flash(message: "识别文件失败")
+        }
+    }
+    
+    func showUploadSheetView(_ supplementInfo: YHSupplementInfo) {
         
          let sheetView = YHCertificateUploadSheetView.sheetView
-         sheetView.templateInfo = template
+        sheetView.templateInfo = supplementInfo.templateInfo
          sheetView.uploadFilesBlock = {
-             [weak self] fileUrl in
-             guard let self = self else { return }
-             print(fileUrl)
-             if let fileData = try? Data(contentsOf: fileUrl) {
-                 // 将文件数据上传到服务器
-                 let size = String(format: "%.2fM", Double(fileData.count)/(1024.0 * 1024.0))
-                 print("\(size)")
-                 self.viewModel.uploadFile(fileUrl.absoluteString) {[weak self] success, error in
-                     guard let self = self else { return }
-
-                 }
-             }
-         }
-         sheetView.uploadImageBlock = {
-             [weak self] image in
-             guard let self = self else { return }
-//             uploadImage(image)
-         }
-         sheetView.show()
+            [weak self] fileUrl in
+            guard let self = self else { return }
+            print(fileUrl)
+            uploadFile(fileUrl, supplementInfo: supplementInfo)
+        }
+        sheetView.uploadImageBlock = {
+            [weak self] image in
+            guard let self = self else { return }
+            uploadImage(image, supplementInfo: supplementInfo)
+        }
+        sheetView.show()
     }
+    
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateTemplateSheetView.swift

@@ -239,6 +239,12 @@ extension YHCertificateTemplateSheetView: UITableViewDelegate, UITableViewDataSo
         return cell
     }
     
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if 0 <= indexPath.row && indexPath.row < templateArr.count {
+            let path = templateArr[indexPath.row]
+        }
+    }
+    
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 82.0
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateUploadSheetView.swift

@@ -253,6 +253,33 @@ extension YHCertificateUploadSheetView: UITableViewDelegate, UITableViewDataSour
         return cell
     }
     
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        if indexPath.section == 0 { // 模版列表
+            if 0 <= indexPath.row && indexPath.row < templateArr.count {
+                let path = templateArr[indexPath.row]
+            }
+             
+        } else if indexPath.section == 1 { // 操作列表
+            
+            if 0 <= indexPath.row && indexPath.row < uploadTypeArr.count {
+                let operationItem = uploadTypeArr[indexPath.row]
+                if operationItem.type == .cancel {
+                    dismiss()
+                    
+                } else if operationItem.type == .photo {
+                    selectPhoto()
+                
+                } else if operationItem.type == .camera {
+                    takePhoto()
+                
+                } else if operationItem.type == .phoneFile {
+                    selectFile()
+                }
+            }
+        }
+    }
+    
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == 0 {
             return 82.0
@@ -364,6 +391,7 @@ extension YHCertificateUploadSheetView: (UIImagePickerControllerDelegate & UINav
 
         } else {
             printLog("pick image wrong")
+            self.dismiss()
         }
         // 收回图库选择界面
         picker.dismiss(animated: true, completion: nil)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/VM/YHCertificateViewModel.swift

@@ -198,4 +198,76 @@ class YHCertificateViewModel: YHBaseViewModel {
             callBack(false, err)
         }
     }
+    
+    // 更改证件
+    // operation参数必填，必须是：add(上传)、del（删除）、rename（重命名）
+    func updateCertificateItem(supplementId:Int, urlModel: YHContentUrl, operation:String, rename:String, callBack:(()->())?) {
+        
+        var name = urlModel.name
+        if operation == "rename" {
+            name = rename
+        }
+        let dic:[String : Any] = [
+                "id" : supplementId,
+                "content_url": [
+                    "name": name,
+                    "url": urlModel.url,
+                    "suffix": urlModel.suffix]]
+        let params: [String: Any] = [
+            "file_info" : [dic],
+            "operation" : operation,
+        ]
+    
+        YHHUD.show(.progress(message: "数据加载中..."))
+        self.updateCertificates(params: params) {
+            
+            [weak self] success, error in
+            YHHUD.hide()
+            
+            guard let self = self else { return }
+            
+            if operation == "del" {
+                if success {
+                    YHHUD.flash(message: "删除成功")
+                } else {
+                    var msg = "删除失败"
+                    if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
+                        msg = errorMsg
+                    }
+                    YHHUD.flash(message:msg)
+                }
+                callBack?()
+                return
+            }
+                 
+           if operation == "rename" {
+
+                if success {
+                    YHHUD.flash(message: "重命名成功")
+                } else {
+                    var msg = "重命名失败"
+                    if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
+                        msg = errorMsg
+                    }
+                    YHHUD.flash(message:msg)
+                }
+               callBack?()
+                return
+            }
+            
+            if operation == "add" {
+                if success {
+                    YHHUD.flash(message: "添加成功")
+                } else {
+                    var msg = "添加失败"
+                    if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
+                        msg = errorMsg
+                    }
+                    YHHUD.flash(message:msg)
+                }
+                callBack?()
+                return
+            }
+        }
+    }
 }