Merge branch 'develop' into davidhuang

* develop:
  // 子女基本信息填写
  // 图片资源
  // 证件信息
  // 子女初始信息
  // 父母信息

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -25,6 +25,9 @@
 		042FBBC12B63B21700F9DE23 /* YHFormItemDegreeInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC02B63B21700F9DE23 /* YHFormItemDegreeInfoCell.swift */; };
 		042FBBC32B63DA4C00F9DE23 /* YHParentInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC22B63DA4C00F9DE23 /* YHParentInfoVC.swift */; };
 		042FBBC52B64AE3D00F9DE23 /* YHFormItemOnlyDoubleChoiceCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC42B64AE3D00F9DE23 /* YHFormItemOnlyDoubleChoiceCell.swift */; };
+		042FBBC72B64CFBF00F9DE23 /* YHChildInitialInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC62B64CFBF00F9DE23 /* YHChildInitialInfoVC.swift */; };
+		042FBBC92B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC82B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift */; };
+		042FBBCB2B65058000F9DE23 /* YHChildBasicInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */; };
 		0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; };
 		0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; };
 		0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; };
@@ -190,6 +193,9 @@
 		042FBBC02B63B21700F9DE23 /* YHFormItemDegreeInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemDegreeInfoCell.swift; sourceTree = "<group>"; };
 		042FBBC22B63DA4C00F9DE23 /* YHParentInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHParentInfoVC.swift; sourceTree = "<group>"; };
 		042FBBC42B64AE3D00F9DE23 /* YHFormItemOnlyDoubleChoiceCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemOnlyDoubleChoiceCell.swift; sourceTree = "<group>"; };
+		042FBBC62B64CFBF00F9DE23 /* YHChildInitialInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChildInitialInfoVC.swift; sourceTree = "<group>"; };
+		042FBBC82B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemExpireDateCell.swift; sourceTree = "<group>"; };
+		042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChildBasicInfoVC.swift; sourceTree = "<group>"; };
 		0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVerificationCodeLoginController.swift; sourceTree = "<group>"; };
 		0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneMessageView.swift; sourceTree = "<group>"; };
 		0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; };
@@ -371,6 +377,7 @@
 				042FBBBC2B63519C00F9DE23 /* YHFormItemSelectSheetCell.swift */,
 				042FBBC02B63B21700F9DE23 /* YHFormItemDegreeInfoCell.swift */,
 				042FBBC42B64AE3D00F9DE23 /* YHFormItemOnlyDoubleChoiceCell.swift */,
+				042FBBC82B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -383,6 +390,8 @@
 				042FBBBA2B62806D00F9DE23 /* YHCertificateViewController.swift */,
 				042FBBBE2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift */,
 				042FBBC22B63DA4C00F9DE23 /* YHParentInfoVC.swift */,
+				042FBBC62B64CFBF00F9DE23 /* YHChildInitialInfoVC.swift */,
+				042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -1192,12 +1201,15 @@
 				A5C382CF2B5F9A9100C5E65C /* YHServiceCenterMainViewModel.swift in Sources */,
 				A5C5B2EA2B4ECA4D00A7C5D1 /* YHDavidModel0.swift in Sources */,
 				A5ACE9572B4564F7002C94D2 /* YHBasicContentView.swift in Sources */,
+				042FBBC92B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift in Sources */,
 				A5FD63C12B62616D00D1D9DA /* YHInformationPerfectModel.swift in Sources */,
 				A5C5B3292B57CCBE00A7C5D1 /* YHDavidCell4.swift in Sources */,
 				049A48A82B49417300D0C641 /* YHAboutUsViewController.swift in Sources */,
 				A5ACE9582B4564F7002C94D2 /* YHNoDataTipView.swift in Sources */,
 				042FBBBB2B62806D00F9DE23 /* YHCertificateViewController.swift in Sources */,
+				042FBBC72B64CFBF00F9DE23 /* YHChildInitialInfoVC.swift in Sources */,
 				A5ACE9562B4564F7002C94D2 /* YHBouncesContentView.swift in Sources */,
+				042FBBCB2B65058000F9DE23 /* YHChildBasicInfoVC.swift in Sources */,
 				A5ACE9302B4564F7002C94D2 /* Algorithm.swift in Sources */,
 				A5C5B32B2B57D17600A7C5D1 /* YHDavidCell5.swift in Sources */,
 				A5ACE92D2B4564F7002C94D2 /* YHLoginPrivacyView.swift in Sources */,

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

