// 证书信息

galaxy/galaxy/Classes/Base/C/YHBaseViewController.swift

@@ -8,12 +8,16 @@
 
 import UIKit
 import GKNavigationBarSwift
+import IQKeyboardManagerSwift
 
 class YHBaseViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor =  UIColor(hex:0xf8f8f8)
         
+        #if DEBUG
+        IQKeyboardManager.shared.enable = true
+        #endif
         gk_navBackgroundColor = .clear
         gk_navLineHidden = true
         gk_navBarAlpha = 0

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHCertificateViewController.swift

@@ -10,9 +10,9 @@ import UIKit
 
 class YHCertificateViewController: YHBaseViewController {
 
-    var spouse:YHFamilyMember?
+    var familyMember:YHFamilyMember?
     
-    var cardInfo: YHCNIdentityCard?
+    var certificates:YHCertificates = YHCertificates()
         
     var items:[[YHFormItemProtocol]] = [[YHFormItemProtocol]]()
     
@@ -57,28 +57,74 @@ class YHCertificateViewController: YHBaseViewController {
             make.left.equalToSuperview().offset(16)
             make.right.equalToSuperview().offset(-16)
         }
+        
+        guard let familyMember = familyMember else { return }
+        
+        if let cer = familyMember.certificatesd {
+            certificates = cer
+        } else {
+            certificates.cnIdentityCard = YHCNIdentityCard()
+            certificates.passport = YHCNIdentityCard()
+            if familyMember.isHandled == 1 { // 要办理港澳通行证
+                certificates.hkMacaoPass = YHCNIdentityCard()
+            }
+        }
+        loadCertificateInfo()
     }
     
     func loadCertificateInfo() {
+    
+        items.removeAll()
         
+        // 中国身份证 信息必有
         let title0 = YHFormTitleItem(type: .chinaIdCardInfo)
-        let item01 = YHFormDetailItem(type: .certificateNumber)
+        let item01 = YHFormDetailItem(type: .chinaIdentityCardNumber)
         let item02 = YHFormDetailItem(type: .certificateSignPlace)
         let item03 = YHFormDetailItem(type: .certificateSignDate)
         let item04 = YHFormDetailItem(type: .certificateValidDate)
         let arr0:[YHFormItemProtocol] = [title0, item01, item02, item03, item04]
+        items.append(arr0)
+        if  let cnIdentityCard = certificates.cnIdentityCard {
+            item01.value = cnIdentityCard.number
+            item02.value = cnIdentityCard.issueAt
+            item03.value = cnIdentityCard.issueDateStartAt
+            item04.value = cnIdentityCard.issueDateEndAt
+        }
             
-        let title1 = YHFormTitleItem(type: .passPortInfo)
-        let item10 = YHFormDetailItem(type: .cetificateType)
-        let item11 = YHFormDetailItem(type: .certificateNumber)
-        let item12 = YHFormDetailItem(type: .certificateSignPlace)
-        let item13 = YHFormDetailItem(type: .certificateSignDate)
-        let item14 = YHFormDetailItem(type: .certificateValidDate)
-        let item15 = YHFormDetailItem(type: .certificateSignPlace)
-        
-        let arr1:[YHFormItemProtocol] = [title1, item10, item11, item12, item13, item14, item15]
-
-        items.append(contentsOf: [arr0, arr1])
+        // 港澳通行证 非必须
+        if certificates.hkMacaoPass != nil {
+            let title1 = YHFormTitleItem(type: .hkAndMacaoPassport)
+            let item10 = YHFormDetailItem(type: .traverlPassportNumber)
+            let item11 = YHFormDetailItem(type: .certificateSignPlace)
+            let item12 = YHFormDetailItem(type: .certificateSignDate)
+            let item13 = YHFormDetailItem(type: .certificateValidDate)
+            let arr1:[YHFormItemProtocol] = [title1, item10, item11, item12, item13]
+            items.append(arr1)
+            if  let hkMacaoPass = certificates.hkMacaoPass {
+                item10.value = hkMacaoPass.number
+                item11.value = hkMacaoPass.issueAt
+                item12.value = hkMacaoPass.issueDateStartAt
+                item13.value = hkMacaoPass.issueDateEndAt
+            }
+        }
+        
+        // 护照及其他旅行证件 信息必有
+        let title2 = YHFormTitleItem(type: .passPortOrTravelInfo)
+        let item20 = YHFormDetailItem(type: .certificateType)
+        let item21 = YHFormDetailItem(type: .certificateNumber)
+        let item22 = YHFormDetailItem(type: .certificateSignPlace)
+        let item23 = YHFormDetailItem(type: .certificateSignDate)
+        let item24 = YHFormDetailItem(type: .certificateValidDate)
+        let arr2:[YHFormItemProtocol] = [title2, item20, item21, item22, item23, item24]
+        items.append(arr2)
+        if  let passport = certificates.passport {
+            item20.value = String(passport.passportType)
+            item21.value = passport.number
+            item22.value = passport.issueAt
+            item23.value = passport.issueDateStartAt
+            item24.value = passport.issueDateEndAt
+        }
+        
         tableView.reloadData()
     }
 }
