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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/C/YHResignMaterialListVC.swift

@@ -10,8 +10,9 @@ import UIKit
 import JXSegmentedView
 
 class YHResignMaterialListVC: YHBaseViewController {
-
+    // 订单id
     var orderId: Int = 0
+    // 批次id
     var id: Int = 0
     var viewModel: YHResignMaterialViewModel = YHResignMaterialViewModel()
     
@@ -137,11 +138,16 @@ extension YHResignMaterialListVC: UITableViewDelegate, UITableViewDataSource {
             let list = items[indexPath.section]
             if 0 <= indexPath.row, indexPath.row < list.materials.count {
                 let item = list.materials[indexPath.row]
-                
-//                if item.status == YHMaterialStatus.preUpload.rawValue { // 待上传
-//                    //  showUploadSheetView(supplementId:item.id)
-//                    return
-//                }
+                if item.status == YHMaterialStatus.preUpload.rawValue { // 待上传
+                    self.showUploadSheetView(item) {
+                        let vc = YHResignMaterialUploadVC()
+                        vc.materialId = item.id
+                        vc.orderId = self.orderId
+                        vc.id = self.id
+                        self.navigationController?.pushViewController(vc)
+                    }
+                    return
+                }
                 // 非待上传的进入详情
                 let vc = YHResignMaterialUploadVC()
                 vc.materialId = item.id
@@ -220,3 +226,32 @@ extension YHResignMaterialListVC: JXSegmentedListContainerViewListDelegate {
         return view
     }
 }
+
+extension YHResignMaterialListVC {
+    
+    func showUploadSheetView(_ material:YHMaterialModel, _ success: (()->())?) {
+        let sheetView = YHCertificateUploadSheetView.sheetView()
+        sheetView.maxSelectImageCount = 9
+        sheetView.uploadFilesBlock = {
+            [weak self] fileUrl in
+            guard let self = self else { return }
+            print(fileUrl)
+            
+            self.viewModel.uploadFilesWithMaterial(material:material, fileUrl: fileUrl) {
+                [weak self] in
+                guard let self = self else { return }
+                success?()
+            }
+        }
+        sheetView.uploadImageBlock = {
+            [weak self] targetImgArr in
+            guard let self = self else { return }
+            self.viewModel.uploadImageArr(targetImgArr, material: material) {
+                [weak self] in
+                guard let self = self else { return }
+                success?()
+            }
+        }
+        sheetView.show()
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/C/YHResignMaterialUploadVC.swift

@@ -13,8 +13,10 @@ import AttributedString
 class YHResignMaterialUploadVC: YHBaseViewController {
 
     // 进入该页面以下三个参数必传
-    var orderId : Int = 0
-    var id : Int = 0
+    // 订单id
+    var orderId: Int = 0
+    // 批次id
+    var id: Int = 0
     var materialId : Int = 0
     
     var materialModel: YHMaterialModel = YHMaterialModel() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/C/YHResinMaterialManageContainerVC.swift

@@ -13,8 +13,9 @@ class YHResinMaterialManageContainerVC: YHBaseViewController {
     
     static let segmentHeight = 40.0
     let viewModel = YHResignMaterialViewModel()
-    
+    // 订单id
     var orderId: Int = 151336
+    // 批次id
     var id: Int = 351
     
     var titles = ["全部", "待上传(0)", "已驳回(0)", "审核中(0)", "已完成(0)"]