// 原则批

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleUploadListVC.swift

@@ -298,6 +298,18 @@ extension YHPrincipleUploadListVC {
             }
         }.show()
     }
+    
+    func showUploadSheetView(supplementId: Int, completion:(()->())?) {
+        
+        let sheetView = YHCertificateUploadSheetView.sheetView()
+        sheetView.maxSelectCount = 9
+        sheetView.uploadImageBlock = {
+            [weak self] targetImgArr in
+            guard let self = self else { return }
+            
+        }
+        sheetView.show()
+    }
 }
 
 extension YHPrincipleUploadListVC: UITableViewDelegate, UITableViewDataSource {
@@ -359,6 +371,24 @@ extension YHPrincipleUploadListVC: UITableViewDelegate, UITableViewDataSource {
                     guard let self = self else { return }
                     self.showFileOperationAlertView(index, itemModel: model)
                 }
+                // 上传文件点击
+                cell.uploadBtnClick = {
+                    [weak self] selectModel in
+                    guard let self = self else { return }
+                    YHImagePickerView.show() {[weak self] image in
+                        guard let self = self else { return }
+                        let item = YHSelectImageItem()
+                        item.name = "999.png"
+                        item.data = image
+                        let arr = [item]
+                        self.viewModel.uploadImageArr(arr) {
+                            resultArr in
+                            
+                            model.content_url.append(contentsOf: resultArr)
+                            self.tableView.reloadData()
+                        }
+                    }
+                }
                 return cell
             }
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/M/YHPrincipleUploadModel.swift

