家庭成员 - 父母 配偶的数据源

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -259,7 +259,7 @@
 		A5FD63E42B678AC000D1D9DA /* YHPersonInformMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E32B678AC000D1D9DA /* YHPersonInformMainViewController.swift */; };
 		A5FD63E62B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E52B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift */; };
 		A5FD63E82B67D8EA00D1D9DA /* YHMainApplicantInfoPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoPreviewViewController.swift */; };
-		A5FD63EA2B67D95100D1D9DA /* YHFamilyMemberViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E92B67D95100D1D9DA /* YHFamilyMemberViewController.swift */; };
+		A5FD63EA2B67D95100D1D9DA /* YHPreviewFamilyMemberViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E92B67D95100D1D9DA /* YHPreviewFamilyMemberViewController.swift */; };
 		A5FD63ED2B688A7000D1D9DA /* YHPreviewInfoSingleLineTitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63EC2B688A7000D1D9DA /* YHPreviewInfoSingleLineTitleView.swift */; };
 		A5FD63EF2B68902400D1D9DA /* YHPreviewInfoNameAndSubNameItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63EE2B68902400D1D9DA /* YHPreviewInfoNameAndSubNameItemView.swift */; };
 		A5FD63F12B68963200D1D9DA /* YHPreviewInfoHoldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63F02B68963200D1D9DA /* YHPreviewInfoHoldView.swift */; };
@@ -558,7 +558,7 @@
 		A5FD63E32B678AC000D1D9DA /* YHPersonInformMainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInformMainViewController.swift; sourceTree = "<group>"; };
 		A5FD63E52B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoControllerHoldViewController.swift; sourceTree = "<group>"; };
 		A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMainApplicantInfoPreviewViewController.swift; sourceTree = "<group>"; };
-		A5FD63E92B67D95100D1D9DA /* YHFamilyMemberViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "YH\U001dFamilyMemberViewController.swift"; sourceTree = "<group>"; };
+		A5FD63E92B67D95100D1D9DA /* YHPreviewFamilyMemberViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewFamilyMemberViewController.swift; sourceTree = "<group>"; };
 		A5FD63EC2B688A7000D1D9DA /* YHPreviewInfoSingleLineTitleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoSingleLineTitleView.swift; sourceTree = "<group>"; };
 		A5FD63EE2B68902400D1D9DA /* YHPreviewInfoNameAndSubNameItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoNameAndSubNameItemView.swift; sourceTree = "<group>"; };
 		A5FD63F02B68963200D1D9DA /* YHPreviewInfoHoldView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPreviewInfoHoldView.swift; sourceTree = "<group>"; };
@@ -1056,7 +1056,7 @@
 				A5FD63E52B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift */,
 				A5167B322B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift */,
 				A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoPreviewViewController.swift */,
-				A5FD63E92B67D95100D1D9DA /* YHFamilyMemberViewController.swift */,
+				A5FD63E92B67D95100D1D9DA /* YHPreviewFamilyMemberViewController.swift */,
 				A5191F632B89E926001069F7 /* YHPreviewOtherInformationViewController.swift */,
 				A5E116672B8B371F00FF0253 /* YHPreviewBasiceInformationViewController.swift */,
 			);
@@ -1870,7 +1870,7 @@
 				A5191F662B8AEFD2001069F7 /* YHPreviewInfoQuestionAndAnswerItemsView.swift in Sources */,
 				A5234E312B6F9C5E00A33433 /* YHBasicInfoFillViewModel.swift in Sources */,
 				0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */,
-				A5FD63EA2B67D95100D1D9DA /* YHFamilyMemberViewController.swift in Sources */,
+				A5FD63EA2B67D95100D1D9DA /* YHPreviewFamilyMemberViewController.swift in Sources */,
 				04E86E432B8357EC00A35F4B /* YHMainInformationModel.swift in Sources */,
 				04E86E2F2B81EA1000A35F4B /* YHWorkExperienceListViewController.swift in Sources */,
 				042F88932B84AEF0008B60BD /* YHQuestionInfo.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YH FamilyMemberViewController.swift

-//
-//  YHFamilyMemberViewController.swift
-//  galaxy
-//
-//  Created by davidhuangA on 2024/1/29.
-//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
-//
-
-import UIKit
-/*
- *家庭成员信息 预览
- */
-class YHFamilyMemberPreviewViewController: YHPersonInfoBaseViewController {
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        view.backgroundColor = .green
-
-        // Do any additional setup after loading the view.
-    }
-
-}
-

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPersonInfoControllerHoldViewController.swift

