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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailEVisaViewController.swift

@@ -87,7 +87,8 @@ class YHResignCertificateDetailEVisaViewController: YHBaseViewController {
         if file.count != 0 {
             let eVisa: [String: Any] = ["name": file.first?.fileName ?? "",
                                         "e_visa_url": file.first?.fileUrl ?? "",
-                                        "upload_at": file.first?.uploadedAt ?? ""]
+                                        "upload_at": file.first?.uploadedAt ?? "",
+                                        "submit": true]
             let params : [String : Any] = [
                 "eVisa": eVisa,
                 "id": data.id

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailHkViewController.swift

@@ -167,6 +167,24 @@ class YHResignCertificateDetailHkViewController: YHBaseViewController {
         }
         return true
     }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        if dataModel.cert_info.is_show {
+            
+        } else {
+            YHAdopterCardExampleView.exampleView(type: .travel).show()
+            let hkPassPort: [String: Any] = ["is_show": true,
+                                             "submit": false
+                                             ]
+            let params : [String : Any] = [
+                "hkPassPort": hkPassPort,
+                "id":dataModel.id
+            ]
+            viewModel.submitResignCertificateUpdate(params) { success, error in
+            }
+        }
+    }
 }
 
 
@@ -185,7 +203,9 @@ private extension YHResignCertificateDetailHkViewController {
                                         "img_back": urls[1],
                                         "validate_start": self.viewModel.dataModel.cert_info.validate_start,
                                         "validate_end": self.viewModel.dataModel.cert_info.validate_end,
-                                        "sign_type": "D"]
+                                        "sign_type": "D",
+                                        "submit": true,
+                                        "is_show": true]
         let params : [String : Any] = [
             "hkPassPort": hkPassPort,
             "id": dataModel.id
@@ -227,9 +247,9 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
         cell.firstLabelName = "港澳通行证正面"
         cell.lastLabelName = "港澳通行证倍面"
         cell.failString = failString
-        cell.urls = urls
         cell.data = data
         cell.dataModel = dataModel
+        cell.urls = urls
         cell.urlBlock = { [weak self] url, index in
             guard let self = self else { return }
             self.urls[index] = url

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailPassPortViewController.swift

@@ -152,6 +152,24 @@ class YHResignCertificateDetailPassPortViewController: YHBaseViewController {
         }
         return true
     }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        if dataModel.cert_info.is_show {
+            
+        } else {
+            YHAdopterCardExampleView.exampleView(type: .chinaTravel).show()
+            let passPort: [String: Any] = ["is_show": true,
+                                             "submit": false
+                                             ]
+            let params : [String : Any] = [
+                "passPort": passPort,
+                "id":dataModel.id
+            ]
+            viewModel.submitResignCertificateUpdate(params) { success, error in
+            }
+        }
+    }
 }
 
 
@@ -167,7 +185,9 @@ private extension YHResignCertificateDetailPassPortViewController {
         let passPort: [String: Any] = ["name": "护照",
                                        "issue_start": self.viewModel.dataModel.cert_info.issue_start,
                                        "issue_end": self.viewModel.dataModel.cert_info.issue_end,
-                                       "img_front": urls[0]]
+                                       "img_front": urls[0],
+                                       "submit": true,
+                                       "is_show": true]
         let params : [String : Any] = [
             "passPort": passPort,
             "id": dataModel.id
@@ -207,10 +227,10 @@ extension YHResignCertificateDetailPassPortViewController: UITableViewDelegate,
         let cell = tableView.dequeueReusableCell(withIdentifier: YHResignCertificatePassportTableViewCell.cellReuseIdentifier, for: indexPath) as! YHResignCertificatePassportTableViewCell
         cell.firstImageName = "service_adopter_card_china_travel_front"
         cell.firstLabelName = "护照资料页"
+        cell.dataModel = dataModel
         cell.failString = failString
         cell.urls = urls
         cell.data = data
-        cell.dataModel = dataModel
         cell.urlBlock = { [weak self] url, index in
             guard let self = self else { return }
             self.urls[index] = url

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailViewController.swift

@@ -149,6 +149,26 @@ class YHResignCertificateDetailViewController: YHBaseViewController {
         }
         return data
     }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        if dataModel.cert_info.is_show {
+            
+        } else {
+            if detailType == .SmallWhiteNote {
+                submitSmallWhiteBarInfo()
+                let smallWhiteBar: [String: Any] = ["is_show": true,
+                                                    "submit": false
+                                                    ]
+                let params : [String : Any] = [
+                    "smallWhiteBar": smallWhiteBar,
+                    "id":dataModel.id
+                ]
+                viewModel.submitResignCertificateUpdate(params) { success, error in
+                }
+            }
+        }
+    }
 }
 
 // MARK: - 私有方法
