Merge branch 'develop' into duyu

# Conflicts:
#	galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -78,6 +78,10 @@
 		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 */; };
+		A5234E282B6E2EED00A33433 /* YHBasicInfoFillViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5234E272B6E2EED00A33433 /* YHBasicInfoFillViewController.swift */; };
+		A5234E2A2B6E349600A33433 /* YHBasicInfoFillBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5234E292B6E349600A33433 /* YHBasicInfoFillBottomView.swift */; };
+		A5234E2C2B6E3BA400A33433 /* YHBasicInfoFillCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5234E2B2B6E3BA400A33433 /* YHBasicInfoFillCell.swift */; };
+		A5234E2E2B6E43EA00A33433 /* YHBasicInfoFillView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5234E2D2B6E43EA00A33433 /* YHBasicInfoFillView.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 */; };
@@ -295,6 +299,10 @@
 		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>"; };
+		A5234E272B6E2EED00A33433 /* YHBasicInfoFillViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBasicInfoFillViewController.swift; sourceTree = "<group>"; };
+		A5234E292B6E349600A33433 /* YHBasicInfoFillBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBasicInfoFillBottomView.swift; sourceTree = "<group>"; };
+		A5234E2B2B6E3BA400A33433 /* YHBasicInfoFillCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBasicInfoFillCell.swift; sourceTree = "<group>"; };
+		A5234E2D2B6E43EA00A33433 /* YHBasicInfoFillView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBasicInfoFillView.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; };
@@ -816,6 +824,9 @@
 		A58556BD2B6BD85A003746B2 /* V */ = {
 			isa = PBXGroup;
 			children = (
+				A5234E292B6E349600A33433 /* YHBasicInfoFillBottomView.swift */,
+				A5234E2D2B6E43EA00A33433 /* YHBasicInfoFillView.swift */,
+				A5234E2B2B6E3BA400A33433 /* YHBasicInfoFillCell.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -823,6 +834,7 @@
 		A58556BE2B6BD85E003746B2 /* C */ = {
 			isa = PBXGroup;
 			children = (
+				A5234E272B6E2EED00A33433 /* YHBasicInfoFillViewController.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -1369,6 +1381,7 @@
 				A5ACE9332B4564F7002C94D2 /* NetBaseModel.swift in Sources */,
 				049A48AA2B49536000D0C641 /* YHAboutUsAdvantageCell.swift in Sources */,
 				A5C5B3002B55623800A7C5D1 /* YHMainContentBaseViewController.swift in Sources */,
+				A5234E2C2B6E3BA400A33433 /* YHBasicInfoFillCell.swift in Sources */,
 				A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */,
 				A5ACE9542B4564F7002C94D2 /* YHNavigationController.swift in Sources */,
 				A5FD63DF2B6639AD00D1D9DA /* YHScoreDataModel.swift in Sources */,
@@ -1473,6 +1486,7 @@
 				A5FD63FA2B68D95700D1D9DA /* YHPersonInfoIdentityCardModel.swift in Sources */,
 				A56D2D612B62020C009C83A8 /* YHContractMainItemStatusCell.swift in Sources */,
 				0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */,
+				A5234E282B6E2EED00A33433 /* YHBasicInfoFillViewController.swift in Sources */,
 				0468D4492B6258A900CFB916 /* YHItemView.swift in Sources */,
 				041B528F2B5E620E007EBCEB /* YHFormItemInputTextCell.swift in Sources */,
 				A5FD63C72B638CA000D1D9DA /* YHSubmintAllInfoSuccessTipView.swift in Sources */,
@@ -1501,12 +1515,14 @@
 				A5C5B2EA2B4ECA4D00A7C5D1 /* YHDavidModel0.swift in Sources */,
 				A5ACE9572B4564F7002C94D2 /* YHBasicContentView.swift in Sources */,
 				042FBBC92B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift in Sources */,
+				A5234E2E2B6E43EA00A33433 /* YHBasicInfoFillView.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 */,
+				A5234E2A2B6E349600A33433 /* YHBasicInfoFillBottomView.swift in Sources */,
 				04A7BC912B6B7B89000E8D47 /* YHTwoOptionAlertView.swift in Sources */,
 				0468D4792B68A08600CFB916 /* YHAddressViewController.swift in Sources */,
 				040FA3372B6F701E0069D17F /* File.swift in Sources */,

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

@@ -314,12 +314,39 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
         printLog("点击了 \(indexPath.section)section  --- \(indexPath.row)row")
+        
+        
         let model = serviceCenterMainReqVM.arrInfoFillStep[indexPath.row]
-        if (indexPath.row + 1 > serviceCenterMainReqVM.myInfoFillStep) {
-            let message = "请先完成" + model.name + "填写"
-            YHHUD.flash(message: message)
+        
+        if indexPath.row == 0 {
+            //主申请人信息
+            let vc = YHMainApplicantInformationViewController()
+            navigationController?.pushViewController(vc)
+        } else if indexPath.row == 1 {
+            //家庭程序信息
+            let vc = YHFamilyMemberFormVC(orderId: orderId ?? 0)
+            navigationController?.pushViewController(vc)
+        } else if indexPath.row == 2 {
+            //基本信息
+            let vc = YHBasicInfoFillViewController()
+            vc.orderId = orderId
+            navigationController?.pushViewController(vc)
+        } else if indexPath.row == 3 {
+            //学历/专业资格
+          
+        } else if indexPath.row == 4 {
+            //工作经历
+        } else if indexPath.row == 5 {
+            //其他信息
+            
         } else {
-            navigationController?.pushViewController(YHMainApplicantInformationViewController())
+            
         }
+        
+        
+       
+        
+        
+        
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/C/YHBasicInfoFillViewController.swift

+//
+//  YHBasicInfoFillViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/2/3.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import GKNavigationBarSwift
+/*
+ 基本资料信息填写
+ */
+
+class YHBasicInfoFillViewController: YHBaseViewController {
+    var orderId : Int?
+    private let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
+    var homeTableView: UITableView = {
+        let tableView = UITableView(frame: .zero, style:.grouped)
+        tableView.backgroundColor = .clear
+        tableView.separatorStyle = .none
+        tableView.showsHorizontalScrollIndicator = false
+        tableView.showsVerticalScrollIndicator = false
+        tableView.rowHeight = UITableView.automaticDimension
+        tableView.register(YHBasicInfoFillCell.self,forCellReuseIdentifier: YHBasicInfoFillCell.cellReuseIdentifier)
+        return tableView
+    }()
+    
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        //1.0
+        initView()
+        
+        //2.0
+        loadData()
+    }
+}
+
+// MARK: - private methods
+extension YHBasicInfoFillViewController {
+    private func initView() {
+        gk_backStyle = .black
+        gk_navTitle = "基本资料信息填写"
+        gk_navBackgroundColor = .white
+        gk_navBarAlpha = 1
+        
+        let bottomView = YHBasicInfoFillBottomView()
+        view.addSubview(bottomView)
+        bottomView.snp.makeConstraints { make in
+            make.bottom.left.right.equalToSuperview()
+            make.height.equalTo(YHBasicInfoFillBottomView.viewH)
+        }
+        
+        bottomView.block = { tag in
+            if tag == 0 {
+                //点击了保存按钮
+                printLog("点击了保存按钮")
+                
+            } else {
+                //点击了提交按钮
+                printLog("点击了提交按钮")
+                
+            }
+            
+        }
+        
+        
+        homeTableView.delegate = self
+        homeTableView.dataSource = self
+        view.addSubview(homeTableView)
+        homeTableView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 15)
+            make.bottom.equalTo(bottomView.snp.top)
+            make.left.equalTo(kMargin)
+            make.right.equalTo(-kMargin)
+        }
+    }
+    
+    
+    private func loadData() {
+        guard let orderId = orderId else { return}
+        let param = ["order_id":orderId]
+//        serviceCenterMainReqVM.getMyScoreDetail(params: param) { success, error in
+//            if success == true {
+//                
+//            } else {
+//                YHHUD.flash(message: error?.errorMsg ?? "发生错误,请重试")
+//            }
+//            self.homeTableView.reloadData()
+//        }
+    }
+    
+}
+
+// MARK: - delegates
+// MARK: - UITableViewDelegate 和 UITableViewDataSource
+extension YHBasicInfoFillViewController : 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 UITableView.automaticDimension
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+      
+        let cell = tableView.dequeueReusableCell(withClass: YHBasicInfoFillCell.self)
+//        cell.selectionStyle = .none
+//        cell.optionData = self.serviceCenterMainReqVM.localScoreData?[indexPath.row + 1]
+        
+        cell.block = {
+//            tableView.reloadRows(at: <#T##[IndexPath]#>, with: <#T##UITableView.RowAnimation#>)
+            tableView.reloadData()
+        }
+        return cell
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/V/YHBasicInfoFillBottomView.swift

+//
+//  YHBasicInfoFillBottomView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/2/3.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHBasicInfoFillBottomView: UIView {
+    static let viewH : CGFloat = 98.0
+    
+    override init(frame: CGRect) {
+        super.init(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: YHBasicInfoFillBottomView.viewH))
+        setupUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    
+    
+    typealias Block = (Int) -> ()
+    var block: Block?
+    var saveButton: UIButton!
+    var nextButton: UIButton!
+}
+
+private extension YHBasicInfoFillBottomView {
+    func setupUI() {
+        
+        backgroundColor = .white
+        
+        saveButton = {
+            let button = UIButton(type: .custom)
+            button.backgroundColor =  UIColor.contentBkgColor
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
+            button.contentHorizontalAlignment = .center
+            button.setTitle("保存", for: .normal)
+            button.setTitleColor(UIColor.mainTextColor, for: .normal)
+            button.layer.cornerRadius = kCornerRadius6
+            button.addTarget(self, action: #selector(save), for: .touchUpInside)
+            return button
+        }()
+        addSubview(saveButton)
+        saveButton.snp.makeConstraints { make in
+            make.left.equalTo(kMargin)
+            make.top.equalTo(10)
+            make.height.equalTo(44)
+            make.width.equalTo(86)
+        }
+        
+        nextButton = {
+            let button = UIButton(type: .custom)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
+            button.contentHorizontalAlignment = .center
+            button.setTitle("提交", for: .normal)
+            button.setTitleColor(.white, for: .normal)
+            button.layer.cornerRadius = kCornerRadius6
+            button.clipsToBounds = true
+            button.addTarget(self, action: #selector(submit), for: .touchUpInside)
+            return button
+        }()
+        addSubview(nextButton)
+        nextButton.snp.makeConstraints { make in
+            make.right.equalTo(-kMargin)
+            make.top.equalTo(10)
+            make.height.equalTo(44)
+            make.left.equalTo(saveButton.snp.right).offset(10)
+        }
+        
+        nextButton.layoutIfNeeded()
+        nextButton.backgroundGradient()
+    }
+    
+    @objc func save() {
+        block?(0)
+    }
+    @objc func submit() {
+        block?(1)
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/V/YHBasicInfoFillCell.swift

+//
+//  YHBasicInfoFillCell.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/2/3.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHBasicInfoFillCell: UITableViewCell {
+    static let cellReuseIdentifier = "YHBasicInfoFillCell"
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        
+        
+        selectionStyle = .none
+        
+        updateUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    let view0 = YHBasicInfoFillView()
+    let view1 = YHBasicInfoFillView()
+    
+    
+    typealias Block = () -> ()
+    var block: Block?
+}
+
+extension YHBasicInfoFillCell {
+    func updateUI() {
+//        for item in contentView.subviews {
+//            item.removeFromSuperview()
+//        }
+        
+        //主申请人
+        let holdView1 = UIView()
+        holdView1.backgroundColor = .white
+//        holdView1.backgroundColor = .red //for test hjl
+        holdView1.layer.cornerRadius = kCornerRadius6
+        holdView1.clipsToBounds = true
+        contentView.addSubview(holdView1)
+        holdView1.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.left.right.equalToSuperview()
+            make.bottom.equalToSuperview()
+        }
+        do {
+            
+            let sessionView = YHPersonInfoSessionView()
+            sessionView.updateTitle(title: "主申请人")
+            holdView1.addSubview(sessionView)
+            sessionView.snp.makeConstraints { make in
+                make.top.equalToSuperview()
+                make.right.equalToSuperview().offset(-18)
+                make.left.equalToSuperview().offset(18)
+                make.height.equalTo(YHPersonInfoSessionView.viewH)
+            }
+            
+            
+            
+            holdView1.addSubview(view0)
+            view0.snp.makeConstraints { make in
+                make.top.equalTo(sessionView.snp.bottom)
+                make.right.equalToSuperview().offset(-18)
+                make.left.equalToSuperview().offset(18)
+                
+            }
+//            view0.backgroundColor = .red //for test hjl
+            view0.block = {
+//                self.contentView.layoutIfNeeded()
+                
+                
+                self.view0.snp.remakeConstraints { make in
+                    make.top.equalTo(sessionView.snp.bottom)
+                    make.right.equalToSuperview().offset(-18)
+                    make.left.equalToSuperview().offset(18)
+                    
+                }
+                
+                
+                self.view1.snp.remakeConstraints { make in
+                    make.top.equalTo(self.view0.snp.bottom)
+                    make.right.equalToSuperview().offset(-18)
+                    make.left.equalToSuperview().offset(18)
+                    make.bottom.equalToSuperview()
+                }
+                
+//                self.layoutIfNeeded()
+                
+                self.block?()
+                
+            }
+            
+            
+            
+            
+            
+            
+            
+            
+            holdView1.addSubview(view1)
+            view1.snp.makeConstraints { make in
+                make.top.equalTo(view0.snp.bottom)
+                make.right.equalToSuperview().offset(-18)
+                make.left.equalToSuperview().offset(18)
+                make.bottom.equalToSuperview()
+            }
+//            view1.backgroundColor = .purple //for test hjl
+            view1.block = {
+                self.view1.snp.remakeConstraints { make in
+                    make.top.equalTo(self.view0.snp.bottom)
+                    make.right.equalToSuperview().offset(-18)
+                    make.left.equalToSuperview().offset(18)
+                    make.bottom.equalToSuperview()
+                }
+//                self.layoutIfNeeded()
+                
+                
+                
+                
+                self.block?()
+            }
+        }
+        
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/V/YHBasicInfoFillView.swift

+//
+//  YHBasicInfoFillView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/2/3.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHBasicInfoFillView: UIView {
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setupUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    
+    typealias Block = () -> ()
+    var block: Block?
+    
+    
+    
+    private let btnWidth = 70.0
+    private let btnHeight = 32.0
+    private let btnTitleSelectColor = UIColor.brandMainColor
+    private let btnTitleDefaultColor = UIColor.mainTextColor
+    private let btnBgDefaultColor = UIColor.contentBkgColor
+    private let btnBgSelectColor = UIColor.brandMainColor.withAlphaComponent(0.08)
+    private let answerBaseTag  = 9527
+    
+    
+    
+    private lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = .mainTextColor
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        label.font = UIFont.PFSC_R(ofSize: 14)
+        label.lineBreakMode = .byCharWrapping
+        return label
+    }()
+    
+    private lazy var answer1Btn: UIButton = {
+        
+        let btn = UIButton()
+        btn.setTitle("否", for: .normal)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
+        btn.backgroundColor = btnBgDefaultColor
+        btn.layer.cornerRadius = btnHeight/2.0
+        btn.layer.masksToBounds = true
+        btn.layer.borderWidth = 1
+        btn.layer.borderColor = UIColor.clear.cgColor
+        btn.tag = answerBaseTag
+        btn.addTarget(self, action: #selector(didClickResponseBtn(btn:)), for: .touchUpInside)
+        return btn
+    }()
+    
+    private lazy var answer2Btn: UIButton = {
+        let btn = UIButton()
+        btn.setTitle("是", for: .normal)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
+        btn.backgroundColor = btnBgDefaultColor
+        btn.layer.cornerRadius = btnHeight/2.0
+        btn.layer.masksToBounds = true
+        btn.layer.borderWidth = 1
+        btn.layer.borderColor = UIColor.clear.cgColor
+        btn.tag = answerBaseTag+1
+        btn.addTarget(self, action: #selector(didClickResponseBtn(btn:)), for: .touchUpInside)
+        return btn
+    }()
+    
+    
+    private lazy var bottomLine : UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor(hex: 0xF0F0F0)
+        view.backgroundColor = .red //for test hjl
+        return view
+    }()
+    
+    
+    private lazy var additionHoldView : UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor.contentBkgColor
+        view.layer.cornerRadius = kCornerRadius6
+        view.clipsToBounds = true
+        return view
+    }()
+    
+    
+    var title:String? {
+        didSet {
+            if let question = title {
+                let str = "*"+question
+                let attributes: [NSAttributedString.Key: Any] = [
+                    .font: UIFont.PFSC_R(ofSize: 14),
+                    .foregroundColor: UIColor.mainTextColor
+                ]
+                let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
+                let starRange = NSRange(location: 0, length: 1)
+                questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor(hex:0xFF3A3A), range: starRange)
+                titleLabel.attributedText = questionAttrStr
+            }
+        }
+    }
+}
+
+
+private extension YHBasicInfoFillView {
+    func setupUI() {
+        
+        backgroundColor = .clear
+        
+        title = "1、是否曾在香港或其他地方因任何罪行或违法行为被定罪?"
+        
+        addSubview(titleLabel)
+        addSubview(answer2Btn)
+        addSubview(answer1Btn)
+        
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(kMargin)
+            make.left.right.equalToSuperview()
+        }
+        
+        
+        answer1Btn.snp.makeConstraints { make in
+            make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
+            make.left.equalTo(titleLabel.snp.left)
+            make.top.equalTo(titleLabel.snp.bottom).offset(12)
+        }
+        
+        answer2Btn.snp.makeConstraints { make in
+            make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
+            make.left.equalTo(answer1Btn.snp.right).offset(12)
+            make.top.equalTo(answer1Btn.snp.top)
+        }
+        
+        addSubview(bottomLine)
+        bottomLine.snp.makeConstraints { make in
+            make.top.equalTo(answer1Btn.snp.bottom).offset(12)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(0.5)
+            make.bottom.equalToSuperview()
+        }
+        bottomLine.isHidden = false
+        
+        addSubview(additionHoldView)
+        additionHoldView.snp.makeConstraints { make in
+            make.top.equalTo(answer1Btn.snp.bottom).offset(12)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(78)
+        }
+        additionHoldView.isHidden = true
+        
+//        answer1Btn.isSelected = true
+//        updateAnswerButton(answer1Btn, true)//for test hjl
+    }
+    
+    @objc func didClickResponseBtn(btn: UIButton) {
+        
+        printLog("点击了按钮哈 \(btn.tag)")
+        
+        btn.isSelected = true
+        updateAnswerButton(btn, true)
+        if btn == answer1Btn {
+            answer2Btn.isSelected = false
+            updateAnswerButton(answer2Btn, false)
+            additionHoldView.isHidden = true
+            bottomLine.isHidden = false
+            
+            
+            bottomLine.snp.remakeConstraints { make in
+                make.top.equalTo(answer1Btn.snp.bottom).offset(12)
+                make.left.right.equalToSuperview()
+                make.height.equalTo(0.5)
+                make.bottom.equalToSuperview()
+            }
+        } else {
+            answer1Btn.isSelected = false
+            updateAnswerButton(answer1Btn, false)
+            additionHoldView.isHidden = false
+            bottomLine.isHidden = true
+            
+            
+            additionHoldView.snp.remakeConstraints { make in
+                make.top.equalTo(answer1Btn.snp.bottom).offset(12)
+                make.left.right.equalToSuperview()
+                make.height.equalTo(78)
+                make.bottom.equalToSuperview().offset(-18)
+            }
+        }
+        layoutIfNeeded()
+        
+        block?()
+    }
+    
+    
+    
+    // 更新答案按钮选中状态
+    private func updateAnswerButton(_ btn:UIButton, _ isSelect:Bool) {
+        btn.layer.borderColor = (isSelect ? btnTitleSelectColor : .clear).cgColor
+        btn.setTitleColor((isSelect ? btnTitleSelectColor : btnTitleDefaultColor), for: .normal)
+        btn.backgroundColor = (isSelect ? btnBgSelectColor : btnBgDefaultColor)
+    }
+}

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

@@ -128,6 +128,7 @@ extension YHMainApplicantInformationViewController: UITableViewDelegate, UITable
             cell.informationBlock = {[weak self] model in
                 guard let self = self else { return }
                 self.viewModel.updateModel(model)
+                self.updateDataSource()
             }
             return cell
         }

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

