个人信息表 主框架

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -158,6 +158,8 @@
 		A5FD63E12B66592300D1D9DA /* YHScoreItemCellForAge.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E02B66592300D1D9DA /* YHScoreItemCellForAge.swift */; };
 		A5FD63E42B678AC000D1D9DA /* YHPersonInformMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E32B678AC000D1D9DA /* YHPersonInformMainViewController.swift */; };
 		A5FD63E62B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E52B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift */; };
+		A5FD63E82B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift */; };
+		A5FD63EA2B67D95100D1D9DA /* YHFamilyMemberViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E92B67D95100D1D9DA /* YHFamilyMemberViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -348,6 +350,8 @@
 		A5FD63E02B66592300D1D9DA /* YHScoreItemCellForAge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHScoreItemCellForAge.swift; sourceTree = "<group>"; };
 		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 /* YHMainApplicantInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMainApplicantInfoViewController.swift; sourceTree = "<group>"; };
+		A5FD63E92B67D95100D1D9DA /* YHFamilyMemberViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "YH\U001dFamilyMemberViewController.swift"; sourceTree = "<group>"; };
 		B6BB01E4C5DB87B66F0ECE84 /* Pods-galaxy.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.release.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -988,6 +992,8 @@
 			children = (
 				A5FD63E32B678AC000D1D9DA /* YHPersonInformMainViewController.swift */,
 				A5FD63E52B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift */,
+				A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift */,
+				A5FD63E92B67D95100D1D9DA /* YHFamilyMemberViewController.swift */,
 			);
 			path = "个人信息表";
 			sourceTree = "<group>";
@@ -1223,6 +1229,7 @@
 				A5C382CA2B5E1F4C00C5E65C /* YHLoginTipsView.swift in Sources */,
 				0468D4452B62064700CFB916 /* YHStepView.swift in Sources */,
 				A5C5B3232B57BF8F00A7C5D1 /* YHDavidCell1.swift in Sources */,
+				A5FD63E82B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift in Sources */,
 				A5FD63CD2B64E2D600D1D9DA /* YHScoreDetailViewController.swift in Sources */,
 				A5C5B2FB2B5535DF00A7C5D1 /* YHHomeBannerView.swift in Sources */,
 				041B528B2B5E15F1007EBCEB /* YHFormItemQuestionCell.swift in Sources */,
@@ -1245,6 +1252,7 @@
 				A5ACE9502B4564F7002C94D2 /* YhCacheTool.swift in Sources */,
 				0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */,
 				042FBBB92B627C0F00F9DE23 /* YHCertificateInfo.swift in Sources */,
+				A5FD63EA2B67D95100D1D9DA /* YHFamilyMemberViewController.swift in Sources */,
 				A5ACE93F2B4564F7002C94D2 /* UIViewController+Extension.swift in Sources */,
 				A5FD63E12B66592300D1D9DA /* YHScoreItemCellForAge.swift in Sources */,
 				042FBBD62B67BDD500F9DE23 /* YHBrotherInfoVC.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/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
+import JXSegmentedView
+
+/*
+ *家庭成员信息
+ */
+class YHFamilyMemberViewController: YHBaseViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        view.backgroundColor = .green
+
+        // Do any additional setup after loading the view.
+    }
+    
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}
+
+
+// MARK: - JXSegmentedListContainerViewListDelegate
+extension YHFamilyMemberViewController: JXSegmentedListContainerViewListDelegate {
+    func listView() -> UIView {
+        return view
+    }
+}
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/个人信息表/YHMainApplicantInfoViewController.swift

+//
+//  YHMainApplicantInfoViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/1/29.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import JXSegmentedView
+/*
+ *主申请人信息
+ */
+class YHMainApplicantInfoViewController: YHBaseViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        view.backgroundColor = .red// for test hjl
+
+        // Do any additional setup after loading the view.
+    }
+    
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}
+
+
+// MARK: - JXSegmentedListContainerViewListDelegate
+extension YHMainApplicantInfoViewController: JXSegmentedListContainerViewListDelegate {
+    func listView() -> UIView {
+        return view
+    }
+}
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/个人信息表/YHPersonInfoControllerHoldViewController.swift

