处理 个人信息表 手势

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -69,6 +69,7 @@
 		A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51044192B495DD0006B60BB /* UIView+Extension.swift */; };
 		A514E5DC2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */; };
 		A5167B272B692CF20084C08F /* YHPersonInfoIdentificationCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5167B262B692CF20084C08F /* YHPersonInfoIdentificationCardView.swift */; };
+		A5167B332B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5167B322B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift */; };
 		A53026902B4E6F2700F35102 /* YHHomeCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */; };
 		A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */; };
 		A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */; };
@@ -274,6 +275,7 @@
 		A51044192B495DD0006B60BB /* UIView+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
 		A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceCenterSecondViewController.swift; sourceTree = "<group>"; };
 		A5167B262B692CF20084C08F /* YHPersonInfoIdentificationCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoIdentificationCardView.swift; sourceTree = "<group>"; };
+		A5167B322B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoBaseViewController.swift; sourceTree = "<group>"; };
 		A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeCustomCell.swift; sourceTree = "<group>"; };
 		A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
 		A5573ECE2B317BFF00D98EC0 /* galaxy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = galaxy.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -663,9 +665,9 @@
 		A5167B2D2B6A23D10084C08F /* PersonInfoList(个人信息表) */ = {
 			isa = PBXGroup;
 			children = (
-				A5167B302B6A24010084C08F /* C */,
-				A5167B2F2B6A23FC0084C08F /* V */,
 				A5167B2E2B6A23F50084C08F /* M */,
+				A5167B2F2B6A23FC0084C08F /* V */,
+				A5167B302B6A24010084C08F /* C */,
 			);
 			path = "PersonInfoList(个人信息表)";
 			sourceTree = "<group>";
@@ -699,6 +701,7 @@
 			children = (
 				A5FD63E32B678AC000D1D9DA /* YHPersonInformMainViewController.swift */,
 				A5FD63E52B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift */,
+				A5167B322B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift */,
 				A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift */,
 				A5FD63E92B67D95100D1D9DA /* YHFamilyMemberViewController.swift */,
 			);
@@ -813,8 +816,8 @@
 			isa = PBXGroup;
 			children = (
 				A5ACE8E82B4564F7002C94D2 /* M */,
-				A5ACE8E92B4564F7002C94D2 /* C */,
 				A5ACE8EB2B4564F7002C94D2 /* V */,
+				A5ACE8E92B4564F7002C94D2 /* C */,
 			);
 			path = "Mine（我的）";
 			sourceTree = "<group>";
@@ -1385,6 +1388,7 @@
 				A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */,
 				A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */,
 				A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */,
+				A5167B332B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift in Sources */,
 				A5C5B3122B57B47D00A7C5D1 /* YHDavidCell0.swift in Sources */,
 				A5FD63FA2B68D95700D1D9DA /* YHPersonInfoIdentityCardModel.swift in Sources */,
 				A56D2D612B62020C009C83A8 /* YHContractMainItemStatusCell.swift in Sources */,

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

@@ -7,12 +7,10 @@
 //
 
 import UIKit
-import JXSegmentedView
-
 /*
  *家庭成员信息
  */
-class YHFamilyMemberViewController: YHBaseViewController {
+class YHFamilyMemberViewController: YHPersonInfoBaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -21,25 +19,6 @@ class YHFamilyMemberViewController: YHBaseViewController {
 
         // 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(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/C/YHMainApplicantInfoViewController.swift

@@ -11,44 +11,16 @@ import JXSegmentedView
 /*
  *主申请人信息
  */
-class YHMainApplicantInfoViewController: YHBaseViewController {
+class YHMainApplicantInfoViewController: YHPersonInfoBaseViewController {
     var arrData : [YHPersonInfoCellModel] = []
-    
-    
     override func viewDidLoad() {
         super.viewDidLoad()
-//        view.backgroundColor = .red// for test hjl
-        
-        // Do any additional setup after loading the view.
         setupUI()
     }
     
     
-    let contryInfoView = YHPersonInfoSessionHoldView()
-    let baseInfoView = YHPersonInfoSessionHoldView()
-    
-    
-    var homeTableView: YHGestureTableView = {
-        let tableView = YHGestureTableView(frame: .zero, style: .grouped)
-        tableView.backgroundColor = .clear
-        tableView.separatorStyle = .none
-        tableView.showsHorizontalScrollIndicator = false
-        tableView.showsVerticalScrollIndicator = false
-        tableView.register(YHPersonInfoCommonCell.self,forCellReuseIdentifier: YHPersonInfoCommonCell.cellReuseIdentifier)
-        return tableView
-    }()
-    
-}
-
-
-// MARK: - JXSegmentedListContainerViewListDelegate
-extension YHMainApplicantInfoViewController: JXSegmentedListContainerViewListDelegate {
-    func listView() -> UIView {
-        return view
-    }
 }
 
-
 private extension YHMainApplicantInfoViewController {
     func fakeData() {
         do {
@@ -126,62 +98,22 @@ private extension YHMainApplicantInfoViewController {
     
     func setupUI() {
         fakeData()
-        
-        homeTableView.delegate = self
-        homeTableView.dataSource = self
-        view.addSubview(homeTableView)
-        homeTableView.snp.makeConstraints { make in
-            make.top.bottom.equalToSuperview()
-            make.left.equalTo(16)
-            make.right.equalTo(-16)
-        }
-        homeTableView.reloadData()        
+        self.homeTableView.register(YHPersonInfoCommonCell.self,forCellReuseIdentifier: YHPersonInfoCommonCell.cellReuseIdentifier)
+        self.homeTableView.reloadData()
     }
 }
 
 
 
 // MARK: - UITableViewDelegate 和 UITableViewDataSource
-extension YHMainApplicantInfoViewController : UITableViewDelegate,UITableViewDataSource {
-    
-//    func numberOfSections(in tableView: UITableView) -> Int {
-//        return 1
-//    }
-    
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+extension YHMainApplicantInfoViewController {
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return arrData.count
     }
     
-    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        return 0.001
-    }
-    
-    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 0.001))
-        return view
-    }
-    
-    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        return 0.001
-    }
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
-        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 0.001))
-        return view
-    }
-    
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return UITableView.automaticDimension
-    }
-    
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withClass: YHPersonInfoCommonCell.self)
         cell.model = arrData[indexPath.row]
         return cell
     }