@@ -35,6 +35,7 @@ class YHCertificateViewController: YHBaseViewController {
         tableView.register(YHFormItemTitleCell.self, forCellReuseIdentifier: YHFormItemTitleCell.cellReuseIdentifier)
         tableView.register(YHFormItemAddCell.self, forCellReuseIdentifier: YHFormItemAddCell.cellReuseIdentifier)
         tableView.register(YHFormItemSelectSheetCell.self, forCellReuseIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier)
+        tableView.register(YHFormItemExpireDateCell.self, forCellReuseIdentifier: YHFormItemExpireDateCell.cellReuseIdentifier)
         
         return tableView
     }()
@@ -122,13 +123,20 @@ extension YHCertificateViewController : UITableViewDelegate, UITableViewDataSour
                 return cell
             }
             
-            if detailItem.type == .cetificateType || detailItem.type == .certificateSignDate || detailItem.type == .certificateValidDate {
+            if detailItem.type == .cetificateType || detailItem.type == .certificateSignDate {
                 
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
                 cell.title = detailItem.getTitle()
                 cell.detail = "中国"
                 return cell
             }
+            
+            if detailItem.type == .certificateValidDate {
+                
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemExpireDateCell.cellReuseIdentifier, for: indexPath) as! YHFormItemExpireDateCell
+                cell.title = detailItem.getTitle()
+                return cell
+            }
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
             cell.titleLabel.text = detailItem.getTitle()
             return cell
