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

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

@@ -350,6 +350,7 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
             } else {
                 self.dataModel.cert_info.img_back = ""
             }
+            self.updateData()
         }
         cell.block = {[weak self] model in
             guard let self = self else { return }

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

@@ -277,6 +277,7 @@ extension YHResignCertificateDetailPassPortViewController: UITableViewDelegate,
             if index == 0 {
                 self.dataModel.cert_info.img_front = ""
             }
+            self.updateData()
         }
         cell.block = {[weak self] model in
             guard let self = self else { return }

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

@@ -70,6 +70,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
     var urls: [String]? {
         didSet {
             guard let firstUrl = urls?.first, firstUrl.count != 0 else {
+                guard let lastUrl = urls?.last, lastUrl.count != 0 else {
                     cerInfoLabel.isHidden = true
                     cerNumberView.isHidden = true
                     cerSignPlaceView.isHidden = true
@@ -79,7 +80,17 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                     cardEndView.isHidden = true
                     signBeginView.isHidden = true
                     signEndView.isHidden = true
-                guard let lastUrl = urls?.last, lastUrl.count != 0 else { return }
+                    return
+                }
+                cerInfoLabel.isHidden = false
+                cerNumberView.isHidden = false
+                cerSignPlaceView.isHidden = false
+                cardLabel.isHidden = false
+                signLabel.isHidden = false
+                cardBeginView.isHidden = false
+                cardEndView.isHidden = false
+                signBeginView.isHidden = false
+                signEndView.isHidden = false
                 self.lastUrl = lastUrl
                 self.viewModel.getPublicImageUrl(lastUrl) {[weak self] success, error in
                     guard let self = self else { return }
@@ -155,9 +166,11 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                     if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
                         failString = ""
                     } else {
+                        if item.message != "" {
                             failString = "卡片有效期不足，需要为\(self.dataModel.valid_date)或以后"
                         }
                     }
+                }
                 if item.id == .id3 { // 签注有效期开始时间
                     signBeginView.dataSource = item
                     if isShow && message.count == 0 && isNeed {
@@ -189,10 +202,12 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                         if failString == "卡片有效期不足，需要为\(self.dataModel.valid_date)或以后" {
                             
                         } else {
+                            if item.message != "" {
                                 failString = "签注有效期不足，需要为\(self.dataModel.sign_valid_date)或以后"
                             }
                         }
                     }
+                }
                 
                 if item.id == .id36 { // 证件信息 证件号码
                     cerNumberView.dataSource = item

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

@@ -112,9 +112,11 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
                     if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
                         failString = ""
                     } else {
+                        if item.message != "" {
                             failString = "有效期不足，需要为\(self.dataModel.valid_date)或以后"
                         }
                     }
+                }
                 
                 if item.id == .id36 { // 证件信息 证件号码
                     cerNumberView.dataSource = item

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

@@ -308,6 +308,7 @@ extension YHResignUploadTravelHKViewController: UITableViewDelegate, UITableView
             } else {
                 self.dataModel.img_back = ""
             }
+            self.updateAllViews()
         }
         cell.block = {[weak self] model in
             guard let self = self else { return }

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

@@ -247,6 +247,7 @@ extension YHResignUploadTravelPassportViewController: UITableViewDelegate, UITab
             if index == 0 {
                 self.dataModel.img_front = ""
             }
+            self.updateAllViews()
         }
         cell.block = {[weak self] model in
             guard let self = self else { return }

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

@@ -83,12 +83,12 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
                     })
                     self.backSurfaceImageButton.setContent("", "")
                 }
-                cardLabel.isHidden = true
-                signLabel.isHidden = true
-                cardBeginView.isHidden = true
-                cardEndView.isHidden = true
-                signBeginView.isHidden = true
-                signEndView.isHidden = true
+                cardLabel.isHidden = false
+                signLabel.isHidden = false
+                cardBeginView.isHidden = false
+                cardEndView.isHidden = false
+                signBeginView.isHidden = false
+                signEndView.isHidden = false
                 return
             }
             cardLabel.isHidden = false