-    
-    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        tableView.deselectRow(at: indexPath, animated: true)
-        printLog("点击了 tableView Cell \(indexPath.row)")
-    }
 }
-

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

+//
+//  YHPersonInfoBaseViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/1/31.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import JXSegmentedView
+
+class YHPersonInfoBaseViewController: YHBaseViewController {
+
+    public var homeTableView: YHGestureTableView = {
+        let tableView = YHGestureTableView(frame: .zero, style: .grouped)
+        tableView.backgroundColor = .clear
+        tableView.separatorStyle = .none
+        tableView.showsHorizontalScrollIndicator = false
+        tableView.showsVerticalScrollIndicator = false
+        
+        return tableView
+    }()
+    
+    
+    public var vcCanScroll : Bool = true
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        
+        homeTableView.delegate = self
+        homeTableView.dataSource = self
+        view.addSubview(homeTableView)
+       
+    }
+    
+    override func viewWillLayoutSubviews() {
+        super.viewWillLayoutSubviews()
+        homeTableView.snp.makeConstraints { make in
+            make.top.bottom.equalToSuperview()
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+        }
+    }
+}
+
+
+
+// MARK: - 滑动使用
+extension YHPersonInfoBaseViewController: UIScrollViewDelegate {
+    //控制滑动交互
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        let scrollViewSet: CGFloat = scrollView.contentOffset.y
+        if vcCanScroll == false {//不能滚动时
+            scrollView.contentOffset = CGPoint(x: 0, y: 0)
+        } else {
+            if (scrollViewSet <= 0) {
+                scrollView.contentOffset = CGPoint(x: 0, y: 0)
+                vcCanScroll = false
+                NotificationCenter.default.post(name:  Notification.Name(rawValue: "leaveTop0"), object: nil)
+            } else {
+                scrollView.contentOffset = CGPoint(x: 0, y: scrollViewSet)
+            }
+        }
+    }
+}
+
+// MARK: - JXSegmentedListContainerViewListDelegate
+extension YHPersonInfoBaseViewController: JXSegmentedListContainerViewListDelegate {
+    func listView() -> UIView {
+        return view
+    }
+}
+
+
+
+// MARK: - UITableViewDelegate 和 UITableViewDataSource
+extension YHPersonInfoBaseViewController : UITableViewDelegate,UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 0
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        return UITableViewCell()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 0.001
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 0.001))
+        return view
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.001
+    }
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 0.001))
+        return view
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+}
+

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

