3月21产品走查问题修复

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/C/YHMainApplicantInformationViewController.swift

@@ -184,14 +184,15 @@ extension YHMainApplicantInformationViewController: UITableViewDelegate, UITable
                 let data = array[i]
                 let isShow = data.isShowPrompts ?? false
                 let message = data.message ?? ""
+                let isNeed = data.isNeed ?? false
                 if data.id == .id3 || data.id == .id4 || data.id == .id32 || data.id == .id33 {
-                    if isShow && message.count == 0 {
+                    if isShow && message.count == 0 && isNeed {
                         h = h + 72 + 20
                     } else {
                         h = h + 72
                     }
                 } else {
-                    if isShow && message.count == 0 {
+                    if isShow && message.count == 0 && isNeed {
                         h = h + 52 + 20
                     } else {
                         h = h + 52

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift

@@ -260,10 +260,18 @@ class YHItemView: UIView {
             leftButton.setTitle(dataSource.leftButtonString, for: .normal)
             nextStepImageView.isHidden = true
             messageTextField.isHidden = true
-            if dataSource.message == "0" {
-                buttonState(isLeft: false)
+            if dataSource.message == "0" || dataSource.message == "2" {
+                if dataSource.id == .id25 {
+                    buttonState(isLeft: true)
+                } else {
+                    buttonState(isLeft: false)
+                }
             } else {
-                buttonState(isLeft: true)
+                if dataSource.id == .id25 {
+                    buttonState(isLeft: false)
+                } else {
+                    buttonState(isLeft: true)
+                }
             }
             
         } else {
@@ -279,7 +287,7 @@ class YHItemView: UIView {
             rightButton.isHidden = true
         }
         
-        if dataSource.isShowPrompts ?? false {
+        if dataSource.isShowPrompts ?? false && dataSource.isNeed ?? false {
             if dataSource.message?.count != 0 {
                 showPromptLabel.isHidden = true
                 
@@ -364,6 +372,10 @@ class YHItemView: UIView {
         leftButton.layer.borderWidth = 0
         dataSource?.message = "0"
         dataSource?.value = ["0"]
+        if dataSource?.id == .id25 {
+            dataSource?.message = "1"
+            dataSource?.value = ["1"]
+        }
         if let block = block {
             block(dataSource ?? YHItemModel())
         }
@@ -382,6 +394,10 @@ class YHItemView: UIView {
         rightButton.layer.borderWidth = 0
         dataSource?.message = "1"
         dataSource?.value = ["1"]
+        if dataSource?.id == .id25 {
+            dataSource?.message = "0"
+            dataSource?.value = ["0"]
+        }
         if let block = block {
             block(dataSource ?? YHItemModel())
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHMainInformationTableViewCell.swift

@@ -105,14 +105,15 @@ class YHMainInformationTableViewCell: UITableViewCell {
             let data = dataSource?.models?[i] ?? YHItemModel()
             let isShow = data.isShowPrompts ?? false
             let message = data.message ?? ""
+            let isNeed = data.isNeed ?? false
             if data.id == .id3 || data.id == .id4 || data.id == .id32 || data.id == .id33 {
-                if isShow && message.count == 0 {
+                if isShow && message.count == 0 && isNeed {
                     h = 71 + 20
                 } else {
                     h = 71
                 }
             } else {
-                if isShow && message.count == 0 {
+                if isShow && message.count == 0 && isNeed {
                     h = 51 + 20
                 } else {
                     h = 51

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -55,7 +55,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
     func getDocumentInformation(_ isShowPrompt: Bool) -> [YHSectionItemModel] {
         var flag = false
         let nationality = mainModel.nationality 
-        if nationality.contains("中国") {
+        if nationality.contains("China") {
             flag = true
         }
         
@@ -63,7 +63,13 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         let item1 = YHItemModel(id: .id9, isNeed: flag, title: "签发地", isUserKeyBoard: true, prompts: "请输入", message: mainModel.certificates.cn_identity_card.issue_at, isShowPrompts: isShowPrompt, alertMessage:"请输入签发地")
         let item2 = YHItemModel(id: .id10, isNeed: flag, title: "签发日期", isUserKeyBoard: false, prompts: "请选择", message: mainModel.certificates.cn_identity_card.issue_date_start_at, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择签发日期")
         let item3 = YHItemModel(id: .id11, isNeed: flag, title: "届满日期", isUserKeyBoard: false, prompts: "请选择", message: mainModel.certificates.cn_identity_card.issue_date_end_at, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择届满日期")
-        let section = YHSectionItemModel(title: "中国身份证", models: [item, item1, item2, item3])
+        var section1String = ""
+        if flag {
+            section1String = "中国身份证"
+        } else {
+            section1String = "中国身份证(选填)"
+        }
+        let section = YHSectionItemModel(title: section1String, models: [item, item1, item2, item3])
         
         let item10 = YHItemModel(id: .id12, isNeed: true, title: "证件号码", isUserKeyBoard: true, prompts: "请输入", message: mainModel.certificates.hk_macao_pass.number, isShowPrompts: isShowPrompt, alertMessage:"请输入旅行证件号码")
         let item11 = YHItemModel(id: .id13, isNeed: true, title: "签发地", isUserKeyBoard: true, prompts: "请输入", message: mainModel.certificates.hk_macao_pass.issue_at, isShowPrompts: isShowPrompt, alertMessage:"请输入签发地")
@@ -95,7 +101,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         let item1 = YHItemModel(id: .id22, isNeed: false, title: "曾用名", isUserKeyBoard: true, prompts: "请与户口本一致，若无则不填", message: mainModel.used_name, isShowPrompts: isShowPrompt)
         let item2 = YHItemModel(id: .id23, isNeed: false, title: "婚前姓氏", isUserKeyBoard: true, prompts: "如有则填写，仅支持输入字母", message: mainModel.surname, isShowPrompts: isShowPrompt)
         let item3 = YHItemModel(id: .id24, isNeed: true, title: "出生日期", isUserKeyBoard: false, prompts: "请选择", message: mainModel.birthday, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择出生日期")
-        let item4 = YHItemModel(id: .id25, isNeed: true, title: "出生国家/地区", isUserKeyBoard: false, prompts: nil, message: "\(mainModel.birth_place_aboard )", leftButtonString: "国外", rightButtonString: "国内", isShowPrompts: isShowPrompt, alertMessage:"请选择出生国家/地区")
+        let item4 = YHItemModel(id: .id25, isNeed: true, title: "出生国家/地区", isUserKeyBoard: false, prompts: nil, message: "\(mainModel.birth_place_aboard)", leftButtonString: "国内", rightButtonString: "国外", isShowPrompts: isShowPrompt, alertMessage:"请选择出生国家/地区")
         var string = ""
         let array = mainModel.birth_place.area
         for item in array {
@@ -587,7 +593,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
                 guard hk_macao_pass_issue_date_start_at.count > 0 else { return false }
                 guard hk_macao_pass_issue_date_end_at.count > 0 else { return false }
             }
-            if nationality.contains("中国") {
+            if nationality.contains("China") {
                 guard cn_identity_card_number.count == 18 else { return false }
                 guard cn_identity_card_issue_at.count > 0 else { return false }
                 guard cn_identity_card_issue_date_start_at.count > 0 else { return false }