@@ -179,6 +187,8 @@ extension YHCertificateViewController : UITableViewDelegate, UITableViewDataSour
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
+        let vc = YHSpouseBasicInfoVC()
+        self.navigationController?.pushViewController(vc)
     }
         
     func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) {

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

+//
+//  YHChildBasicInfoVC.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/27.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHChildBasicInfoVC: YHBaseViewController {
+
+    var child:YHChild?
+    
+    var cardInfo: YHCNIdentityCard?
+        
+    var items:[[YHFormItemProtocol]] = [[YHFormItemProtocol]]()
+    
+    lazy var tableView: UITableView = {
+        
+        let tableView = UITableView(frame:.zero, style:.plain)
+
+        if #available(iOS 11.0, *) {
+            tableView.contentInsetAdjustmentBehavior = .never
+        }
+        tableView.showsVerticalScrollIndicator = false
+        tableView.backgroundColor = .clear
+        tableView.separatorStyle = .none
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
+        tableView.register(YHFormItemDoubleChoiceCell.self, forCellReuseIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier)
+        tableView.register(YHFormItemInputTextCell.self, forCellReuseIdentifier: YHFormItemInputTextCell.cellReuseIdentifier)
+        tableView.register(YHFormItemEnterDetailCell.self, forCellReuseIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier)
+        tableView.register(YHFormItemTitleCell.self, forCellReuseIdentifier: YHFormItemTitleCell.cellReuseIdentifier)
+        tableView.register(YHFormItemAddCell.self, forCellReuseIdentifier: YHFormItemAddCell.cellReuseIdentifier)
+        tableView.register(YHFormItemSelectSheetCell.self, forCellReuseIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier)
+        tableView.register(YHFormItemDegreeInfoCell.self, forCellReuseIdentifier: YHFormItemDegreeInfoCell.cellReuseIdentifier)
+        
+        
+        return tableView
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        gk_navTitle = "子女基本信息填写".local
+        createUI()
+        loadBasicInfo()
+    }
+    
+    func createUI() {
+        
+        view.addSubview(tableView);
+        tableView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+            make.bottom.equalToSuperview().offset(-100)
+            make.left.equalToSuperview().offset(16)
+            make.right.equalToSuperview().offset(-16)
+        }
+    }
+    
+    func loadBasicInfo() {
+        
+        // 子女信息
+        let title0 = YHFormTitleItem(type: .childInfo)
+        let item00 = YHFormDetailItem(type: .childName)
+        let item01 = YHFormDetailItem(type: .everName)
+        let item02 = YHFormDetailItem(type: .befourMarryFirstName)
+        let item03 = YHFormDetailItem(type: .gender)
+        let item04 = YHFormDetailItem(type: .marriageState)
+        let item05 = YHFormDetailItem(type: .birthday)
+        let item06 = YHFormDetailItem(type: .birthNation)
+        let item07 = YHFormDetailItem(type: .birthCity)
+        let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04, item05, item06, item07]
+            
+        // 职业
+        
+        let title1 = YHFormTitleItem(type: .occupationInfo)
+        let item10 = YHFormDetailItem(type: .occupation)
+        let item11 = YHFormDetailItem(type: .occupationName)
+        let arr1:[YHFormItemProtocol] = [title1, item10, item11]
+        
+        
+        // 婚姻
+        let title2 = YHFormTitleItem(type: .isPreviousMarriageChild)
+        let item20 = YHFormDetailItem(type: .isPreviousMarriageChild)
+        let arr2:[YHFormItemProtocol] = [title2, item20]
+        
+        // 在港信息
+        let title3 = YHFormTitleItem(type: .inHongKongInfo)
+        let item30 = YHFormDetailItem(type: .isNowInHK)
+        let item31 = YHFormDetailItem(type: .stayHKDate)
+        let item32 = YHFormDetailItem(type: .roleInHK)
+        let arr3:[YHFormItemProtocol] = [title3, item30, item31, item32]
+        
+        // 香港身份证
+        let title4 = YHFormTitleItem(type: .hkIdentityCardInfo)
+        let item40 = YHFormDetailItem(type: .isHaveHkIdentityCard)
+        let item41 = YHFormDetailItem(type: .hkIdentityCardNumber)
+        let arr4:[YHFormItemProtocol] = [title4, item40, item41]
+
+        items.append(contentsOf: [arr0, arr1, arr2, arr3, arr4])
+        tableView.reloadData()
+    }
+    
+    func getCellType(_ item: Any) ->HKFormItemCellType {
+        if item is YHFormTitleItem {
+            return .title
+        }
+        
+        if item is YHFormAddItem {
+            return .addItem
+        }
+        if item is YHFormDetailItem {
+            let detailItem = item as! YHFormDetailItem
+            if detailItem.type == .childName
+                || detailItem.type == .everName
+                || detailItem.type == .befourMarryFirstName
+                || detailItem.type == .occupationName
+                || detailItem.type == .hkIdentityCardNumber
+            {
+                return .inputText
+            }
+            if detailItem.type == .birthday
+                || detailItem.type == .birthCity
+                || detailItem.type == .occupation
+                || detailItem.type == .stayHKDate
+                || detailItem.type == .roleInHK
+                || detailItem.type == .ownDegree
+                || detailItem.type == .gender
+                || detailItem.type == .marriageState
+            {
+                return .selectSheet
+            }
+            if detailItem.type == .birthNation
+                || detailItem.type == .isNowInHK
+                || detailItem.type == .isHaveHkIdentityCard
+                || detailItem.type == .isPreviousMarriageChild
+            {
+                return .twoChoice
+            }
+            
+            if detailItem.type == .degreeDetailInfo
+            {
+                return .degreeDetailInfo
+            }
+        }
+        return .defaultType
+    }
+    
+}
+
+extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return items.count
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section >= items.count { return 0 }
+        let arr = items[section]
+        return arr.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        if indexPath.section >= items.count { return createDefaultCell(indexPath) }
+        let arr:[YHFormItemProtocol] = items[indexPath.section]
+        if indexPath.row >= arr.count {  return createDefaultCell(indexPath) }
+        let item:YHFormItemProtocol = arr[indexPath.row]
+        
+        let cellType = getCellType(item)
+        
+        if cellType == .title { // 标题
+            let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
+            cell.titleLabel.text = item.getTitle()
+            return cell
+        }
+        
+        if cellType == .inputText { // 输入文字cell
+            let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
+            cell.titleLabel.text = item.getTitle()
+            return cell
+        }
+        
+        if cellType == .selectSheet { // 点击选择列表cell
+            let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
+            cell.title = item.getTitle()
+            return cell
+        }
+        
+        if cellType == .twoChoice { // 双项选择cell
+            
+            let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
+            cell.title = item.getTitle()
+            let answers = [YHFormChoiceItem(title: "是".local, isSelect: true),
+                           YHFormChoiceItem(title: "否".local, isSelect: false)]
+            cell.answerArr = answers
+            return cell
+        }
+        
+        if cellType == .addItem { // 新增item cell
+            let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemAddCell.cellReuseIdentifier, for: indexPath) as! YHFormItemAddCell
+            cell.title = item.getTitle()
+            return cell
+        }
+        
+        if cellType == .degreeDetailInfo { // 学位cell
+            
+            let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDegreeInfoCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDegreeInfoCell
+            cell.title = item.getTitle()
+            return cell
+        }
+        return createDefaultCell(indexPath)
+    }
+    
+    func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
+        
+        if indexPath.section >= items.count { return  }
+        let arr:[YHFormItemProtocol] = items[indexPath.section]
+        if indexPath.row >= arr.count {  return }
+        createCorner(cell: cell, arr: arr, indexPath: indexPath)
+    }
+    
+    func createDefaultCell(_ indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell", for: indexPath)
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        
+        if indexPath.section >= items.count { return 0.0 }
+        let arr:[YHFormItemProtocol] = items[indexPath.section]
+        if indexPath.row >= arr.count {  return 0.0 }
+        
+        let item = arr[indexPath.row]
+        
+        if item is YHFormTitleItem { // 标题
+            return 52.0
+        }
+        
+        if item is YHFormAddItem {
+            return 70.0
+        }
+        
+        if item is YHFormDetailItem {
+            return UITableView.automaticDimension
+        }
+        return 52.0
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
+        return UIView()
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        return 14.0
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        let vc = YHParentInfoVC()
+        self.navigationController?.pushViewController(vc)
+    }
+        
+    func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) {
+        // 复用时需清理
+        cell.layer.mask = nil
+        // 设置每块section圆角
+        if (indexPath.row == 0) {
+            let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue | UIRectCorner.topRight.rawValue)
+            cell.createCorner(CGSizeMake(12.0, 12.0), corner)
+            
+        } else if (indexPath.row == arr.count-1) {
+            let corner = UIRectCorner(rawValue: UIRectCorner.bottomLeft.rawValue | UIRectCorner.bottomRight.rawValue)
+            cell.createCorner(CGSizeMake(12.0, 12.0), corner)
+            
+        } else {
+            cell.layer.mask = nil
+        }
+    }
+}
+

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