@@ -51,6 +51,10 @@ enum YHItemID: Int {
     case id29 = 28 // 主申请人信息 手机号码
     case id30 = 29 // 主申请人信息 电子邮箱
     case id31 = 30 // 主申请人信息 香港身份证是否办理过是/否
+    case id32 = 31 // 现居住地址 海外地址
+    case id33 = 32 // 是否海外居住一年以上
+    case id34 = 33 // 主申请人信息 出生城市国外
+
 }
 
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/VM/YHMainApplicantInformationViewModel.swift

@@ -35,12 +35,18 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         let item1 = YHItemModel(id: .id3, isNeed: true, title: "省市地区", isUserKeyBoard: false, prompts: "请选择", message: string, type: .address)
         
         let item2 = YHItemModel(id: .id4, isNeed: true, title: "详细地址", isUserKeyBoard: true, prompts: "请填写小区、楼栋、单元室等", message: mainModel.address?.details)
+        let item11 = YHItemModel(id: .id32, isNeed: true, title: "详细地址", isUserKeyBoard: true, prompts: "请选择", message: mainModel.address?.foreign)
+        let item22 = YHItemModel(id: .id33, isNeed: true, title: "是否在海外居住一年及以上", isUserKeyBoard: false, prompts: "", message: "\(mainModel.is_live_oversea_year ?? 0)", leftButtonString: "是", rightButtonString: "否")
         let section1 = YHSectionItemModel(title: "现居住地址", models: [item4, item1, item2])
