Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 单行输入框cell
  //  单行双选择cell
  // 双选择题cell

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -8,6 +8,9 @@
 
 /* Begin PBXBuildFile section */
 		041B52872B5657B3007EBCEB /* IMAppKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52862B5657B3007EBCEB /* IMAppKey.swift */; };
+		041B528B2B5E15F1007EBCEB /* YHDoubleChoiceQuestionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B528A2B5E15F1007EBCEB /* YHDoubleChoiceQuestionCell.swift */; };
+		041B528D2B5E58FA007EBCEB /* YHDoubleChoiceFormCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B528C2B5E58FA007EBCEB /* YHDoubleChoiceFormCell.swift */; };
+		041B528F2B5E620E007EBCEB /* YHSingleLineInputCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B528E2B5E620E007EBCEB /* YHSingleLineInputCell.swift */; };
 		0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; };
 		0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; };
 		0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; };
@@ -138,6 +141,9 @@
 
 /* Begin PBXFileReference section */
 		041B52862B5657B3007EBCEB /* IMAppKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMAppKey.swift; sourceTree = "<group>"; };
+		041B528A2B5E15F1007EBCEB /* YHDoubleChoiceQuestionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDoubleChoiceQuestionCell.swift; sourceTree = "<group>"; };
+		041B528C2B5E58FA007EBCEB /* YHDoubleChoiceFormCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDoubleChoiceFormCell.swift; sourceTree = "<group>"; };
+		041B528E2B5E620E007EBCEB /* YHSingleLineInputCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSingleLineInputCell.swift; sourceTree = "<group>"; };
 		0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVerificationCodeLoginController.swift; sourceTree = "<group>"; };
 		0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneMessageView.swift; sourceTree = "<group>"; };
 		0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; };
@@ -279,6 +285,24 @@
 			path = IM;
 			sourceTree = "<group>";
 		};
+		041B52882B5E13EB007EBCEB /* FamilyMember */ = {
+			isa = PBXGroup;
+			children = (
+				041B52892B5E14EB007EBCEB /* View */,
+			);
+			path = FamilyMember;
+			sourceTree = "<group>";
+		};
+		041B52892B5E14EB007EBCEB /* View */ = {
+			isa = PBXGroup;
+			children = (
+				041B528A2B5E15F1007EBCEB /* YHDoubleChoiceQuestionCell.swift */,
+				041B528C2B5E58FA007EBCEB /* YHDoubleChoiceFormCell.swift */,
+				041B528E2B5E620E007EBCEB /* YHSingleLineInputCell.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		0468D4292B55017400CFB916 /* Analytics */ = {
 			isa = PBXGroup;
 			children = (
@@ -703,6 +727,7 @@
 		A5C382C82B5E101E00C5E65C /* ServiceProcess(流程) */ = {
 			isa = PBXGroup;
 			children = (
+				041B52882B5E13EB007EBCEB /* FamilyMember */,
 			);
 			path = "ServiceProcess(流程)";
 			sourceTree = "<group>";
@@ -908,6 +933,7 @@
 				A5ACE9542B4564F7002C94D2 /* YHNavigationController.swift in Sources */,
 				A5ACE95E2B4571BF002C94D2 /* YHHomeViewController.swift in Sources */,
 				A5ACE93D2B4564F7002C94D2 /* UIButton+Extension.swift in Sources */,
+				041B528D2B5E58FA007EBCEB /* YHDoubleChoiceFormCell.swift in Sources */,
 				A5ACE9292B4564F7002C94D2 /* YHSmsCodeInputView.swift in Sources */,
 				A5ACE9452B4564F7002C94D2 /* BsHUDContainerView.swift in Sources */,
 				A5ACE93A2B4564F7002C94D2 /* NSAttributedString+Extension.swift in Sources */,
@@ -928,6 +954,7 @@
 				A5C382CA2B5E1F4C00C5E65C /* YHLoginTipsView.swift in Sources */,
 				A5C5B3232B57BF8F00A7C5D1 /* YHDavidCell1.swift in Sources */,
 				A5C5B2FB2B5535DF00A7C5D1 /* YHHomeBannerView.swift in Sources */,
+				041B528B2B5E15F1007EBCEB /* YHDoubleChoiceQuestionCell.swift in Sources */,
 				A5ACE94B2B4564F7002C94D2 /* BsHUDRotatingImageView.swift in Sources */,
 				A5ACE94F2B4564F7002C94D2 /* YhOverlayView.swift in Sources */,
 				A53026902B4E6F2700F35102 /* YHHomeCustomCell.swift in Sources */,
@@ -956,6 +983,7 @@
 				A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */,
 				A5C5B3122B57B47D00A7C5D1 /* YHDavidCell0.swift in Sources */,
 				0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */,
+				041B528F2B5E620E007EBCEB /* YHSingleLineInputCell.swift in Sources */,
 				A5ACE9402B4564F7002C94D2 /* String+Extension.swift in Sources */,
 				A5ACE9482B4564F7002C94D2 /* BsHUDWariningView.swift in Sources */,
 				A5C5B3252B57C74900A7C5D1 /* YHDavidCell3.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHDoubleChoiceFormCell.swift

+//
+//  YHDoubleChoiceFormCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/22.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHDoubleChoiceFormCell: UITableViewCell {
+    
+    static let cellReuseIdentifier = "YHDoubleChoiceFormCell"
+    let btnWidth = 70.0
+    let btnHeight = 32.0
+    let btnTitleSelectColor = UIColor(hex: 0x4487F9)
+    let btnTitleDefaultColor = UIColor(hex:0x222222)
+    let btnBgColor = UIColor(hex:0xF8F9FB)
+    let confirmTag = 9527
+    let negativeTag = 9528
+    
+    var question:String? {
+        didSet {
+            
+            if let question = question {
+                let str = "*"+question
+                let attributes: [NSAttributedString.Key: Any] = [
+                    .font: UIFont.PFSCR(ofSize: 14),
+                    .foregroundColor: UIColor(hex:0x222222)
+                ]
+                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)
+                questionLabel.attributedText = questionAttrStr
+            }
+            
+        }
+    }
+
+    lazy var questionLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString:"#333333")
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        label.font = UIFont.systemFont(ofSize: 14)
+        return label
+    }()
+    
+    lazy var confirmBtn: UIButton = {
+        let btn = UIButton.bs_button(title: "是".local, font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleDefaultColor)
+        btn.backgroundColor = btnBgColor
+        btn.layer.cornerRadius = btnHeight/2.0
+        btn.layer.masksToBounds = true
+        btn.layer.borderWidth = 1
+        btn.tag = confirmTag
+        btn.addTarget(self, action: #selector(didClickResponseBtn(btn:)), for: .touchUpInside)
+        return btn
+    }()
+    
+    lazy var negativeBtn: UIButton = {
+        let btn = UIButton.bs_button(title: "否".local, font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleDefaultColor)
+        btn.backgroundColor = btnBgColor
+        btn.layer.cornerRadius = btnHeight/2.0
+        btn.layer.masksToBounds = true
+        btn.layer.borderWidth = 1
+        btn.tag = negativeTag
+        btn.addTarget(self, action: #selector(didClickResponseBtn(btn:)), for: .touchUpInside)
+        return btn
+    }()
+
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+
+        question = "  1、是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？ "
+        
+        contentView.addSubview(questionLabel)
+        contentView.addSubview(negativeBtn)
+        contentView.addSubview(confirmBtn)
+        // 默认选择否按钮
+        didClickResponseBtn(btn: negativeBtn)
+        
+        questionLabel.snp.makeConstraints { make in
+            make.top.equalTo(contentView.snp.top).offset(22)
+            make.left.equalToSuperview().offset(16)
+            make.right.equalTo(confirmBtn.snp.left).offset(-8)
+            make.bottom.equalTo(contentView.snp.bottom).offset(-22)
+        }
+        
+        negativeBtn.snp.makeConstraints { make in
+            make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
+            make.right.equalToSuperview().offset(-16)
+            make.top.equalToSuperview().offset(16)
+        }
+        
+        confirmBtn.snp.makeConstraints { make in
+            make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
+            make.right.equalTo(negativeBtn.snp.left).offset(-8)
+            make.top.equalTo(negativeBtn)
+        }
+    }
+    
+    @objc func didClickResponseBtn(btn: UIButton) {
+        let isConfirm = (btn.tag == confirmTag)
+        
+        confirmBtn.layer.borderColor = (isConfirm ? btnTitleSelectColor : .clear).cgColor
+        confirmBtn.setTitleColor((isConfirm ? btnTitleSelectColor : btnTitleDefaultColor), for: .normal)
+        negativeBtn.layer.borderColor = (isConfirm ? .clear : btnTitleSelectColor).cgColor
+        negativeBtn.setTitleColor((isConfirm ?  btnTitleDefaultColor: btnTitleSelectColor), for: .normal)
+        
+    }
+
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHDoubleChoiceQuestionCell.swift

+//
+//  YHCheckQuestionCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/22.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+
+class YHDoubleChoiceQuestionCell: UITableViewCell {
+    
+     static let cellReuseIdentifier = "YHDoubleChoiceQuestionCell"
+     let btnWidth = 70.0
+     let btnHeight = 32.0
+     let btnTitleSelectColor = UIColor(hex: 0x4487F9)
+     let btnTitleDefaultColor = UIColor(hex:0x222222)
+     let btnBgColor = UIColor(hex:0xF8F9FB)
+     let confirmTag = 9527
+     let negativeTag = 9528
+    
+    var question:String? {
+        didSet {
+            
+            if let question = question {
+                let str = "*"+question
+                let attributes: [NSAttributedString.Key: Any] = [
+                    .font: UIFont.PFSCR(ofSize: 14),
+                    .foregroundColor: UIColor(hex:0x222222)
+                ]
+                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)
+                questionLabel.attributedText = questionAttrStr
+            }
+            
+        }
+    }
+    
+    var selectBlock:((Bool) ->Void)?
+
+    lazy var questionLabel: UILabel = {
+        let label = UILabel()
+        label.numberOfLines = 0
+        label.textColor = UIColor(hexString:"#333333")
+        label.textAlignment = .left
+        label.font = UIFont.PFSCR(ofSize: 14)
+        return label
+    }()
+    
+    lazy var confirmBtn: UIButton = {
+        let btn = UIButton.bs_button(title: "是".local, font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleDefaultColor)
+        btn.backgroundColor = btnBgColor
+        btn.layer.cornerRadius = btnHeight/2.0
+        btn.layer.masksToBounds = true
+        btn.layer.borderWidth = 1
+        btn.tag = confirmTag
+        btn.addTarget(self, action: #selector(didClickResponseBtn(btn:)), for: .touchUpInside)
+        return btn
+    }()
+    
+    lazy var negativeBtn: UIButton = {
+        let btn = UIButton.bs_button(title: "否".local, font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleDefaultColor)
+        btn.backgroundColor = btnBgColor
+        btn.layer.cornerRadius = btnHeight/2.0
+        btn.layer.masksToBounds = true
+        btn.layer.borderWidth = 1
+        btn.tag = negativeTag
+        btn.addTarget(self, action: #selector(didClickResponseBtn(btn:)), for: .touchUpInside)
+        return btn
+    }()
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+        
+        question = "  1、是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？ "
+        contentView.addSubview(questionLabel)
+        contentView.addSubview(negativeBtn)
+        contentView.addSubview(confirmBtn)
+        // 默认选择否按钮
+        didClickResponseBtn(btn: negativeBtn)
+        
+        questionLabel.snp.makeConstraints { make in
+            make.top.equalTo(contentView.snp.top).offset(12)
+            make.left.equalToSuperview().offset(16)
+            make.right.equalToSuperview().offset(-16)
+        }
+        
+        negativeBtn.snp.makeConstraints { make in
+            make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
+            make.left.equalTo(questionLabel)
+            make.top.equalTo(questionLabel.snp.bottom).offset(12)
+            make.bottom.equalToSuperview().offset(-16)
+        }
+        
+        confirmBtn.snp.makeConstraints { make in
+            make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
+            make.left.equalTo(negativeBtn.snp.right).offset(12)
+            make.centerY.equalTo(negativeBtn)
+        }
+    }
+    
+    @objc func didClickResponseBtn(btn: UIButton) {
+        let isConfirm = (btn.tag == confirmTag)
+        
+        confirmBtn.layer.borderColor = (isConfirm ? btnTitleSelectColor : .clear).cgColor
+        confirmBtn.setTitleColor((isConfirm ? btnTitleSelectColor : btnTitleDefaultColor), for: .normal)
+        negativeBtn.layer.borderColor = (isConfirm ? .clear : btnTitleSelectColor).cgColor
+        negativeBtn.setTitleColor((isConfirm ?  btnTitleDefaultColor: btnTitleSelectColor), for: .normal)
+        
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHSingleLineInputCell.swift

+//
+//  YHSingleLineInputCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/22.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHSingleLineInputCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHSingleLineInputCell"
+    
+    // 是否必填 如必填title会展示红色*
+    var isMust = false
+    
+    var title:String? {
+        didSet {
+            
+            if let title = title {
+                let str = (isMust ? ("*"+title) : title)
+                let attributes: [NSAttributedString.Key: Any] = [
+                    .font: UIFont.PFSCR(ofSize: 14),
+                    .foregroundColor: UIColor(hex:0x222222)
+                ]
+                var 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
+            }
+            
+        }
+    }
+
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString:"#333333")
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        label.font = UIFont.PFSCR(ofSize: 14)
+        return label
+    }()
+    
+    lazy var textField:UITextField = {
+        let textField = UITextField()
+        textField.backgroundColor = .clear
+        textField.placeholder = "请如实填写"
+        textField.font = UIFont.PFSCR(ofSize: 14)
+        textField.tintColor = UIColor(hex: 0xC0C0C0)
+        textField.textColor = UIColor(hex: 0x222222)
+//        textField.delegate = self
+//        textField.addTarget(self, action: #selector(smsCodeInputChanged), for: .editingChanged)
+        return textField
+    }()
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+        contentView.addSubview(titleLabel)
+        contentView.addSubview(textField)
+        
+        isMust = true
+        title = "曾用名"
+        
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(16)
+            make.right.equalTo(textField.snp.left).offset(-8)
+            make.centerY.equalToSuperview()
+        }
+        
+        textField.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(contentView.snp.right).offset(-16)
+        }
+    }
+
+}