+//
+//  YHChildInitialInfoVC.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/27.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHChildInitialInfoVC: YHBaseViewController {
+
+    var child:YHChild?
+    
+    lazy var items:[[YHFormItemProtocol]] = [[YHFormItemProtocol]]()
+    
+    lazy var tableView: UITableView = {
+        
+        let tableView = UITableView(frame:.zero, style:.plain)
+
+        if #available(iOS 11.0, *) {
+            tableView.contentInsetAdjustmentBehavior = .never
+        }
+        tableView.showsVerticalScrollIndicator = false
+        tableView.backgroundColor = .clear
+        tableView.separatorStyle = .none
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
+        tableView.register(YHFormItemDoubleChoiceCell.self, forCellReuseIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier)
+        tableView.register(YHFormItemInputTextCell.self, forCellReuseIdentifier: YHFormItemInputTextCell.cellReuseIdentifier)
+        tableView.register(YHFormItemEnterDetailCell.self, forCellReuseIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier)
+        tableView.register(YHFormItemTitleCell.self, forCellReuseIdentifier: YHFormItemTitleCell.cellReuseIdentifier)
+        tableView.register(YHFormItemAddCell.self, forCellReuseIdentifier: YHFormItemAddCell.cellReuseIdentifier)
+        tableView.register(YHFormItemQuestionCell.self, forCellReuseIdentifier: YHFormItemQuestionCell.cellReuseIdentifier)
+        tableView.register(YHFormItemSelectSheetCell.self, forCellReuseIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier)
+        
+        return tableView
+    }()
+    
+    lazy var submitBtn:UIButton = {
+        let btn = UIButton()
+        btn.setTitle("提交".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(.white, for: .normal)
+        btn.backgroundColor = UIColor(hexString:"#4388FF")
+        btn.layer.cornerRadius = 8.0
+        btn.addTarget(self, action: #selector(didClickSubmitBtn), for: .touchUpInside)
+        return btn
+    }()
+    
+    lazy var saveBtn:UIButton = {
+        let btn = UIButton()
+        btn.setTitle("保存", for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(UIColor(hexString:"#222222"), for: .normal)
+        btn.backgroundColor = UIColor(hexString:"#F8F9FB")
+        btn.layer.cornerRadius = 8.0
+        btn.addTarget(self, action: #selector(didClickSaveBtn), for: .touchUpInside)
+        return btn
+    }()
+    
+    lazy var bottomView:UIView = {
+        let view = UIView()
+        view.backgroundColor = .white
+        view.addSubview(submitBtn)
+        view.addSubview(saveBtn)
+        return view
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        gk_navTitle = "子女信息填写".local
+        createUI()
+        loadSponseInfo()
+    }
+    
+    func loadSponseInfo() {
+                        
+        guard let child = child else { return }
+        
+        items.removeAll()
+
+        // 随行
+        let title0 = YHFormTitleItem(type: .accompany)
+        let item00 = YHFormDetailItem(type: .ownCustody)
+        let item01 = YHFormDetailItem(type: .birthday)
+        let item02 = YHFormDetailItem(type: .isAccompanyToHK)
+        item02.isAccompany = (child.follow == 1)
+        let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02]
+        items.append(arr0)
+        
+        if item02.isAccompany { // 随行才加后面的信息
+            // 国籍
+            let title1 = YHFormTitleItem(type: .country)
+            let item10 = YHFormDetailItem(type: .nationOrArea)
+            let arr1:[YHFormItemProtocol] = [title1, item10]
+            
+            // 居住信息
+            let title2 = YHFormTitleItem(type: .liveInfo)
+            let item20 = YHFormDetailItem(type: .isLiveTother)
+            item20.isLiveTogether = (child.finishFollow == 1)
+            let item21 = YHFormDetailItem(type: .nationOrArea)
+            let item22 = YHFormDetailItem(type: .liveCity)
+            let item23 = YHFormDetailItem(type: .detailAddress)
+            let arr2:[YHFormItemProtocol] = [title2, item20, item21, item22, item23]
+            
+            // 港澳通信证
+            let title3 = YHFormTitleItem(type: .hkAndMacaoPassport)
+            let item30 = YHFormDetailItem(type: .isHandleHKPassPort)
+            item30.isHandleHkPassport = (child.isHandled == 1)
+            let arr3:[YHFormItemProtocol] = [title3, item30]
+            items.append(contentsOf:[arr1, arr2, arr3])
+
+        }
+
+        tableView.reloadData()
+    }
+    
+    func createUI() {
+        
+        view.addSubview(tableView);
+        view.addSubview(bottomView)
+        
+        let submitBtnHeight = 48.0
+        let gap = 8.0
+        bottomView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.bottom.equalTo(view)
+            make.height.equalTo(submitBtnHeight+gap*2+k_Height_safeAreaInsetsBottom())
+        }
+        
+        saveBtn.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(16)
+            make.size.equalTo(CGSize(width: 86.0, height: 48.0))
+            make.top.equalTo(8)
+        }
+        
+        submitBtn.snp.makeConstraints { make in
+            make.left.equalTo(saveBtn.snp.right).offset(10)
+            make.right.equalToSuperview().offset(-16)
+            make.height.equalTo(48)
+            make.centerY.equalTo(saveBtn)
+        }
+        
+        tableView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+            make.bottom.equalTo(bottomView.snp.top)
+            make.left.equalToSuperview().offset(16)
+            make.right.equalToSuperview().offset(-16)
+        }
+    }
+    
+    @objc func didClickSubmitBtn() {
+        
+    }
+    
+    @objc func didClickSaveBtn() {
+        
+    }
+}
+
+
+extension YHChildInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return items.count
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section >= items.count { return 0 }
+        let arr = items[section]
+        return arr.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        if indexPath.section >= items.count { return createDefaultCell(indexPath) }
+        let arr:[YHFormItemProtocol] = items[indexPath.section]
+        if indexPath.row >= arr.count {  return createDefaultCell(indexPath) }
+        
+        
+        let item:YHFormItemProtocol = arr[indexPath.row]
+        
+        if item is YHFormTitleItem { // 标题
+            let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
+            cell.titleLabel.text = item.getTitle()
+            return cell
+            
+        } else if item is YHFormDetailItem { // 具体信息
+            
+            let detailItem = item as! YHFormDetailItem
+            
+            if detailItem.type == .isAccompanyToHK || detailItem.type == .isHandleHKPassPort || detailItem.type == .isLiveTother {
+                
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
+                cell.title = detailItem.getTitle()
+                let answers = [YHFormChoiceItem(title: "是".local, isSelect: true),YHFormChoiceItem(title: "否".local, isSelect: false)]
+                cell.answerArr = answers
+                
+                if detailItem.type == .isAccompanyToHK {
+                    let answers =
+                    [YHFormChoiceItem(title: "是".local, isSelect: detailItem.isAccompany),
+                     YHFormChoiceItem(title: "否".local, isSelect: !detailItem.isAccompany)]
+                    cell.answerArr = answers
+                    
+                } else if detailItem.type == .isHandleHKPassPort {
+                    let answers =
+                    [YHFormChoiceItem(title: "是".local, isSelect: detailItem.isHandleHkPassport),
+                     YHFormChoiceItem(title: "否".local, isSelect: !detailItem.isHandleHkPassport)]
+                    cell.answerArr = answers
+                } else if detailItem.type == .isLiveTother {
+                    let answers =
+                    [YHFormChoiceItem(title: "是".local, isSelect: detailItem.isLiveTogether),
+                     YHFormChoiceItem(title: "否".local, isSelect: !detailItem.isLiveTogether)]
+                    cell.answerArr = answers
+                }
+                            
+                cell.answerBlock = {
+                    
+                    [weak self]  (arr, selectIndex) in
+                    
+                    let selectItem:YHFormChoiceItem = arr[selectIndex]
+                    
+                    if detailItem.type == .isAccompanyToHK { // 是否随行
+                        let follow = (selectItem.title == "是".local ? 1 : 0)
+                        self?.child?.follow = follow
+                        self?.loadSponseInfo()
+                        
+                    } else if detailItem.type == .isHandleHKPassPort { // 是否办理港澳通行证
+                        let handlePassport = (selectItem.title == "是".local ? 1 : 0)
+                        self?.child?.isHandled = handlePassport
+                        self?.loadSponseInfo()
+                        
+                    } else if detailItem.type == .isLiveTother { // 是否与主申请人同住
+                        let isLiveTother = (selectItem.title == "是".local ? 1 : 0)
+                        self?.child?.finishFollow = (selectItem.title == "是".local ? 1 : 0)
+                        self?.loadSponseInfo()
+                    }
+                }
+                return cell
+                
+            } else if detailItem.type == .nationOrArea || detailItem.type == .nationOrArea || detailItem.type == .liveCity || detailItem.type == .detailAddress || detailItem.type == .birthday {
+                
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
+                cell.isMust = detailItem.isNeed
+                cell.title = detailItem.getTitle()
+                return cell
+                
+            } else if detailItem.type == .ownCustody {
+                
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemQuestionCell.cellReuseIdentifier, for: indexPath) as! YHFormItemQuestionCell
+                cell.title = detailItem.getTitle()
+                return cell
+            }
+        }
+        
+        return createDefaultCell(indexPath)
+    }
+    
+    func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
+        
+        if indexPath.section >= items.count { return  }
+        let arr:[YHFormItemProtocol] = items[indexPath.section]
+        if indexPath.row >= arr.count {  return }
+        
+        createCorner(cell: cell, arr: arr, indexPath: indexPath)
+    }
+    
+    func createDefaultCell(_ indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell", for: indexPath)
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        
+        if indexPath.section >= items.count { return 0.0 }
+        let arr:[YHFormItemProtocol] = items[indexPath.section]
+        if indexPath.row >= arr.count {  return 0.0 }
+        
+        let item = arr[indexPath.row]
+        
+        if item is YHFormTitleItem { // 标题
+            return 52.0
+        }
+        
+        if item is YHFormDetailItem {
+            let detailItem = item as! YHFormDetailItem
+            if detailItem.type == .isLiveTother ||
+                detailItem.type == .isAccompanyToHK ||
+                detailItem.type == .isHandleHKPassPort ||
+                detailItem.type == .ownCustody
+            {
+                return UITableView.automaticDimension
+            }
+        }
+        return 52.0
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
+        return UIView()
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        return 14.0
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+
+        let vc = YHChildBasicInfoVC()
+        self.navigationController?.pushViewController(vc)
+    }
+        
+    func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) {
+        // 复用时需清理
+        cell.layer.mask = nil
+        // 设置每块section圆角
+        if (indexPath.row == 0) {
+            let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue | UIRectCorner.topRight.rawValue)
+            cell.createCorner(CGSizeMake(12.0, 12.0), corner)
+            
+        } else if (indexPath.row == arr.count-1) {
+            let corner = UIRectCorner(rawValue: UIRectCorner.bottomLeft.rawValue | UIRectCorner.bottomRight.rawValue)
+            cell.createCorner(CGSizeMake(12.0, 12.0), corner)
+            
+        } else {
+            cell.layer.mask = nil
+        }
+    }
+}
+

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

