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

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  内存泄露问题
  //  上传文件UI展示异常
  // 文件清单
  // 文件清单

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/C/YHFileListViewController.swift

@@ -17,7 +17,8 @@ class YHFileListViewController: YHBaseViewController {
     
     var orderId : Int?
     private let certificateReqVM : YHCertificateViewModel = YHCertificateViewModel()
-    
+    let viewModel: YHCertificateViewModel = YHCertificateViewModel()
+
     private lazy var headView : YHFileListHeaerView = {
         let view = YHFileListHeaerView()
         view.backgroundColor = .clear
@@ -31,7 +32,7 @@ class YHFileListViewController: YHBaseViewController {
            [weak self] in
            guard let self = self else { return }
            self.navigationController?.popToRootViewController(animated: true)
-           goTabBarBy(tabType: .service)
+           self.goToTabService()
        }
        return view
     }()
@@ -48,7 +49,6 @@ class YHFileListViewController: YHBaseViewController {
         view.backgroundColor = .white
         view.layer.cornerRadius = kCornerRadius12
         view.clipsToBounds = true
-        view.orderId = self.orderId ?? 0
         return view
     }()
     
@@ -69,6 +69,13 @@ class YHFileListViewController: YHBaseViewController {
         loadData2()
         
         NotificationCenter.default.addObserver(self, selector: #selector(refreshListData), name: YhConstant.YhNotification.refreshCertificateFileListNotifiction, object: nil)
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(didClickFileListItem(_:)), name: YhConstant.YhNotification.clickCertificateFileListItemNotifiction, object: nil)
+        
+    }
+    
+    func goToTabService() {
+        goTabBarBy(tabType: .service)
     }
     
     deinit {
@@ -115,7 +122,6 @@ extension YHFileListViewController {
                         }
                     }
                     self.emptyView.isHidden = isHaveData
-                    
                     let r = self.myContentView.bounds
                     self.myContentView.frame = CGRect(x: kMargin, y: 217, width: KScreenWidth - 2*kMargin, height: r.height)
                     
@@ -152,7 +158,7 @@ extension YHFileListViewController {
     
     
     func setupUI() {
-        gk_navTitle = "文件清单"
+        gk_navTitle = "待完善清单"
         gk_navBarAlpha = 1.0
         gk_navBackgroundColor = .white
         
@@ -164,7 +170,9 @@ extension YHFileListViewController {
             make.height.equalTo(YHFileListBottomView.viewH)
         }
         
-        bottomView.block = { [self] flag in
+        bottomView.block = {
+            [weak self] flag in
+            guard let self = self else { return }
             if flag == 1 {
                 YHHUD.show(.progress(message: "正在生成图片"))
                 if let image = self.captureScrollView(scrollView: self.myScrollView) {
@@ -248,3 +256,47 @@ extension YHFileListViewController {
         YHHUD.flash(message: "保存成功")
     }
 }
+
+extension YHFileListViewController {
+    
+    // 点击文件清单
+    @objc func didClickFileListItem(_ notification: Notification) {
+        
+        guard let userInfo = notification.userInfo else {
+            return
+        }
+        
+        guard let supplementId = userInfo["supplementId"] as? Int,
+              let categoryId = userInfo["categoryId"] as? Int,
+              let checkStatus = userInfo["checkStatus"] as? Int  else {
+            
+            printLog("参数不全")
+            return
+        }
+        
+        printLog("点击文件清单：\(userInfo)")
+        
+        if checkStatus == YHCertificateUploadStatus.preUpload.rawValue { // 待上传
+            self.viewModel.showUploadSheetView(supplementId: supplementId) {
+                [weak self] in
+                guard let self = self else { return }
+                DispatchQueue.main.async {
+                    let vc = YHCertificateUploadContentListVC()
+                    vc.orderId = self.orderId ?? 0
+                    vc.categoryId = categoryId
+                    vc.supplementId = supplementId
+                    self.navigationController?.pushViewController(vc)
+                }
+                self.loadData()
+                self.loadData2()
+            }
+            return
+        }
+        // 非待上传的进入详情
+        let vc = YHCertificateUploadContentListVC()
+        vc.orderId = self.orderId ?? 0
+        vc.categoryId = categoryId
+        vc.supplementId = supplementId
+        self.navigationController?.pushViewController(vc)
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListContentView.swift

@@ -9,9 +9,7 @@
 import UIKit
 
 class YHFileListContentView: UIView {
-    
-    var orderId: Int = 0
-    
+        
     override init(frame: CGRect) {
         super.init(frame: frame)
         initView()
@@ -74,14 +72,7 @@ extension YHFileListContentView {
         var lastView : UIView?
         for (index,item) in arrData.enumerated() {
             if let iii = item {
-                if iii.type == 0, iii.supplement_list.count <= 0 {
-                    continue
-                }
                 var view : UIView = YHFileListItemsView()
-                if view is YHFileListItemsView {
-                    let targetView = view as! YHFileListItemsView
-                    targetView.orderId = self.orderId
-                }
                 if iii.type == 0 {
                     (view as! YHFileListItemsView).dataModel = item
                 } else  {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListItemView.swift

@@ -166,6 +166,7 @@ extension YHFileListItemView {
     }
     
     @objc func didItemViewClicked() {
+        printLog("点击文件清单@")
         clickBlock?(self.dataModel)
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListItemsView.swift

@@ -8,11 +8,12 @@
 
 import UIKit
 
+let kSupplementIdKey = "supplementId"
+let kCheckStatusKey = "checkStatus"
+let kCategoryIdKey = "categoryId"
+
 class YHFileListItemsView: UIView {
-    
-    var orderId:Int = 0
-    var viewModel: YHCertificateViewModel = YHCertificateViewModel()
-  
+      
     override init(frame: CGRect) {
         super.init(frame: frame)
     }
@@ -43,11 +44,6 @@ class YHFileListItemsView: UIView {
         lable0.textAlignment = .center
         return lable0
     }()
-    
-    
-    
-    
-    
 }
 
 private extension YHFileListItemsView {
@@ -138,9 +134,14 @@ private extension YHFileListItemsView {
             view.myIndex = index
             view.dataModel = item
             view.clickBlock = {
-                [weak self] model in
-                guard let self = self else { return }
-                self.handleClickDataModel(model)
+                model in
+                let supplementId = model?.id ?? 0
+                let categoryId = self.dataModel?.category_id ?? 0
+                let checkStatus = model?.checkStatus ?? -1
+                let dict = [kSupplementIdKey: supplementId,
+                            kCategoryIdKey: categoryId,
+                            kCheckStatusKey: checkStatus]
+                NotificationCenter.default.post(name: YhConstant.YhNotification.clickCertificateFileListItemNotifiction, object: nil, userInfo: dict)
             }
             holdView.addSubview(view)
             
@@ -167,37 +168,5 @@ private extension YHFileListItemsView {
     }
 }
 
-private extension YHFileListItemsView {
-    
-    func handleClickDataModel(_ targetModel: YHSupplementInfo?) {
-        
-        guard let model = targetModel else {
-            return
-        }
-        
-        if model.checkStatus == YHCertificateUploadStatus.preUpload.rawValue { // 待上传
-            showUploadSheetView(supplementId: model.id)
-            return
-        }
-        // 非待上传的进入详情
-        let vc = YHCertificateUploadContentListVC()
-        vc.orderId = self.orderId
-        vc.categoryId = self.dataModel?.category_id ?? 0
-        vc.supplementId = model.id
-        UIViewController.current?.navigationController?.pushViewController(vc)
-    }
-    
-    func showUploadSheetView(supplementId: Int) {
-        self.viewModel.showUploadSheetView(supplementId: supplementId) {
-            DispatchQueue.main.async {
-                let vc = YHCertificateUploadContentListVC()
-                vc.orderId = self.orderId
-                vc.categoryId = self.dataModel?.category_id ?? 0
-                vc.supplementId = supplementId
-                UIViewController.current?.navigationController?.pushViewController(vc)
-            }
-        }
-    }
-}
 
 

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

@@ -34,9 +34,9 @@ enum YHCertificateUploadStatus : Int {
 
 
 class YHCertificateViewModel: YHBaseViewModel {
+    
     var certificateEntryModel : YHCertificateEntryModel?
     var arrQuestionAndAnswer : [YHQuestionAndAnswerModel?] = []
-    
     var arrFileListData : [YHFileListModel?] = []
     
     
@@ -238,7 +238,7 @@ class YHCertificateViewModel: YHBaseViewModel {
 extension YHCertificateViewModel {
     
     func showUploadSheetView(supplementId: Int, completion:(()->())?) {
-                
+        
         let sheetView = YHCertificateUploadSheetView.sheetView()
         sheetView.maxSelectCount = 9
         sheetView.uploadFilesBlock = {

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -217,6 +217,9 @@ extension YhConstant {
         
         // 刷新证件文件列表通知
         public static let refreshCertificateFileListNotifiction = Notification.Name(rawValue: "com.yinhe.certificate.updateFileList")
+        
+        // 点击文件清单条目通知
+        public static let clickCertificateFileListItemNotifiction = Notification.Name(rawValue: "com.yinhe.certificate.clickFileListItem")
 
     }
 }

galaxy/galaxy/Classes/Tools/Upload/YHOSSManager.swift

@@ -104,7 +104,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
                     callBackBlock(string, YHErrorModel())
                 }
                 return
-            }).waitUntilFinished()
+            })
         }
     }
     
@@ -148,7 +148,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
                     callBackBlock(string, YHErrorModel())
                 }
                 return
-            }).waitUntilFinished()
+            })
         }
     }
     
@@ -179,7 +179,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
                     callBackBlock(string, YHErrorModel())
                 }
                 return
-            }).waitUntilFinished()
+            })
         }
     }