@@ -220,7 +240,9 @@ private extension YHResignCertificateDetailViewController {
         let smallWhiteBar: [String: Any] = ["name": "小白条",
                                             "small_white_note_url":uploadImageUrl,
                                             "small_white_note_validity_start":startDateStr,
-                                            "small_white_note_validity_end":endDateStr
+                                            "small_white_note_validity_end":endDateStr,
+                                            "submit": true,
+                                            "is_show": true
                                             ]
         let params : [String : Any] = [
             "smallWhiteBar": smallWhiteBar,
@@ -239,7 +261,8 @@ private extension YHResignCertificateDetailViewController {
     
     func submitHKIDCarInfo() {
         let hkIdCard: [String: Any] = ["name": "香港身份证",
-                                       "idcard_url":uploadImageUrl]
+                                       "idcard_url":uploadImageUrl,
+                                       "submit": true]
         let params : [String : Any] = [
             "hkIdCard": hkIdCard,
             "id":dataModel.id

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/M/YHResignCertificateModel.swift

@@ -63,6 +63,7 @@ class YHResignCertificateInfoModel: SmartCodable {
     var validate_end: String = ""
 
     var is_show: Bool = false
+    var submit: Bool = true
     required init() {
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificateHKTableViewCell.swift

@@ -133,6 +133,11 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                             make.height.equalTo(52)
                         }
                     }
+                    if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
+                        failString = ""
+                    } else {
+                        failString = "有效期不足，需要为\(self.dataModel.valid_date)或以后"
+                    }
                 }
                 if item.id == .id3 {
                     signBeginView.dataSource = item
@@ -157,6 +162,11 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                             make.height.equalTo(52)
                         }
                     }
+                    if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
+                        failString = ""
+                    } else {
+                        failString = "有效期不足，需要为\(self.dataModel.valid_date)或以后"
+                    }
                 }
             }
         }
@@ -419,7 +429,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
             if let block = self.block {
                 block(model)
                 if self.compareDates(dateString1: model.message ?? "", dateString2: self.dataModel.valid_date) {
-                    
+                    failString = ""
                 } else {
                     failString = "有效期不足，需要为\(self.dataModel.valid_date)或以后"
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificatePassportTableViewCell.swift

@@ -100,6 +100,11 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
                             make.height.equalTo(52)
                         }
                     }
+                    if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
+                        failString = ""
+                    } else {
+                        failString = "有效期不足，需要为\(self.dataModel.valid_date)或以后"
+                    }
                 }
             }
         }
@@ -312,7 +317,7 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
             if let block = self.block {
                 block(model)
                 if self.compareDates(dateString1: model.message ?? "", dateString2: self.dataModel.valid_date) {
-                    
+                    failString = ""
                 } else {
                     failString = "有效期不足，需要为\(self.dataModel.valid_date)或以后"
                 }

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

@@ -28,7 +28,7 @@ extension YHJsApi {
         }
     }
     
-    //3、展示图片组
+    //2、展示图片组
     @objc func showPicsSyn(_ dicPics: String) {
         DispatchQueue.main.async {
             if let data = dicPics.data(using: .utf8) {
@@ -56,17 +56,6 @@ extension YHJsApi {
         }
     }
     
-    //2、设置app导航栏隐藏、显示
-    @objc func setAppNavigation(_ tag : Any) {
-        let tmp : Bool = tag as? Bool ?? false
-        DispatchQueue.main.async {
-            if let delegate = self.delegate as? YHH5WebViewVC {
-                delegate.setAppNavigation(tmp)
-            }
-            
-        }
-    }
-    
     //1、保存图片到本地
     @objc func saveLocalPictureSyn(_ picUrl: String) {
         DispatchQueue.main.async {