-        
+        let section11 = YHSectionItemModel(title: "现居住地址", models: [item4, item11, item22])
         let item3 = YHItemModel(id: .id5, isNeed: true, title: "是否办理", isUserKeyBoard: false, prompts: "", message: "\(mainModel.has_hk_id ?? 0)", leftButtonString: "是", rightButtonString: "否")
         let section2 = YHSectionItemModel(title: "港澳通行证", models: [item3])
-        
-        return [section, section1, section2]
+        let addressCountry = mainModel.address?.country ?? ""
+        if addressCountry.contains("中国") {
+            return [section, section1, section2]
+        } else {
+            return [section, section11, section2]
+        }
     }
     
     func getDocumentInformation() -> [YHSectionItemModel] {
@@ -62,7 +68,11 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         let item7 = YHItemModel(id: .id19, isNeed: false, title: "签发日期", isUserKeyBoard: false, prompts: "请选择", message: mainModel.certificates?.passport?.issue_date_start_at, type: .time)
         let item8 = YHItemModel(id: .id20, isNeed: false, title: "届满日期", isUserKeyBoard: false, prompts: "请选择", message: mainModel.certificates?.passport?.issue_date_end_at, type: .time)
         let section2 = YHSectionItemModel(title: "护照及其他旅行证件(选填)", models: [item4, item5, item6, item7, item8])
-        return [section, section1, section2]
+        if mainModel.has_hk_id == 1 {
+            return [section, section1, section2]
+        } else {
+            return [section, section2]
+        }
     }
     
     func getDetailDataSource() -> [YHSectionItemModel] {
@@ -70,7 +80,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         let item1 = YHItemModel(id: .id22, isNeed: false, title: "曾用名", isUserKeyBoard: true, prompts: "请与户口本一致，若无则不填", message: mainModel.used_name)
         let item2 = YHItemModel(id: .id23, isNeed: false, title: "婚前姓氏", isUserKeyBoard: true, prompts: "如有则填写，仅支持输入字母", message: mainModel.surname)
         let item3 = YHItemModel(id: .id24, isNeed: true, title: "出生日期", isUserKeyBoard: false, prompts: "请选择", message: mainModel.birthday, type: .time)
-        let item4 = YHItemModel(id: .id25, isNeed: true, title: "出生国家/地区", isUserKeyBoard: false, prompts: nil, message: nil, leftButtonString: "国内", rightButtonString: "国外")
+        let item4 = YHItemModel(id: .id25, isNeed: true, title: "出生国家/地区", isUserKeyBoard: false, prompts: nil, message: "\(mainModel.birth_place_aboard ?? 0)", leftButtonString: "国内", rightButtonString: "国外")
         var string = ""
         if let array = mainModel.birth_place?.area {
             for item in array {
@@ -78,17 +88,28 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             }
         }
         let item5 = YHItemModel(id: .id26, isNeed: true, title: "出生城市", isUserKeyBoard: false, prompts: "请选择", message: string, type: .address)
+        let item55 = YHItemModel(id: .id34, isNeed: true, title: "出生城市", isUserKeyBoard: true, prompts: "请选择", message: mainModel.birth_place?.foreign)
         let item6 = YHItemModel(id: .id27, isNeed: true, title: "性别", isUserKeyBoard: false, prompts: "请选择", message: mainModel.sex, type: .sex)
         let item7 = YHItemModel(id: .id28, isNeed: true, title: "婚姻状况", isUserKeyBoard: false, prompts: "请选择", message: mainModel.married, type: .marry)
-        let section = YHSectionItemModel(title: "主申请人信息", models: [item, item1, item2, item3, item4, item5, item6, item7])
+        var item555 = item5
+        if mainModel.birth_place_aboard == 1 {
+            item555 = item55
+        }
+        let section = YHSectionItemModel(title: "主申请人信息", models: [item, item1, item2, item3, item4, item555, item6, item7])
         
         let item8 = YHItemModel(id: .id29, isNeed: true, title: "手机号码", isUserKeyBoard: true, prompts: "请输入", message: mainModel.mobile)
         let item9 = YHItemModel(id: .id30, isNeed: true, title: "电子邮箱", isUserKeyBoard: true, prompts: "请输入", message: mainModel.email)
         let section1 = YHSectionItemModel(title: "联系方式", models: [item8, item9])
         
         let item10 = YHItemModel(id: .id31, isNeed: true, title: "是否办理过", isUserKeyBoard: false, prompts: nil, message: "\(mainModel.has_hk_id ?? 0)", leftButtonString: "是", rightButtonString: "否")
+        let item11 = YHItemModel(id: .id29, isNeed: true, title: "香港身份证号码", isUserKeyBoard: true, prompts: "请输入", message: mainModel.hk_id_number)
         let section2 = YHSectionItemModel(title: "香港身份证", models: [item10])
-        return [section, section1, section2]
+        let section22 = YHSectionItemModel(title: "香港身份证", models: [item10, item11])
+        var section222 = section2
+        if mainModel.has_hk_id == 1 {
+            section222 = section22
+        }
+        return [section, section1, section222]
     }
     
     func getIDCardDataSource() -> [YHSectionItemModel] {
@@ -96,7 +117,11 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         let section = YHSectionItemModel(title: "中国身份证(选填)", models: [item])
         let item1 = YHItemModel(id: .id6, isNeed: true, title: "港澳通行证(选填)", isUserKeyBoard: false, prompts: "请输入", message: nil)
         let section1 = YHSectionItemModel(title: "中国身份证(选填)", models: [item1])
-        return [section, section1]
+        if mainModel.has_hk_id == 1 {
+            return [section, section1]
+        } else {
+            return [section]
+        }
     }
     
     func updateModel(_ item: YHItemModel) {
@@ -152,7 +177,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         case .id24:
             mainModel.birthday = item.message
         case .id25:
-            printLog("1")
+            mainModel.birth_place_aboard = item.value?.first?.int
         case .id26:
             mainModel.birth_place?.area  = item.value
         case .id27:
@@ -165,6 +190,12 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             mainModel.email = item.message
         case .id31:
             mainModel.has_hk_id = item.value?.first?.int
+        case .id32:
+            mainModel.address?.foreign = item.message
+        case .id33:
+            mainModel.is_live_oversea_year = item.value?.first?.int
+        case .id34:
+            mainModel.birth_place?.foreign = item.message
         }
     }
     

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