@@ -662,6 +662,15 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
             self.navigationController?.pushViewController(vc)
             return
         }
+        
+        // 子女
+        if item is YHChild {
+            let child = item as! YHChild
+            let vc = YHChildInitialInfoVC()
+            vc.child = child
+            self.navigationController?.pushViewController(vc)
+            return
+        }
     }
         
     func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) {

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

@@ -193,9 +193,22 @@ extension YHParentInfoVC : UITableViewDelegate, UITableViewDataSource {
             
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
             cell.title = item.getTitle()
-            let answers = [YHFormChoiceItem(title: "是".local, isSelect: true),
-                           YHFormChoiceItem(title: "否".local, isSelect: false)]
-            cell.answerArr = answers
+            cell.answerArr = nil
+            
+            if item is YHFormDetailItem {
+                let detailItem = item as! YHFormDetailItem
+                if detailItem.type == .birthNation {
+                    let answers = [YHFormChoiceItem(title: "国内".local, isSelect: true),
+                                   YHFormChoiceItem(title: "国外".local, isSelect: false)]
+                    cell.answerArr = answers
+                } else if detailItem.type == .isHaveHkIdentityCard {
+                    
+                    let answers = [YHFormChoiceItem(title: "是".local, isSelect: true),
+                                   YHFormChoiceItem(title: "否".local, isSelect: false)]
+                    cell.answerArr = answers
+                }
+            }
+            
             return cell
         }
         

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

@@ -58,6 +58,10 @@ enum YHFormTitleItemType:Int {
     case motherInfo = 17
     // 基本信息
     case basicInfo = 18
+    // 子女信息
+    case childInfo = 19
+    // 是否前次婚姻子女
+    case isPreviousMarriageChild = 20
     
 }
 
@@ -137,6 +141,15 @@ enum YHFormDetailItemType:Int {
     case liveNationOrArea = 31
     // 仅有两个按钮 标题数组有外部提供
     case onlyDoubleChoice = 32
+    // 主申请人和现配偶是否拥有孩子抚养权
+    case ownCustody = 33
+    // 子女姓名
+    case childName = 34
+    // 性别
+    case gender = 35
+    // 是否为前次婚姻子女
+    case isPreviousMarriageChild = 36
+    
 
 }
 
@@ -213,6 +226,10 @@ class YHFormTitleItem : YHFormItemProtocol {
                 return "母亲信息".local
             case .basicInfo:
                 return "基本信息".local
+            case .childInfo:
+                return "子女信息".local
+            case .isPreviousMarriageChild:
+                return "是否前次婚姻子女".local
             
         }
     }
