添加 个人信息 的代码

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHDavidTestViewController.swift

@@ -13,7 +13,6 @@ import GKNavigationBarSwift
 
 class YHDavidTestViewController: YHBaseViewController {
     var vcCanScroll : Bool = true
-    weak var myParentVc : ContentBaseViewController?
     
     lazy var descripeLable:UILabel = {
         let label = UILabel()

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeViewController.swift

@@ -25,7 +25,7 @@ class YHHomeViewController: YHBaseViewController {
         }
     }
     
-    let cellView: ContentBaseViewController = ContentBaseViewController()
+    let cellView: YHMainContentBaseViewController = YHMainContentBaseViewController()
     
     //model 及网络请求
     lazy var homeReqVM : YHHomePageViewModel = {

galaxy/galaxy/Classes/Modules/Home(首页)/C/ContentBaseViewController.swift → galaxy/galaxy/Classes/Modules/Home(首页)/C/YHMainContentBaseViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 import JXSegmentedView
 
-class ContentBaseViewController: UIViewController {
+class YHMainContentBaseViewController: UIViewController {
     
     var canScroll : Bool = false {
         didSet {
@@ -52,7 +52,6 @@ class ContentBaseViewController: UIViewController {
         
         for _ in arrItemTitles {
             let vc = YHDavidTestViewController()
-            vc.myParentVc = self
             arrItemVCs.append(vc)
         }
         
@@ -99,7 +98,7 @@ class ContentBaseViewController: UIViewController {
     }
 }
 
-extension ContentBaseViewController: JXSegmentedViewDelegate {
+extension YHMainContentBaseViewController: JXSegmentedViewDelegate {
     func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
         NotificationCenter.default.post(name:  Notification.Name(rawValue: "scrollViewDidEndDragging"), object: nil)
     }
@@ -116,7 +115,7 @@ extension ContentBaseViewController: JXSegmentedViewDelegate {
     }
 }
 
-extension ContentBaseViewController: JXSegmentedListContainerViewDataSource {
+extension YHMainContentBaseViewController: JXSegmentedListContainerViewDataSource {
     func numberOfLists(in listContainerView: JXSegmentedListContainerView) -> Int {
         if let titleDataSource = segmentedView.dataSource as? JXSegmentedBaseDataSource {
             return titleDataSource.dataSource.count

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift

@@ -111,7 +111,7 @@ extension YHInformationPerfectListVC {
     
     @objc func goInfoListVC() {
         //个人信息表
-        navigationController?.pushViewController(YHMyInformationListViewController())
+        navigationController?.pushViewController(YHPersonInformMainViewController())
     }
     
     @objc func clickSubmitBtn() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHMyInformationListViewController.swift

-//
-//  YHMyInformationListViewController.swift
-//  galaxy
-//
-//  Created by davidhuangA on 2024/1/27.
-//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
-//
-
-import UIKit
-/*
- *个人信息表
- */
-class YHMyInformationListViewController: YHBaseViewController {
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        // 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.
-    }
-    */
-
-}

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

+//
+//  YHPersonInfoControllerHoldViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/1/29.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import JXSegmentedView
+
+class YHPersonInfoControllerHoldViewController: UIViewController {
+    
+    var canScroll : Bool = false {
+        didSet {
+            for vc in arrItemVCs {
+                vc.vcCanScroll = canScroll
+            }
+        }
+    }
+    
+    
+    let arrItemTitles = ["主申请人信息","家庭成员信息","基本资料","学历/专业资格","工作经验","其他信息"]
+    
+    var arrItemVCs : [YHDavidTestViewController] = []
+    var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 40))
+    lazy var segmentedDataSource: JXSegmentedBaseDataSource = {
+        let dataSource = JXSegmentedTitleDataSource()
+        dataSource.isTitleColorGradientEnabled = true
+        dataSource.titles = arrItemTitles
+        
+        dataSource.titleNormalFont = UIFont.PingFangScM(ofSize: 16)
+        dataSource.titleNormalColor = .commonColor25
+        
+        dataSource.titleSelectedFont = UIFont.PingFangScM(ofSize: 18)
+        dataSource.titleSelectedColor = .commonColor100
+        
+        dataSource.isItemSpacingAverageEnabled = false
+        dataSource.itemWidth = JXSegmentedViewAutomaticDimension
+        dataSource.itemSpacing = 24
+        return dataSource
+    }()
+    
+    
+    //分类title 所对应的VC
+    lazy var listContainerView: JXSegmentedListContainerView! = {
+        return JXSegmentedListContainerView(dataSource: self, type: .collectionView)
+    }()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        for _ in arrItemTitles {
+            let vc = YHDavidTestViewController()
+            arrItemVCs.append(vc)
+        }
+        
+        //segmentedViewDataSource一定要通过属性强持有！！！！！！！！！
+        segmentedView.dataSource = segmentedDataSource
+        segmentedView.delegate = self
+        view.addSubview(segmentedView)
+
+        segmentedView.listContainer = listContainerView
+        view.addSubview(listContainerView)
+        
+        
+        //分类Title
+        segmentedView.dataSource = segmentedDataSource
+        segmentedView.delegate = self
+        
+        //配置指示器
+        let indicator = JXSegmentedIndicatorLineView()
+        indicator.indicatorWidth = 16
+        indicator.indicatorColor = .blue
+        segmentedView.indicators = [indicator]
+        segmentedView.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1)
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+
+        //处于第一个item的时候，才允许屏幕边缘手势返回
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = (segmentedView.selectedIndex == 0)
+    }
+
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+
+        //离开页面的时候，需要恢复屏幕边缘手势，不能影响其他页面
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = true
+    }
+    
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+
+        segmentedView.frame = CGRect(x: 0, y: 0, width: view.bounds.size.width, height: 50)
+        listContainerView.frame = CGRect(x: 0, y: 50, width: view.bounds.size.width, height: view.bounds.size.height - 50)
+    }
+}
+
+extension YHPersonInfoControllerHoldViewController: JXSegmentedViewDelegate {
+    func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
+        NotificationCenter.default.post(name:  Notification.Name(rawValue: "scrollViewDidEndDragging"), object: nil)
+    }
+
+    /// 正在滚动中的回调
+    ///
+    /// - Parameters:
+    ///   - segmentedView: JXSegmentedView
+    ///   - leftIndex: 正在滚动中，相对位置处于左边的index
+    ///   - rightIndex: 正在滚动中，相对位置处于右边的index
+    ///   - percent: 从左往右计算的百分比
+    func segmentedView(_ segmentedView: JXSegmentedView, scrollingFrom leftIndex: Int, to rightIndex: Int, percent: CGFloat) {
+        NotificationCenter.default.post(name:  Notification.Name(rawValue: "scrollViewWillBeginDragging"), object: nil)
+    }
+}
+
+extension YHPersonInfoControllerHoldViewController: JXSegmentedListContainerViewDataSource {
+    func numberOfLists(in listContainerView: JXSegmentedListContainerView) -> Int {
+        if let titleDataSource = segmentedView.dataSource as? JXSegmentedBaseDataSource {
+            return titleDataSource.dataSource.count
+        }
+        return 0
+    }
+
+    func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate {
+        return arrItemVCs[index]
+    }
+}

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

+//
+//  YHPersonInformationViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/1/29.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import GKNavigationBarSwift
+//import JXSegmentedView
+
+class YHPersonInformMainViewController: YHBaseViewController {
+    
+    let sectionHeaderHeight : CGFloat = 40
+    let cellHeight : CGFloat = 80
+    var arrItemVc : [UIViewController] = []
+    var canScroll : Bool = true
+    
+    
+    
+    var myCellHeight : CGFloat {
+        get {
+            return view.bounds.size.height - homeNavBarView.height  - k_TabBar_Height
+        }
+    }
+    
+    let cellView: YHMainContentBaseViewController = YHMainContentBaseViewController()
+    
+//    //model 及网络请求
+//    lazy var homeReqVM : YHHomePageViewModel = {
+//        return YHHomePageViewModel()
+//    }()
+    
+    //头部背景图片
+    lazy var headBkgImagV: UIImageView = {
+        let imagV = UIImageView()
+        imagV.image = UIImage(named: "home_head_bkg")
+        imagV.contentMode = .scaleAspectFill
+        return imagV
+    }()
+    
+    //自定义导航栏
+    lazy var homeNavBarView: UIView = {
+        let view1 = UIView()
+        view1.backgroundColor = .clear
+        view1.isUserInteractionEnabled = true
+        
+        let icon = UIImageView(image: UIImage(named: "home_nav_icon"))
+        icon.contentMode = .scaleAspectFill
+        view1.addSubview(icon)
+        icon.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview().offset(16)
+            make.height.equalTo(26)
+            make.width.equalTo(120)
+        }
+        
+        let btnMsg = UIButton(type: .custom)
+        btnMsg.setImage(UIImage(named: "home_nav_msg"), for: .normal)
+        view1.addSubview(btnMsg)
+        btnMsg.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-16)
+            make.height.width.equalTo(34)
+        }
+        btnMsg.addTarget(self, action: #selector(tapSearch), for: .touchUpInside)
+        
+        
+        let btnSearch = UIButton(type: .custom)
+        btnSearch.setImage(UIImage(named: "home_nav_search"), for: .normal)
+        btnSearch.addTarget(self, action: #selector(tapSearch), for: .touchUpInside)
+        view1.addSubview(btnSearch)
+        btnSearch.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(btnMsg.snp.left).offset(-12)
+            make.height.width.equalTo(34)
+        }
+        
+        return view1
+    }()
+    
+    
+    var homeTableView: YHGestureTableView = {
+        let tableView = YHGestureTableView(frame: .zero, style: .plain)
+        tableView.backgroundColor = .clear
+        tableView.separatorStyle = .none
+        tableView.showsHorizontalScrollIndicator = false
+        tableView.showsVerticalScrollIndicator = false
+//        tableView.register(YHDavidCell0.self,forCellReuseIdentifier: YHDavidCell0.cellReuseIdentifier)
+        return tableView
+    }()
+    
+    // MARK: - 生命周期方法
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(leaveTopOp), name:Notification.Name(rawValue: "leaveTop"), object: nil)
+        
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(beginDragging), name:Notification.Name(rawValue: "scrollViewWillBeginDragging"), object: nil)
+        
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(endDragging), name:Notification.Name(rawValue: "scrollViewDidEndDragging"), object: nil)
+        
+        //1.UI
+        initView()
+        
+        //2.网络请求
+        requestData()
+    }
+    
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+    }
+}
+
+// MARK: - 私有方法
+extension YHPersonInformMainViewController {
+    
+    @objc func leaveTopOp() {
+        canScroll = true
+    }
+    
+    @objc func beginDragging() {
+        homeTableView.isScrollEnabled = false
+        canScroll = false
+    }
+    
+    @objc func endDragging() {
+        homeTableView.isScrollEnabled = true
+        canScroll = true
+    }
+    
+    private func requestData() {
+//        self.homeReqVM.getHomeConfig { flag, error in
+//            if flag == true {
+//                //1. 调用model 刷新界面
+//                YHHUD.flash(message: "数据已更新")
+//            } else {
+//                //2. 给出 错误提示
+//                if let error = error {
+//                    YHHUD.flash(.error(message: error.errorMsg))
+//                }
+//            }
+//        }
+    }
+    
+    private func initView()->Void {
+        gk_navigationBar.isHidden = true
+        
+        view.addSubview(headBkgImagV)
+        headBkgImagV.snp.makeConstraints { make in
+            make.top.left.right.equalToSuperview()
+            make.height.equalTo(307)
+        }
+        
+        
+        view.addSubview(homeNavBarView)
+        homeNavBarView.layer.zPosition = 1
+        homeNavBarView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_safeAreaInsetsTop())
+            make.left.right.equalToSuperview()
+            make.height.equalTo(48)
+        }
+        
+        homeTableView.delegate = self
+        homeTableView.dataSource = self
+        view.addSubview(homeTableView)
+        homeTableView.snp.makeConstraints { make in
+            make.top.equalTo(homeNavBarView.snp.bottom).offset(0)
+            make.left.right.bottom.equalToSuperview()
+        }
+        
+        
+        
+        self.homeTableView.es.addPullToRefresh {
+            self.loadFirstItem()
+        }
+        self.homeTableView.es.startPullToRefresh()
+        self.homeTableView.es.addInfiniteScrolling {
+            self.loadFakeData()
+        }
+    }
+    
+    private func loadFirstItem() {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+            self.homeTableView.es.stopPullToRefresh(ignoreDate: true,ignoreFooter: false)
+            self.homeTableView.reloadData()
+        }
+    }
+    
+    private func loadFakeData() {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+            self.homeTableView.es.stopLoadingMore()
+            self.homeTableView.reloadData()
+        }
+    }
+    
+    
+    @objc func tapSearch() {
+        printLog("*")
+        navigationController?.pushViewController(YHDavidTestViewController())
+    }
+}
+
+// MARK: - UITableViewDelegate 和 UITableViewDataSource
+extension YHPersonInformMainViewController : UITableViewDelegate,UITableViewDataSource {
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 1
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 0
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        return UIView()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0
+    }
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return UIView()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return CGRectGetHeight(self.view.bounds)
+    }
+    
+    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)
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        tableView.deselectRow(at: indexPath, animated: true)
+        printLog("点击了 tableView Cell \(indexPath.row)")
+    }
+}
+
+extension YHPersonInformMainViewController: UIScrollViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        let bottomCellOffset: CGFloat = homeTableView.rect(forSection: 1).origin.y - 64 + 80 - 12 //48
+        if (scrollView.contentOffset.y >= bottomCellOffset) {
+            scrollView.contentOffset = CGPointMake(0, bottomCellOffset)
+            if canScroll == true {
+                canScroll = false
+                //传递参数到 子VC
+                cellView.canScroll = true
+            }
+        }else{
+            if canScroll == false {
+                scrollView.contentOffset = CGPoint(x: 0, y: bottomCellOffset)
+            }
+        }
+        self.homeTableView.showsVerticalScrollIndicator = false
+    }
+}

galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift

@@ -13,7 +13,9 @@ class YHBaseUrlManager {
     
     //开发环境
 //    static let baseUrlTest : String = "https://test-private-sphere.galaxy-immi.com/"
-    static let baseUrlTest : String = "https://test.api.gateway.galaxy-immi.com/"
+//    static let baseUrlTest : String = "https://test.api.gateway.galaxy-immi.com/"
+    static let baseUrlTest : String = "https://test-api-gateway.galaxy-immi.com/"
+