@@ -114,6 +114,7 @@ extension YHMainApplicantInfoViewController {
     
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withClass: YHPersonInfoCommonCell.self)
+        cell.selectionStyle = .none
         cell.model = arrData[indexPath.row]
         return cell
     }

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

@@ -22,8 +22,8 @@ class YHPersonInfoCellView: UIView {
         let lable0 = UILabel(text: "--")
         lable0.textColor = UIColor.labelTextColor2
         lable0.font = UIFont.PFSC_R(ofSize: 14)
-        lable0.numberOfLines = 0
-        lable0.lineBreakMode = .byCharWrapping
+//        lable0.numberOfLines = 1
+//        lable0.lineBreakMode = .byCharWrapping
         return lable0
     }()
     
@@ -45,7 +45,7 @@ class YHPersonInfoCellView: UIView {
             make.top.equalToSuperview().offset(18)
             make.left.equalToSuperview()
             make.width.lessThanOrEqualTo(154)
-            make.height.equalTo(17)
+            make.height.equalTo(20)
         }
         nameLable.setContentCompressionResistancePriority(.required, for: .horizontal)
         
@@ -54,6 +54,7 @@ class YHPersonInfoCellView: UIView {
             make.top.equalTo(nameLable.snp.top)
             make.right.equalToSuperview()
             make.left.equalTo(nameLable.snp.right).offset(10)
+            
             make.bottom.equalToSuperview()
         }
     }

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