@@ -13,15 +13,14 @@ 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 : [YHBaseViewController] = []
+    var arrItemVCs : [YHPersonInfoBaseViewController] = []
     var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 58))
     lazy var segmentedDataSource: JXSegmentedBaseDataSource = {
         let dataSource = JXSegmentedTitleDataSource()
@@ -50,19 +49,36 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
         super.viewDidLoad()
         
 //        for _ in arrItemTitles {
-//            let vc = YHDavidTestViewController()
+//            let vc = YHMainApplicantInfoViewController()
 //            arrItemVCs.append(vc)
 //        }
         
-        //添加
-        arrItemVCs.append(YHMainApplicantInfoViewController())
-        arrItemVCs.append(YHFamilyMemberViewController())
+        do {
+            let vc = YHMainApplicantInfoViewController()
+            arrItemVCs.append(vc)
+        }
+        do {
+            let vc = YHFamilyMemberViewController()
+            arrItemVCs.append(vc)
+        }
+        do {
+            let vc = YHFamilyMemberViewController()
+            arrItemVCs.append(vc)
+        }
+        do {
+            let vc = YHFamilyMemberViewController()
+            arrItemVCs.append(vc)
+        }
+        do {
+            let vc = YHFamilyMemberViewController()
+            arrItemVCs.append(vc)
+        }
+        do {
+            let vc = YHFamilyMemberViewController()
+            arrItemVCs.append(vc)
+        }
         
-        arrItemVCs.append(YHMainApplicantInfoViewController())
-        arrItemVCs.append(YHFamilyMemberViewController())
         
-        arrItemVCs.append(YHMainApplicantInfoViewController())
-        arrItemVCs.append(YHFamilyMemberViewController())//for test hjl
         
         
         
@@ -111,12 +127,15 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
         segmentedView.frame = CGRect(x: 0, y: 0, width: view.bounds.size.width, height: 58)
         listContainerView.frame = CGRect(x: 0, y: 58, width: view.bounds.size.width, height: view.bounds.size.height - 58)
         segmentedView.backgroundColor = .white
+        
+        
+        view.backgroundColor = .yellow//for test hjl
     }
 }
 
 extension YHPersonInfoControllerHoldViewController: JXSegmentedViewDelegate {
     func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
-        NotificationCenter.default.post(name:  Notification.Name(rawValue: "scrollViewDidEndDragging"), object: nil)
+        NotificationCenter.default.post(name:  Notification.Name(rawValue: "scrollViewDidEndDragging0"), object: nil)
     }
 
     /// 正在滚动中的回调
@@ -127,7 +146,7 @@ extension YHPersonInfoControllerHoldViewController: JXSegmentedViewDelegate {
     ///   - 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)
+        NotificationCenter.default.post(name:  Notification.Name(rawValue: "scrollViewWillBeginDragging0"), object: nil)
     }
 }
 
@@ -140,6 +159,6 @@ extension YHPersonInfoControllerHoldViewController: JXSegmentedListContainerView
     }
 
     func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate {
-        return arrItemVCs[index] as! JXSegmentedListContainerViewListDelegate
+        return arrItemVCs[index] as JXSegmentedListContainerViewListDelegate
     }
 }

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

@@ -26,14 +26,12 @@ class YHPersonInformMainViewController: YHBaseViewController {
         tableView.separatorStyle = .none
         tableView.showsHorizontalScrollIndicator = false
         tableView.showsVerticalScrollIndicator = false
-//        tableView.register(YHDavidCell0.self,forCellReuseIdentifier: YHDavidCell0.cellReuseIdentifier)
         return tableView
     }()
     
     
     var myHeadView : UIView = {
         let view = UIView(frame: CGRect(x: 16, y: 0, width: KScreenWidth - 16 * 2, height: 128))
-//        view.backgroundColor = .yellow //for test hjl
         return view
     }()
     
@@ -67,13 +65,13 @@ class YHPersonInformMainViewController: YHBaseViewController {
         super.viewDidLoad()
         
         
-        NotificationCenter.default.addObserver(self, selector: #selector(leaveTopOp), name:Notification.Name(rawValue: "leaveTop"), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(leaveTopOp), name:Notification.Name(rawValue: "leaveTop0"), object: nil)
         
         
-        NotificationCenter.default.addObserver(self, selector: #selector(beginDragging), name:Notification.Name(rawValue: "scrollViewWillBeginDragging"), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(beginDragging), name:Notification.Name(rawValue: "scrollViewWillBeginDragging0"), object: nil)
         
         
-        NotificationCenter.default.addObserver(self, selector: #selector(endDragging), name:Notification.Name(rawValue: "scrollViewDidEndDragging"), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(endDragging), name:Notification.Name(rawValue: "scrollViewDidEndDragging0"), object: nil)
         
         //1.UI
         initView()

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

@@ -35,6 +35,17 @@ class YHPersonInfoCommonCell: UITableViewCell {
         return contryInfoView
     }()
     
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        if holdView.superview != nil {
+            holdView.snp.makeConstraints { make in
+                make.top.equalTo(14)
+                make.left.bottom.equalToSuperview()
+                make.right.equalToSuperview().offset(-16)
+            }
+        }
+    }
+    
 }
 
 extension YHPersonInfoCommonCell {
@@ -50,7 +61,8 @@ extension YHPersonInfoCommonCell {
         contentView.addSubview(holdView)
         holdView.snp.makeConstraints { make in
             make.top.equalTo(14)
-            make.left.right.bottom.equalToSuperview()
+            make.left.bottom.equalToSuperview()
+            make.width.equalTo(contentView.snp.width)
         }
         
         if model?.cellType == 0 {
@@ -197,7 +209,6 @@ extension YHPersonInfoCommonCell {
                 }
             }
         }
-        
         else if model?.cellType == 2 {
             
             guard let model = model else { return }

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

@@ -12,7 +12,7 @@ class YHPersonInfoSessionHoldView: UIView {
     override init(frame: CGRect) {
         super.init(frame: frame)
         backgroundColor = .white
-        layer.cornerRadius = 12
+        layer.cornerRadius = 6
         clipsToBounds = true
     }