上传旅行证件相关bug修复

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/C/YHResignUploadTravelHKViewController.swift

@@ -97,15 +97,14 @@ class YHResignUploadTravelHKViewController: YHBaseViewController {
     func getTextWithType(type: Int, date:String) -> ASAttributedString  {
         
         if type ==  0 {
-           return .init("上传《港澳通行证》(需有效期≥\(date))", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
+           return .init("上传《港澳通行证》(背面逗留D签注有效期≥\(date))", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
         }
         
         if type == 1 {
-            let a = ASAttributedString.init("办理逗留D签注延期（有效期≥签证时长）", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor50))
+            let a = ASAttributedString.init("点击查看办理逗留D签注延期", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor50))
             let b = ASAttributedString.init("《", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.brandMainColor))
             let c = ASAttributedString.init("港澳通行证逗留（D）签注延期-办理指引", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.brandMainColor), .underline(.single), .action {
                 //跳转提示
-                YHHUD.flash(message: "弹窗提示")
                 let view = YHResignUploadTravelGuideView.sheetView()
                 view.show()
             })
@@ -141,17 +140,26 @@ class YHResignUploadTravelHKViewController: YHBaseViewController {
             // 头部提示
             tipsArr = getTipsWithType(date: self.dataModel.latest_validaty_date)
             tableView.reloadData()
-            
         }
-        // travel_cert_type 证件类型 0-未知 1-护照 3-港澳通行证
-        // nationality : Int = -1  国籍 1-中国 2-国外
-        
+    }
+    
+    func updateAllViews() {
+        if dataModel.img_front.count != 0 {
+            urls[0] = dataModel.img_front
+        }
+        if dataModel.img_back.count != 0 {
+            urls[1] = dataModel.img_back
+        }
+        self.data = viewModel.getBaseDataSource(isShowPrompt)
+        // 头部提示
+        tipsArr = getTipsWithType(date: self.dataModel.latest_validaty_date)
+        tableView.reloadData()
     }
     
     @objc func didSaveBtnClicked() {
         if !checkInfo() {
             isShowPrompt = true
-            updateData()
+            updateAllViews()
             return
         }
         
@@ -160,11 +168,11 @@ class YHResignUploadTravelHKViewController: YHBaseViewController {
     
     func checkInfo() -> Bool {
         if urls.first?.count == 0 {
-            failString = "请港澳通行证正面"
+            failString = "请上传港澳通行证正面"
             return false
         }
         if urls.last?.count == 0 {
-            failString = "请港澳通行证背面"
+            failString = "请上传港澳通行证反面"
             return false
         }
         if self.viewModel.dataModel.issue_start.count == 0 {
@@ -244,7 +252,7 @@ extension YHResignUploadTravelHKViewController: UITableViewDelegate, UITableView
         cell.firstImageName = "service_adopter_card_travel_front"
         cell.lastImageName = "service_adopter_card_travel_back"
         cell.firstLabelName = "港澳通行证正面"
-        cell.lastLabelName = "港澳通行证倍面"
+        cell.lastLabelName = "港澳通行证反面"
         cell.dataModel = dataModel
         cell.failString = failString
         cell.data = data
@@ -265,26 +273,29 @@ extension YHResignUploadTravelHKViewController: UITableViewDelegate, UITableView
                             if !result.end_of_term.isEmpty {
                                 self.dataModel.issue_end = result.end_of_term
                             }
+                            self.failString = ""
                         } else {
                             // OCR 无法识别
-                            self.failString = "非逗留(D)签证，请检查文件"
+                            self.failString = "非逗留(D）签证，请核查文件"
                         }
-                        self.updateData()
+                        self.updateAllViews()
                     }
                 } else {
                     self.viewModel.getHKCardBackInfoByOcr(url, isBack: 1) { success, result in
                         YHHUD.hide()
                         if success, let result = result {
-                            if !result.back_term_begins.isEmpty {                                    self.dataModel.visa_start = result.back_term_begins
+                            if !result.back_term_begins.isEmpty {
+                                self.dataModel.visa_start = result.back_term_begins
                             }
                             if !result.back_end_of_term.isEmpty {
                                 self.dataModel.visa_end = result.back_end_of_term
                             }
+                            self.failString = ""
                         } else {
                             // OCR 无法识别
-                            self.failString = "非逗留(D)签证，请检查文件"
+                            self.failString = "非逗留(D）签证，请核查文件"
                         }
-                        self.updateData()
+                        self.updateAllViews()
                     }
                 }
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/C/YHResignUploadTravelPassportViewController.swift

@@ -98,7 +98,7 @@ class YHResignUploadTravelPassportViewController: YHBaseViewController {
     func getTextWithType(type: Int, date:String) -> ASAttributedString  {
         
         if type ==  0 {
-           return .init("上传《护照》(需有效期≥最新签证逗留截止日)", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
+           return .init("上传《护照》(需有效期≥\(date))", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
         }
         
         return .init("", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
@@ -132,10 +132,20 @@ class YHResignUploadTravelPassportViewController: YHBaseViewController {
         
     }
     
+    func updateAllViews() {
+        if dataModel.img_front.count != 0 {
+            urls[0] = dataModel.img_front
+        }
+        self.data = viewModel.getPassPortDataSource(isShowPrompt)
+        // 头部提示
+        tipsArr = getTipsWithType(date: self.dataModel.latest_validaty_date)
+        tableView.reloadData()
+    }
+    
     @objc func didSaveBtnClicked() {
         if !checkInfo() {
             isShowPrompt = true
-            updateData()
+            updateAllViews()
             return
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelGuideView.swift

@@ -176,7 +176,7 @@ private extension YHResignUploadTravelGuideView {
     func setButtonEnable(_ enable : Bool) {
         rewardBtn.isEnabled = enable
         if enable {
-            rewardBtn.setTitle("我已知悉，确认", for: .normal)
+            rewardBtn.setTitle("知道了", for: .normal)
             rewardBtn.backgroundColor = UIColor.brandMainColor
         } else {
             rewardBtn.setTitle("请上滑看完指引后操作（5s）", for: .normal)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelHKTableViewCell.swift

@@ -65,6 +65,24 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
     var urls: [String]? {
         didSet {
             guard let firstUrl = urls?.first, firstUrl.count != 0 else {
+                guard let lastUrl = urls?.last, lastUrl.count != 0 else {
+                    cardLabel.isHidden = true
+                    signLabel.isHidden = true
+                    cardBeginView.isHidden = true
+                    cardEndView.isHidden = true
+                    signBeginView.isHidden = true
+                    signEndView.isHidden = true
+                    return
+                }
+                self.lastUrl = lastUrl
+                self.viewModel.getPublicImageUrl(lastUrl) {[weak self] success, error in
+                    guard let self = self else { return }
+                    guard let url = success else { return }
+                    self.backSurfaceImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
+                        self.backSurfaceDeleteButton.isHidden = false
+                    })
+                    self.backSurfaceImageButton.setContent("", "")
+                }
                 cardLabel.isHidden = true
                 signLabel.isHidden = true
                 cardBeginView.isHidden = true
@@ -494,7 +512,9 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
             if let block = self.block {
                 block(model)
                 if self.compareDates(dateString1: model.message ?? "", dateString2: self.dataModel.latest_validaty_date) {
-    
+                    if failString == "签注有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后" {
+                        failString = ""
+                    }
                 } else {
                     failString = "签注有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后"
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelPassportTableViewCell.swift

@@ -307,7 +307,9 @@ class YHResignUploadTravelPassportTableViewCell: UITableViewCell {
             if let block = self.block {
                 block(model)
                 if self.compareDates(dateString1: model.message ?? "", dateString2: self.dataModel.latest_validaty_date) {
-                    failString = ""
+                    if failString == "有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后" {
+                        failString = ""
+                    }
                 } else {
                     failString = "有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后"
                 }