@@ -55,7 +55,7 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
         }
         do {
             
-            let vc = YHFamilyMemberPreviewViewController()
+            let vc = YHPreviewFamilyMemberViewController()
             arrItemVCs.append(vc)
         }
         do {
@@ -64,11 +64,11 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
             arrItemVCs.append(vc)
         }
         do {
-            let vc = YHFamilyMemberPreviewViewController()
+            let vc = YHPreviewFamilyMemberViewController()
             arrItemVCs.append(vc)
         }
         do {
-            let vc = YHFamilyMemberPreviewViewController()
+            let vc = YHPreviewFamilyMemberViewController()
             arrItemVCs.append(vc)
         }
         do {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPreviewFamilyMemberViewController.swift

+//
+//  YHPreviewFamilyMemberViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/1/29.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+/*
+ *家庭成员信息 预览
+ */
+class YHPreviewFamilyMemberViewController: YHPersonInfoBaseViewController {
+    var arrData : [YHPreviewInfoSessionModel] = [] //用于数据展示
+    
+    var arrDataForParents : [YHPreviewInfoSessionModel] = []
+    var arrDataForSpouse : [YHPreviewInfoSessionModel] = []
+    var arrDataForChildren : [YHPreviewInfoSessionModel] = []
+    var arrDataForBrother : [YHPreviewInfoSessionModel] = []
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+    }
+    
+    
+}
+
+private extension YHPreviewFamilyMemberViewController {
+    func setupUI() {
+        installData()
+        
+        self.homeTableView.register(YHPreviewInfoCell.self,forCellReuseIdentifier: YHPreviewInfoCell.cellReuseIdentifier)
+        self.homeTableView.reloadData()
+    }
+    
+    func installData() {
+        
+        //父母
+        installDataForParents()
+        //配偶
+        installDataForSpouse()
+        //子女
+        installDataForChildren()
+        //兄弟姐妹
+        installDataForBrother()
+        
+        
+    }
+    
+    //父母 数据
+    func installDataForParents() {
+        
+        do {
+            //父亲信息-已故
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "父亲姓名：", answer: "父亲姓名父亲姓名：父亲姓名：父亲姓名")
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "是否已故：", answer: "是")
+            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: "1990年8月18日")
+            let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生城市：", answer: "国内 吉林省/吉林市")
+            let arr = [tmp0,tmp1,tmp2,tmp3]
+            let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "父亲信息-已故", cellData0: arr)
+            arrDataForParents.append(model1)
+        }
+        
+        
+        do {
+            //母亲信息-已故
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "母亲信息：", answer: "父亲姓名父亲姓名：父亲姓名：父亲姓名")
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "是否已故：", answer: "是")
+            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: "1990年8月18日")
+            let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生城市：", answer: "国内 吉林省/吉林市")
+            let arr = [tmp0,tmp1,tmp2,tmp3]
+            let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "母亲信息-已故", cellData0: arr)
+            arrDataForParents.append(model1)
+        }
+        
+        
+        do {
+            //父亲信息-健在
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "父亲姓名：", answer: "父亲姓名父亲姓名：父亲姓名：父亲姓名")
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "是否已故：", answer: "否")
+            let tmp11 = YHPreviewQuestionAndAnswerModel(question: "婚姻状况：", answer: "未婚")
+            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: "1990年8月18日")
+            let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生城市：", answer: "国内 吉林省/吉林市")
+            
+            let tmp4 = YHPreviewQuestionAndAnswerModel(question: "职业：", answer: "在职")
+            let tmp5 = YHPreviewQuestionAndAnswerModel(question: "职业名称：", answer: "设计师")
+            let tmp6 = YHPreviewQuestionAndAnswerModel(question: "现居住国家/地区：", answer: "国内 吉林省/吉林市")
+            let tmp7 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: "国内 吉林省/吉林市")
+            let tmp8 = YHPreviewQuestionAndAnswerModel(question: "香港身份证号码：", answer: "p102987（1）")
+            
+            let arr = [tmp0,tmp1,tmp11,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7,tmp8]
+            let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "父亲信息-健在", cellData0: arr)
+            arrDataForParents.append(model1)
+        }
+        
+        
+        do {
+            //母亲信息-健在
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "母亲姓名：", answer: "母亲姓名")
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "是否已故：", answer: "否")
+            let tmp11 = YHPreviewQuestionAndAnswerModel(question: "婚姻状况：", answer: "未婚")
+            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: "1990年8月18日")
+            let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生城市：", answer: "国内 吉林省/吉林市")
+            
+            let tmp4 = YHPreviewQuestionAndAnswerModel(question: "职业：", answer: "在职")
+            let tmp5 = YHPreviewQuestionAndAnswerModel(question: "职业名称：", answer: "设计师")
+            let tmp6 = YHPreviewQuestionAndAnswerModel(question: "现居住国家/地区：", answer: "国内 吉林省/吉林市")
+            let tmp7 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: "国内 吉林省/吉林市")
+            let tmp8 = YHPreviewQuestionAndAnswerModel(question: "香港身份证号码：", answer: "p102987（1）")
+            
+            let arr = [tmp0,tmp1,tmp11,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7,tmp8]
+            let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "母亲信息-健在", cellData0: arr)
+            arrDataForParents.append(model1)
+        }
+        
+        
+        arrData = arrDataForParents
+    }
+    
+    //配偶 数据
+    func installDataForSpouse() {
+        do {
+            //随行信息-否
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "是否随行至香港：", answer: "否")
+            let arr = [tmp0]
+            let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "随行信息-否", cellData0: arr)
+            arrDataForSpouse.append(model1)
+        }
+        
+        do {
+            //配偶信息-否
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "配偶姓名：", answer: "配偶姓名")
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: "曾用名：")
+            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: "婚前姓氏：")
+            let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: "否")
+            let tmp4 = YHPreviewQuestionAndAnswerModel(question: "出生城市：", answer: "否")
+            let tmp5 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: "否")
+            let tmp6 = YHPreviewQuestionAndAnswerModel(question: "香港身份证号码：", answer: "否")
+            let arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6]
+            let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "配偶信息-否", cellData0: arr)
+            arrDataForSpouse.append(model1)
+        }
+        
+        
+        
+        do {
+            //随行信息 - 是
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "是否随行至香港：", answer: "否")
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "国家/国籍：", answer: "中国-China")
+            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "港澳通行证：", answer: "未办理")
+            let arr = [tmp0,tmp1,tmp2]
+            let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "随行信息-否", cellData0: arr)
+            arrDataForSpouse.append(model1)
+        }
+        
+        
+        do {
+            //基本信息
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "配偶姓名：", answer: "DavidHuang")
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: "--")
+            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: "--")
+            
+            let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: "1990年8月18日")
+            let tmp4 = YHPreviewQuestionAndAnswerModel(question: "出生城市：", answer: "国内 吉林省/吉林市")
+            let tmp5 = YHPreviewQuestionAndAnswerModel(question: "职业：", answer: "职业")
+            
+            let tmp6 = YHPreviewQuestionAndAnswerModel(question: "职业名称：", answer: "职业名称")
+            let tmp7 = YHPreviewQuestionAndAnswerModel(question: "是否拥有学位：", answer: "是否拥有学位")
+            let tmp8 = YHPreviewQuestionAndAnswerModel(question: "学位证：", answer: "学位证：")
+            let tmp9 = YHPreviewQuestionAndAnswerModel(question: "学位证颁发地区：", answer: "职业名称")
+            let tmp10 = YHPreviewQuestionAndAnswerModel(question: "是否和主申请人同住：", answer: "职业名称")
+            let tmp11 = YHPreviewQuestionAndAnswerModel(question: "现居住地址：", answer: "职业名称")
+            let tmp12 = YHPreviewQuestionAndAnswerModel(question: "是否在海外居住满1年及以上：", answer: "职业名称")
+            let tmp13 = YHPreviewQuestionAndAnswerModel(question: "目前是否在港：", answer: "职业名称")
+            
+            let tmp14 = YHPreviewQuestionAndAnswerModel(question: "获准逗留至：", answer: "职业名称")
+            let tmp15 = YHPreviewQuestionAndAnswerModel(question: "在港身份：", answer: "职业名称")
+            let tmp16 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: "职业名称")
+            let tmp17 = YHPreviewQuestionAndAnswerModel(question: "香港身份证号码：", answer: "职业名称")
+            
+            let arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7,tmp8,tmp9,tmp10,tmp11,tmp12,tmp13,tmp14,tmp15,tmp16,tmp17]
+            let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "基本信息", cellData0: arr)
+            arrDataForSpouse.append(model2)
+        }
+        
+        
+        do {
+            //证件信息
+            let tmp0 = YHPreviewQuestionAndAnswerModel(question: "中国身份证号码：", answer: "2203381990287633390")
+            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "签发地：", answer: "北京市分局")
+            let tmp2 = YHPreviewQuestionAndAnswerModel(question: "签发日期：", answer: "2018-07-17")
+            let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: "2028-07-31")
+            let model0 = YHPersonInfoCellModel1(cellTitle: "中国身份证", cellData: [tmp0,tmp1,tmp2,tmp3])
+            
+            
+            let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行社证件号码：", answer: "c2345639")
+            let tmp5 = YHPreviewQuestionAndAnswerModel(question: "签发地：", answer: "北京市分局")
+            let tmp6 = YHPreviewQuestionAndAnswerModel(question: "签发日期：", answer: "2018-07-17")
+            let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: "2028-07-31")
+            let model1 = YHPersonInfoCellModel1(cellTitle: "港澳通行证", cellData: [tmp4,tmp5,tmp6,tmp7])
+            
+            
+            let tmp8 = YHPreviewQuestionAndAnswerModel(question: "证件类别：", answer: "护照")
+            let tmp9 = YHPreviewQuestionAndAnswerModel(question: "证件号码：", answer: "p2345639")
+            let tmp10 = YHPreviewQuestionAndAnswerModel(question: "签发地：", answer: "北京市分局")
+            let tmp11 = YHPreviewQuestionAndAnswerModel(question: "签发日期：", answer: "2028-07-31")
+            let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: "2028-07-31")
+            let model2 = YHPersonInfoCellModel1(cellTitle: "护照及其他旅行证件", cellData: [tmp8,tmp9,tmp10,tmp11,tmp12])
+            
+            let arr = [model0,model1,model2]
+            let model3 = YHPreviewInfoSessionModel(cellType: .idCardInfoType, cellTitle: "证件信息", cellData1: arr)
+            arrDataForSpouse.append(model3)
+        }
+        
+        
+        do {
+            //证件照片
+            let model1 = YHPersonInfoCellModel2(cellTitle: "中国身份证",frontUrl: "", backUrl: "", idType: 1)
+            let model2 = YHPersonInfoCellModel2(cellTitle: "港澳通行证",frontUrl: "", backUrl: "", idType: 2)
+            
+            let arr = [model1,model2]
+            let model4 = YHPreviewInfoSessionModel(cellType: .idPictureType, cellTitle: "证件照片", cellData2: arr)
+            arrDataForSpouse.append(model4)
+        }
+        
+        arrData = arrDataForSpouse
+    }
+    
+    //子女 数据
+    func installDataForChildren() {
+        
+    }
+    
+    //兄弟姐妹 数据
+    func installDataForBrother() {
+        
+    }
+    
+    
+    
+    
+}
+
+
+
+// MARK: - UITableViewDelegate 和 UITableViewDataSource
+extension YHPreviewFamilyMemberViewController {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return arrData.count
+    }
+    
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withClass: YHPreviewInfoCell.self)
+        cell.selectionStyle = .none
+        cell.model = arrData[indexPath.row]
+        return cell
+    }
+}
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoCell.swift

@@ -53,7 +53,7 @@ extension YHPreviewInfoCell {
         
         if model?.cellType == .countryInfoType {
             guard let model = model else { return }
-            let view = YHPreviewInfoCertificateInformationItemsView(frame: .zero)
+            let view = YHPreviewInfoNameAndSubNameItemsView(frame: .zero)
             view.dataModel = model
             holdView.addSubview(view)
             view.snp.makeConstraints { make in