@@ -62,7 +62,7 @@ class YHPrincipleNameExtraModel: SmartCodable  {
 class YHPrincipleContentUrlModel: SmartCodable  {
     var name: String = ""
     var url: String = ""
-    var type: Int = 0
+    var type: Int = 1
     var fileUrl: String = ""
     var updated_at: String = ""
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/V/YHPrincipleUploadFileCell.swift

@@ -20,6 +20,7 @@ class YHPrincipleUploadFileCell: UITableViewCell {
     var timeLabel: UILabel!
     var editBtn: UIButton!
     var editBlock: ((YHPrincipleContentUrlModel)->())?
+    
     var isShowEditBtn: Bool = false {
         didSet {
             editBtn.isHidden = !isShowEditBtn

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/V/YHPrincipleUploadStatusCell.swift

@@ -32,6 +32,8 @@ class YHPrincipleUploadStatusCell: UITableViewCell {
     var expandClick:((Bool)->())?
     var fileEditBlock:((YHPrincipleContentUrlModel, Int) -> ())?
     
+    var uploadBtnClick:((YHPrincipleAgreementModel?)->())?
+
 //    var status: YHPrincipleUploadStatus = .preUpload
     let viewModel = YHPrincleViewModel()
     
@@ -149,7 +151,7 @@ class YHPrincipleUploadStatusCell: UITableViewCell {
     }
     
     @objc func didClickUploadBtn() {
-        
+        uploadBtnClick?(self.itemModel)
     }
     
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -440,9 +442,9 @@ extension YHPrincipleUploadStatusCell: UITableViewDataSource, UITableViewDelegat
                 cell.isShowEditBtn = false
             }
             cell.editBlock = {
-                [weak self] model in
+                [weak self] selectModel in
                 guard let self = self else { return }
-                self.fileEditBlock?(model, indexPath.section)
+                self.fileEditBlock?(selectModel, indexPath.section)
             }
         }
         return cell

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/VM/YHPrincleViewModel.swift

@@ -112,9 +112,8 @@ class YHPrincleViewModel: YHBaseViewModel {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Principle.getIsSendMail
         let params: [String : Any] = ["order_id": orderId]
-        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
+        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { json, code in
             //1. json字符串 转 对象
-            guard let self = self else { return }
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
@@ -139,7 +138,8 @@ class YHPrincleViewModel: YHBaseViewModel {
         let params: [String : Any] = ["file_list" : arr]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Principle.uploadFiles
 
-        let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
+        let _ = YHNetRequest.postRequest(url: strUrl, params: params) {
+            json, code in
             //1. json字符串 转 对象
             printLog("model 是 ==> \(json)")
             
@@ -156,46 +156,111 @@ class YHPrincleViewModel: YHBaseViewModel {
         }
     }
     
-    func getEnvelopModel() -> YHPrincipleEnvelopeModel {
-        let model = YHPrincipleEnvelopeModel()
-        model.name = "黄金龙"
-        model.sex = 1
-        model.date = "2024-12-12"
-        return model
-    }
-    
-    func getTestModel() -> YHPrincipleWaitResultModel {
+    func uploadImageArr(_ targetImgArr:[YHSelectImageItem], successBlock:(([YHPrincipleContentUrlModel])->())?)  {
         
-        var files: [YHFileNumberList] = []
-        let m = YHFileNumberList()
-        m.applicationName = "杜宇"
-        m.fileNumber = "23412-AVAVS-SADFAS"
-        let m2 = YHFileNumberList()
-        m2.applicationName = "宇"
-        m2.fileNumber = "23412-AVAVS-SADFAS"
-        files.append(m)
-        files.append(m2)
-
-        var imgs: [YHResultImageList] = []
-        let n = YHResultImageList()
-        n.applicationName = "嘟嘟"
-        let n1 = YHResultImageList()
-        n1.applicationName = "嘟嘟"
-        let n2 = YHResultImageList()
-        n2.applicationName = "嘟嘟"
-        imgs.append(n)
-        imgs.append(n1)
-        imgs.append(n2)
+        let ossGroup = DispatchGroup()
+        var ossArr:[YHPrincipleContentUrlModel] = []
 
-        let applicant = YHApplicant()
-        applicant.userName = "哈哈哈"
+        YHHUD.show(.progress(message: "上传中..."))
+        // 先将所有图片组上传到OSS
+        for item in targetImgArr {
+            if let image = item.data {
+                ossGroup.enter()
+                self.uploadImage(image, imageName:item.name) {
+                    success, urlModel in
+                    if success, let model = urlModel {
+                        ossArr.append(model)
+                    }
+                    ossGroup.leave()
+                }
+            }
+        }
+        
+        // 再将OSS上传信息组上传到服务器
+        ossGroup.notify(queue: .main) {
+            YHHUD.hide()
+            if ossArr.count <= 0 {
+                YHHUD.flash(message: "上传失败")
+                successBlock?([])
+                return
+            }
+            successBlock?(ossArr)
+        }
+     }
+    
+    func uploadImage(_ img: UIImage, imageName:String, callBack:((Bool, YHPrincipleContentUrlModel?)->())?)  {
         
-        let model = YHPrincipleWaitResultModel(lastQueryAt: "2024-12-01 23:34:12",
-                                               queryCount: 40,
-                                               fileNumberList: files,
-                                               resultImageList: imgs,
-                                               applicant: applicant,
-                                               applicationFileNumberAttachment: "你要死啊")
-        return model
+        // 先OSS上传得到URL
+        self.uploadImage(img) {
+            url, error in
+            if let url = url, !url.isEmpty {
+                var suffix = "jpg"
+                let suffixName = url.pathExtension.lowercased()
+                if !suffixName.isEmpty {
+                    suffix = suffixName
+                }
+                
+                // 再调用业务接口
+                let model = YHPrincipleContentUrlModel()
+                model.name = imageName
+                model.url = url
+                model.fileUrl = url
+                
+                let dateFormatter = DateFormatter()
+                dateFormatter.dateFormat = "HH:mm:ss"
+                let dateString = dateFormatter.string(from: Date())
+                model.updated_at = dateString
+                
+                callBack?(true, model)
+                
+            } else {
+                callBack?(false, nil)
+            }
+        }
     }
+    
+//    func getEnvelopModel() -> YHPrincipleEnvelopeModel {
+//        let model = YHPrincipleEnvelopeModel()
+//        model.name = "黄金龙"
+//        model.sex = 1
+//        model.date = "2024-12-12"
+//        return model
+//    }
+//    
+//    func getTestModel() -> YHPrincipleWaitResultModel {
+//        
+//        var files: [YHFileNumberList] = []
+//        let m = YHFileNumberList()
+//        m.applicationName = "杜宇"
+//        m.fileNumber = "23412-AVAVS-SADFAS"
+//        let m2 = YHFileNumberList()
+//        m2.applicationName = "宇"
+//        m2.fileNumber = "23412-AVAVS-SADFAS"
+//        files.append(m)
+//        files.append(m2)
+//
+//        var imgs: [YHResultImageList] = []
+//        let n = YHResultImageList()
+//        n.applicationName = "嘟嘟"
+//        let n1 = YHResultImageList()
+//        n1.applicationName = "嘟嘟"
+//        let n2 = YHResultImageList()
+//        n2.applicationName = "嘟嘟"
+//        imgs.append(n)
+//        imgs.append(n1)
+//        imgs.append(n2)
+//
+//        let applicant = YHApplicant()
+//        applicant.userName = "哈哈哈"
+//        
+//        let model = YHPrincipleWaitResultModel(lastQueryAt: "2024-12-01 23:34:12",
+//                                               queryCount: 40,
+//                                               fileNumberList: files,
+//                                               resultImageList: imgs,
+//                                               applicant: applicant,
+//                                               applicationFileNumberAttachment: "你要死啊")
+//        return model
+//    }
+//    
+    
 }