@@ -13,15 +13,15 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
     
     var canScroll : Bool = false {
         didSet {
-            for vc in arrItemVCs {
-                vc.vcCanScroll = canScroll
-            }
+//            for vc in arrItemVCs {
+//                vc.vcCanScroll = canScroll
+//            }
         }
     }
     
     
     let arrItemTitles = ["主申请人信息","家庭成员信息","基本资料","学历/专业资格","工作经验","其他信息"]
-    var arrItemVCs : [YHDavidTestViewController] = []
+    var arrItemVCs : [YHBaseViewController] = []
     var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 58))
     lazy var segmentedDataSource: JXSegmentedBaseDataSource = {
         let dataSource = JXSegmentedTitleDataSource()
@@ -49,10 +49,21 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        for _ in arrItemTitles {
-            let vc = YHDavidTestViewController()
-            arrItemVCs.append(vc)
-        }
+//        for _ in arrItemTitles {
+//            let vc = YHDavidTestViewController()
+//            arrItemVCs.append(vc)
+//        }
+        
+        
+        arrItemVCs.append(YHMainApplicantInfoViewController())
+        arrItemVCs.append(YHFamilyMemberViewController())
+        
+        arrItemVCs.append(YHMainApplicantInfoViewController())
+        arrItemVCs.append(YHFamilyMemberViewController())
+        
+        arrItemVCs.append(YHMainApplicantInfoViewController())
+        arrItemVCs.append(YHFamilyMemberViewController())//for test hjl
+        
         
         //segmentedViewDataSource一定要通过属性强持有！！！！！！！！！
         segmentedView.dataSource = segmentedDataSource
@@ -125,6 +136,6 @@ extension YHPersonInfoControllerHoldViewController: JXSegmentedListContainerView
     }
 
     func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate {
-        return arrItemVCs[index]
+        return arrItemVCs[index] as! JXSegmentedListContainerViewListDelegate
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/个人信息表/YHPersonInformMainViewController.swift

@@ -15,7 +15,7 @@ class YHPersonInformMainViewController: YHBaseViewController {
     
     var myCellHeight : CGFloat {
         get {
-            return view.bounds.size.height  - k_TabBar_Height
+            return view.bounds.size.height - k_Height_NavigationtBarAndStatuBar
         }
     }
     
@@ -38,7 +38,7 @@ class YHPersonInformMainViewController: YHBaseViewController {
     
     
     var myHeadView : UIView = {
-        let view = UIView(frame: CGRect(x: 16, y: 0, width: KScreenWidth - 16 * 2, height: 105 + 17  + 6))
+        let view = UIView(frame: CGRect(x: 16, y: 0, width: KScreenWidth - 16 * 2, height: 128))
 //        view.backgroundColor = .yellow //for test hjl
         return view
     }()
@@ -95,6 +95,7 @@ class YHPersonInformMainViewController: YHBaseViewController {
     
     override func viewDidLayoutSubviews() {
         super.viewDidLayoutSubviews()
+        cellView.view.frame = CGRect(x: 0, y: 0, width: KScreenWidth, height: myCellHeight)
     }
 }
 
@@ -227,12 +228,6 @@ extension YHPersonInformMainViewController {
             self.homeTableView.reloadData()
         }
     }
-    
-    
-    @objc func tapSearch() {
-        printLog("*")
-        navigationController?.pushViewController(YHDavidTestViewController())
-    }
 }
 
 // MARK: - UITableViewDelegate 和 UITableViewDataSource
@@ -264,13 +259,15 @@ extension YHPersonInformMainViewController : UITableViewDelegate,UITableViewData
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return CGRectGetHeight(self.view.bounds)
+        return myCellHeight
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = UITableViewCell()
         cellView.view.frame = CGRect(x: 0, y: 0, width: cell.contentView.bounds.size.width, height: myCellHeight)
         cell.contentView.addSubview(cellView.view)
+        
+        cellView.view.backgroundColor = .orange//for test hjl
         return cell
     }