@@ -227,6 +244,8 @@ class YHFormTitleItem : YHFormItemProtocol {
                 return String(format: "(%@)", "如无可不填".local)
             case .child:
                 return String(format: "(%@)", "如无可不填".local)
+            case .isPreviousMarriageChild:
+                return "".local
             case .accompany:
                 return "".local
             case .country:
@@ -255,6 +274,9 @@ class YHFormTitleItem : YHFormItemProtocol {
                 return "".local
             case .basicInfo:
                 return "".local
+            case .childInfo:
+                return "".local
+            
             
         }
     }
@@ -372,6 +394,14 @@ class YHFormDetailItem : YHFormItemProtocol {
                 return "婚姻状况".local
             case .liveNationOrArea:
                 return "现居住国家/地区".local
+            case .ownCustody:
+                return "主申请人和现配偶是否拥有孩子抚养权".local
+            case .childName:
+                return "子女姓名".local
+            case .gender:
+                return "性别".local
+            case .isPreviousMarriageChild:
+                return "是否前次婚姻子女".local
             case .onlyDoubleChoice:
                 return "".local
             

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

@@ -29,7 +29,8 @@ class YHFormItemAddCell: UITableViewCell {
         btn.setTitle("新增信息".local, for: .normal)
         btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
         btn.setTitleColor(btnTitleColor, for: .normal) 
-        btn.iconInLeft(spacing: 10)
+        btn.iconInLeft(spacing: 6)
+        
         btn.setImage(UIImage(named: "form_add_info"), for: .normal)
         btn.addTarget(self, action: #selector(didClickAddBtn), for: .touchUpInside)
         return btn

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

+//
+//  YHFormItemExpireDateCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/27.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHFormItemExpireDateCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHFormItemExpireDateCell"
+    let longTimeBtnWidth = 40.0
+    // 是否必填 如必填title会展示红色*
+    var isMust = false
+    
+    var clickBlock:(()->Void)?
+
+    var title:String? {
+        didSet {
+            
+            if let title = title {
+                let str = (isMust ? ("*"+title) : title)
+                let attributes: [NSAttributedString.Key: Any] = [
+                    .font: UIFont.PFSCR(ofSize: 14),
+                    .foregroundColor: UIColor(hex:0x222222)]
+                let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
+                if isMust {
+                    let starRange = NSRange(location: 0, length: 1)
+                    questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor(hex:0xFF3A3A), range: starRange)
+                }
+                titleLabel.attributedText = questionAttrStr
+            }
+        }
+    }
+    
+    var isLontTime:Bool = false {
+        didSet {
+            updateUI()
+        }
+    }
+    
+    var tips:String? {
+        didSet {
+            tipsLabel.text = tips
+        }
+    }
+    
+    var detail:String? {
+        didSet {
+            detailLabel.text = detail
+            
+            if let detail = detail, !detail.isEmpty {
+                tipsLabel.isHidden = true
+                detailLabel.isHidden = false
+            } else {
+                tipsLabel.isHidden = false
+                detailLabel.isHidden = true
+            }
+        }
+    }
+    
+
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString:"#333333")
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        label.font = UIFont.PFSCR(ofSize: 14)
+        return label
+    }()
+    
+    private lazy var detailLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString: "#222222")
+        label.textAlignment = .left
+        label.font = UIFont.PFSCR(ofSize: 14)
+        label.isHidden = true
+        return label
+    }()
+    
+    private lazy var tipsLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString: "#C0C0C0")
+        label.text = "请选择".local
+        label.textAlignment = .left
+        label.font = UIFont.PFSCR(ofSize: 14)
+        label.isHidden = false
+        return label
+    }()
+    
+    lazy var longTimeBtn: UIButton = {
+        let btn = UIButton(type: .custom)
+        btn.setTitle("长期".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.setTitleColor(UIColor(hex: 0x222222), for: .normal)
+        btn.iconInLeft(spacing: 6)
+        btn.setImage(UIImage(named: "form_square_unselect"), for: .normal)
+        btn.setImage(UIImage(named: "form_square_select"), for: .selected)
+        btn.addTarget(self, action: #selector(didClickLongTimeBtn), for: .touchUpInside)
+        return btn
+    }()
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+        contentView.addSubview(titleLabel)
+        contentView.addSubview(detailLabel)
+        contentView.addSubview(tipsLabel)
+        contentView.addSubview(longTimeBtn)
+
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(16)
+            make.right.equalTo(detailLabel.snp.left).offset(-6)
+            make.width.equalTo(120)
+            make.centerY.equalToSuperview()
+        }
+        
+        detailLabel.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-longTimeBtnWidth-16-6)
+            make.centerY.equalToSuperview()
+        }
+        
+        tipsLabel.snp.makeConstraints { make in
+            make.edges.equalTo(detailLabel)
+        }
+        longTimeBtn.snp.makeConstraints { make in
+            make.size.equalTo(CGSizeMake(longTimeBtnWidth, 40))
+            make.right.equalToSuperview().offset(-16)
+            make.centerY.equalToSuperview()
+        }
+    }
+    
+    func updateUI() {
+    
+        detailLabel.isHidden = isLontTime
+        tipsLabel.isHidden = isLontTime
+        
+        longTimeBtn.snp.remakeConstraints { make in
+            make.size.equalTo(CGSizeMake(longTimeBtnWidth, 40))
+            make.centerY.equalToSuperview()
+            if isLontTime {
+                make.left.equalTo(detailLabel)
+            } else {
+                make.right.equalToSuperview().offset(-16)
+            }
+        }
+    }
+    
+    @objc func didClickLongTimeBtn() {
+     
+        longTimeBtn.isSelected = !longTimeBtn.isSelected
+        isLontTime = longTimeBtn.isSelected
+    
+        if let clickBlock = clickBlock {
+            clickBlock()
+        }
+    }
+}

galaxy/galaxy/Res/Assets.xcassets/Form/form_add_info.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "PlusOutlined.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -10,6 +9,7 @@
       "scale" : "2x"
     },
     {
+      "filename" : "PlusOutlined@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Form/form_square_select.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Group 3040@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/Form/form_square_unselect.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Rectangle 2471@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}