@@ -115,10 +161,10 @@ extension YHCertificateViewController : UITableViewDelegate, UITableViewDataSour
             
             let detailItem = item as! YHFormDetailItem
             
-            if detailItem.type == .certificateNumber || detailItem.type == .certificateSignPlace { // 证件号码和签发地需要填写
+            if detailItem.type == .chinaIdentityCardNumber || detailItem.type == .certificateSignPlace { // 证件号码和签发地需要填写
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
                 let titleItem = arr[0] as! YHFormTitleItem
-                if detailItem.type == .certificateNumber {
+                if detailItem.type == .chinaIdentityCardNumber {
                     cell.titleLabel.text = (titleItem.type == .chinaIdCardInfo ? "中国身份证号" : "证件号码")
                 } else {
                     cell.titleLabel.text = detailItem.getTitle()
@@ -126,7 +172,7 @@ extension YHCertificateViewController : UITableViewDelegate, UITableViewDataSour
                 return cell
             }
             
-            if detailItem.type == .cetificateType || detailItem.type == .certificateSignDate {
+            if detailItem.type == .certificateType || detailItem.type == .certificateSignDate {
                 
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
                 cell.title = detailItem.getTitle()
@@ -190,6 +236,9 @@ extension YHCertificateViewController : UITableViewDelegate, UITableViewDataSour
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
+        let vc = YHSpouseBasicInfoVC()
+        self.navigationController?.pushViewController(vc)
+        
         if !(0..<items.count).contains(indexPath.section) { return }
         let arr:[YHFormItemProtocol] = items[indexPath.section]
         if !(0..<arr.count).contains(indexPath.row) {  return  }
@@ -204,19 +253,21 @@ extension YHCertificateViewController : UITableViewDelegate, UITableViewDataSour
                detailItem.type == .certificateSignDate { // 届满日期 签发日期
      
                 self.view?.endEditing(true)
-                YHDatePickView.show(type: .yyyymmdd) { date in
+                YHDatePickView.show(type: .yyyymmdd) { [weak self] date  in
                     let dataArr = date.components(separatedBy: YHDatePickView.separator)
                     print(dataArr)
                     
+                    if let familyMember = self?.familyMember {
+                        if familyMember.relationType == .child {
+                            
+                        }
+                    }
+                    
+                    
                 }
             }
             return
         }
-        
-        
-        
-        let vc = YHSpouseBasicInfoVC()
-        self.navigationController?.pushViewController(vc)
     }
         
     func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseInitialInfoVC.swift

@@ -318,6 +318,7 @@ extension YHSpouseInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
 
         let vc = YHCertificateViewController()
+        vc.familyMember = spouse
         self.navigationController?.pushViewController(vc)
     }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHFamilyInitialInfo.swift

@@ -38,8 +38,8 @@ enum YHFormTitleItemType:Int, CaseIterable {
     
     // 中国身份证
     case chinaIdCardInfo
-    // 护照
-    case passPortInfo
+    // 护照及其他旅行证件
+    case passPortOrTravelInfo
     
     // 配偶信息
     case spouseInfo
@@ -92,9 +92,13 @@ enum YHFormDetailItemType:Int {
     case isHandleHKPassPort
     
     // 证件类别
-    case cetificateType
+    case certificateType
     // 证件号码
     case certificateNumber
+    // 中国身份证号
+    case chinaIdentityCardNumber
+    // 旅行证件号码
+    case traverlPassportNumber
     // 签发日期
     case certificateSignDate
     // 届满日期
@@ -187,7 +191,7 @@ class YHFormAddItem : YHFormItemProtocol
 class YHFormTitleItem : YHFormItemProtocol {
     
     var type: YHFormTitleItemType
-
+    
     init(type: YHFormTitleItemType) {
         self.type = type
     }
@@ -212,7 +216,7 @@ class YHFormTitleItem : YHFormItemProtocol {
             return "港澳通行证".local
         case .chinaIdCardInfo:
             return "中国身份证".local
-        case .passPortInfo:
+        case .passPortOrTravelInfo:
             return String(format: "%@(%@)", "护照及其他旅行证件".local, "选填".local)
         case .spouseInfo:
             return "配偶信息".local
@@ -262,7 +266,7 @@ class YHFormTitleItem : YHFormItemProtocol {
             return "".local
         case .chinaIdCardInfo:
             return "".local
-        case .passPortInfo:
+        case .passPortOrTravelInfo:
             return "".local
         case .spouseInfo:
             return "".local
@@ -297,6 +301,9 @@ class YHFormDetailItem : YHFormItemProtocol {
     // 是否是必填项
     var isNeed: Bool = true
     
+    var value: String?
+
+    
     // 是否随行
     var isAccompany:Bool = false
     // 是否办理港澳通信证
@@ -336,12 +343,19 @@ class YHFormDetailItem : YHFormItemProtocol {
         case .isHandleHKPassPort:
             return "是否办理".local
         // 证件类别
-        case .cetificateType:
+        case .certificateType:
             return "证件类别".local
         // 证件号码
         case .certificateNumber:
+            return "证件号码".local
+            
+        // 证件号码
+        case .chinaIdentityCardNumber:
             return "中国身份证号".local
-
+        // 旅行证件号码
+        case .traverlPassportNumber:
+            return "旅行证件号码".local
+            
         // 签发日期
         case .certificateSignDate:
             return "签发日期".local
@@ -547,6 +561,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     // mark any
 //    var certificates: YHCertificates?
     var certificates: SmartAny?
+    var certificatesd: YHCertificates?
     
     enum CodingKeys: String, CodingKey {
         case id = "id"
@@ -687,24 +702,31 @@ class YHSubsetNamePinyin: SmartCodable {
 // MARK: - YHCertificates
 class YHCertificates: SmartCodable {
     
-    required init() {
-        
-    }
     var cnIdentityCard: YHCNIdentityCard?
     var passport: YHCNIdentityCard?
+    var hkMacaoPass: YHCNIdentityCard?
 
     enum CodingKeys: String, CodingKey {
         case cnIdentityCard = "cnIdentityCard"
         case passport = "passport"
+        case hkMacaoPass = "hkMacaoPass"
+    }
+        
+    required init() {
+        
+    }
+    
+    init(cnIdentityCard: YHCNIdentityCard?, passport: YHCNIdentityCard?, hkMacaoPass: YHCNIdentityCard?) {
+        self.cnIdentityCard = cnIdentityCard
+        self.passport = passport
+        self.hkMacaoPass = hkMacaoPass
     }
 }
 
 // MARK: - YHCNIdentityCard
 class YHCNIdentityCard: SmartCodable {
     
-    required init() {
-        
-    }
+    
     
     var id: Int = 0
     var number: String?
@@ -725,6 +747,20 @@ class YHCNIdentityCard: SmartCodable {
         case imgBack = "img_back"
         case passportType = "passport_type"
     }
+    
+    required init() {
+        
+    }
+    
+    init(id:Int, number: String?, issueAt:String?,  issueDateStartAt: String?, imgFront: String?, imgBack: String?, passportType: Int) {
+        self.id = id
+        self.number = number
+        self.issueAt = issueAt
+        self.issueDateStartAt = issueDateStartAt
+        self.imgFront = imgFront
+        self.imgBack = imgBack
+        self.passportType = passportType
+    }
 }
 
 // MARK: - YHHasDegreeJson