@@ -77,6 +77,7 @@ extension YHPersonInfoCommonCell {
                 make.top.equalToSuperview()
                 make.right.equalToSuperview().offset(-18)
                 make.left.equalToSuperview().offset(18)
+                make.height.equalTo(YHPersonInfoSessionView.viewH)
             }
             
             if arrData.count == 1 {
@@ -129,6 +130,7 @@ extension YHPersonInfoCommonCell {
                 make.top.equalToSuperview()
                 make.right.equalToSuperview().offset(-18)
                 make.left.equalToSuperview().offset(18)
+                make.height.equalTo(YHPersonInfoSessionView.viewH)
             }
             
             var tmp : UIView = sessionView
@@ -221,6 +223,7 @@ extension YHPersonInfoCommonCell {
                 make.top.equalToSuperview()
                 make.right.equalToSuperview().offset(-18)
                 make.left.equalToSuperview().offset(18)
+                make.height.equalTo(YHPersonInfoSessionView.viewH)
             }
             
             var tmp : UIView = sessionView

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

@@ -9,6 +9,7 @@
 import UIKit
 
 class YHPersonInfoSessionView: UIView {
+    static let viewH : CGFloat = 52
     override init(frame: CGRect) {
         super.init(frame: frame)
         setupUI()
@@ -23,8 +24,8 @@ class YHPersonInfoSessionView: UIView {
         let lable0 = UILabel(text: "--")
         lable0.textColor = UIColor.mainTextColor
         lable0.font = UIFont.PFSC_M(ofSize: 17)
-        lable0.numberOfLines = 0
-        lable0.lineBreakMode = .byWordWrapping
+//        lable0.numberOfLines = 0
+//        lable0.lineBreakMode = .byWordWrapping
         return lable0
     }()
     
@@ -44,9 +45,10 @@ class YHPersonInfoSessionView: UIView {
         addSubview(nameLable)
         nameLable.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalToSuperview().offset(kMargin)
-            make.bottom.equalTo(bottomLine.snp.top).offset(-kMargin)
+            make.top.equalToSuperview()
+            make.bottom.equalTo(bottomLine.snp.top)
         }
+//        nameLable.backgroundColor = .yellow//for test hjl
     }
 }
 

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -94,7 +94,7 @@ class YHNetRequest: NSObject {
         
         requestHeader.add(name:"sign",value:sign)
         requestHeader.add(name: "token", value: "eyJpdiI6IlViSTIyb3VvNkVhUjliSFByY0Z3WXc9PSIsInZhbHVlIjoiZEFZbXpWUWlXa2NLcTBLazEzNXlia2VtQ0VXN2h3UjdXMVluZFBZWFwvZjJlbXZ5T1wvUkZcLysrN1ZyRTRoU3FDY3U4ejBUcllkdUo2WUlSRHF3dlhuT3BqVjBTWEI0UkhubStCbE5tcU84dUxZaWxmVWxLXC9tczVBVFhUeW02MmdoSEN6V0w5Y1ViUWsxNmZPK1MxU2RJSEQ3ak9Zak92T2FRdzRVWGphRkRxOXFvaXd2XC9aUjkxRGw0VU1VOGc1U2dXNVpnWmtpQWZCeFwvcVlkbTBKVnNUMzZJUjhTY0dOd25Qc2NuYlRzelZKMG1laGNRY2Vjc3dmdFdCb3VUazFuc0NIbzh1SjJYQWFrWFwvTTFDYnhBNFB6VHJSU0c3XC9mZDZnXC9xQXJaRElYcERGaDQzZzRKTHFpREcyd040OFRpdlpNMm80S1kxZk1nbVJSTVpHWEJtWXFudHVUcm55VWxFb3ZtaFwvS1REYzl4cDFzdUdUT25JckRqblJGUEdERVVIU0JUaVFySDhrdmdWRDNkYlRFbHBqSzhjdkZXMWhBWHRuVG5IbCsxMXFjZWVGM25lNXVjbnNpdGlaYVZlamVUbmZqZkRcL1BzQVVtRUZUR0pCV0RXZjhVajZSMEp5bG5mNVU2c0lZRXQrcm9TaFl6MVUzVjc4VnN3cVF4c3JmYWxJWHBOaG44dFd2bHp6T3AwQkJGN2JcL2V0XC9RTEgyU3RkblM0dFNSeUZuUDQrYzhMZFM5SnlPc25GMzB2d2RiWVlTZXlKa3JlYmRCSlMxd1RYdWRsSzVnaHIrb3d5YnZOZXpvd2RrRTVqS2xyR0xMVjhDQ0J2ZTgyeVdjaWJ3d3puQlUreW5ZM3I5UzlxaDE0VEZHMEdyNE9CUXRtcUpoQzBYWUFYOFRITGhZeVQxSnN6TlpLdm96QmdEYmxFSGtiVnZjT1V2WVQxUHRmNnVnOTlic0VPWHM2dG45Z0toNGpWSTRLXC9CVGQ1RUc2bnpDbStMVnBaa0E3OXFYdFA0YUNSMWdNOUptbThsRHg2Q3YxY25vbjBWWElrQ3ZXT3FlR0VYd2dqRllkeVZzQVI4TzV6Q2wreWhCOHo2WUVxbHZ5S2VIbDdBWmdrTW9CVFkrQXpmaDJkZGN4b1BUMnl2TFFrcjhrU0lFT2VMQkVtOUVLWTBJWEdNbDgzYjlrbDJSQmVYdXJkcGFUNFwvaUduV1VSZzJRRVV2S0tOR3ozYVBwSWlCNHNxaFNZOElNQWNUWVByQ0tQUmFLMjNIRU5yNlZvcnJ3Q1wvTVU0cHkrMkJGdHhBVUVDN1R3K1lBVkd2NHhSVXBlK0pIZEY1THpuRGpcL1o3N0l4ZDgwN1pcL3JhZmpjMzIxd2pFbXFJM1RBOTY0Ykd1TjYwZ3NSZjh5Kzd2cUlHZzJpVTErOUhNSTJxTGQ1cU5NZ2xtekllSnJ2NUZyZjc4MXRjR1d0TG5yOVIxbWtleGJxdGIxTXd3RXdOcU5hamE2YmhJdXk4ZjB6V1VSdWZnZHYxNkQ3SXE0cEY3RUxDUmNXcEEyMVA3b2FqQzJ3UzloZ1BLaytmdXJweUVTbWtYZzEzbzNKcWFYQVJtck81R1UrQU1rUDVFcmpvMm14cVBXc3ByQTlkNGNZVU1hcU83bHBTaGJsU0lYSHljYUEzXC9NSmlidnQ0WU5oeVE1OFJweWVtMGYyXC9DbW1ERDBMRFFmUWRBS3NUemRXSW10cmdzTkVnWTZDQ0d6YzNHNldVVGpiaXlIUWVqdnlcL2dmRGx6VDZOZ0d2bEtnK0RQTFcxanliWWU0Ym5wT1FrUTBtaEhzZlAxZXArSDRNaVRWcVowR2JMWlFuMGNPS2hseFE2eUg3MGJVa1lBcDljRk1LT2hTZUdKckw4SWxxK01FUnY4dHZaY2JSaHc9PSIsIm1hYyI6ImJjYTRlNzljYjc3NTg0NWNiOWQxN2UxYzJmNmRhNjNlMmE1ZGE4YzRkNTZiNzJjNGZiYjM0M2U4ZmIxZmViOWYifQ==")
-       
+
         headers = requestHeader
     }