Merge commit '1b440ceb' into davidhuang

* commit '1b440ceb':
  //  职业选择
  // 父母信息
  // 证件信息

galaxy/galaxy/Classes/Base/M/File.swift

-//
-//  File.swift
-//  galaxy
-//
-//  Created by edy on 2024/2/4.
-//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
-//
-
-import Alamofire
-
-struct ArrayEncoding: ParameterEncoding {
-    func encode(_ urlRequest: URLRequestConvertible, with parameters: Parameters?) throws -> URLRequest {
-        var request = try URLEncoding().encode(urlRequest, with: parameters)
-        request.url = URL(string: request.url!.absoluteString.replacingOccurrences(of: "%5B%5D=", with: "="))
-        return request
-    }
-}

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

@@ -436,39 +436,40 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
         
         if item is YHFamilyMember {
             let detailItem = item as! YHFamilyMember
+        
+             // 配偶
+             if detailItem.relationType == .spouse {
+             let vc = YHSpouseInfoContainerVC()
+             vc.spouse = detailItem
+             vc.orderId = orderId
+             self.navigationController?.pushViewController(vc)
+             return
+             }
+             
+             // 父母
+             if detailItem.relationType == .father || detailItem.relationType == .mother {
+             let vc = YHParentInfoVC()
+             vc.parentInfo = detailItem
+             self.navigationController?.pushViewController(vc)
+             return
+             }
+             
+             // 子女
+             if detailItem.relationType == .child {
+             let vc = YHChildInitialInfoVC()
+             vc.child = detailItem
+             self.navigationController?.pushViewController(vc)
+             return
+             }
+             
+             // 兄弟姐妹
+             if detailItem.relationType == .brother {
+             let vc = YHBrotherInfoVC()
+             vc.brotherInfo = detailItem
+             self.navigationController?.pushViewController(vc)
+             return
+             }
             
-            // 配偶
-            if detailItem.relationType == .spouse {
-                let vc = YHSpouseInfoVC()
-                vc.spouse = detailItem
-                vc.orderId = orderId
-                self.navigationController?.pushViewController(vc)
-                return
-            }
-            
-            // 父母
-            if detailItem.relationType == .father || detailItem.relationType == .mother {
-                let vc = YHParentInfoVC()
-                vc.parentInfo = detailItem
-                self.navigationController?.pushViewController(vc)
-                return
-            }
-            
-            // 子女
-            if detailItem.relationType == .child {
-                let vc = YHChildInitialInfoVC()
-                vc.child = detailItem
-                self.navigationController?.pushViewController(vc)
-                return
-            }
-            
-            // 兄弟姐妹
-            if detailItem.relationType == .brother {
-                let vc = YHBrotherInfoVC()
-                vc.brotherInfo = detailItem
-                self.navigationController?.pushViewController(vc)
-                return
-            }
         }
     }
         

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

@@ -25,9 +25,8 @@ enum HKFormItemCellType: Int {
 class YHSpouseBasicInfoVC: YHBaseViewController {
     
     var spouse:YHFamilyMember?
-    
-    var cardInfo: YHCNIdentityCard?
-        
+    weak var delegate:YHSpouseInfoVCProtocol?
+
     var items:[[YHFormItemProtocol]] = [[YHFormItemProtocol]]()
     
     lazy var tableView: UITableView = {
@@ -292,7 +291,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                 cell.title = detailItem.getTitle()
                 cell.text = detailItem.value
                 cell.textChange = {
-                    [weak self] text in
+                    [weak self] (text, isEditEnd) in
                     guard let self = self else { return }
                     if detailItem.type == .spouseName {
                         self.spouse?.subsetName = text

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseInfoVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseInfoContainerVC.swift

@@ -11,10 +11,11 @@ import UIKit
 @objc protocol YHSpouseInfoVCProtocol {
     
     @objc optional func updateStepView()
+    @objc optional func saveInfo()
     
 }
 
-class YHSpouseInfoVC: YHBaseViewController, YHSpouseInfoVCProtocol {
+class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
 
     let familyRequest:YHFamilyRequestViewModel = YHFamilyRequestViewModel()
 
@@ -23,13 +24,12 @@ class YHSpouseInfoVC: YHBaseViewController, YHSpouseInfoVCProtocol {
     var spouse:YHFamilyMember? {
         didSet {
             initalInfoVC.spouse = spouse
-            passportInfoVC.familyMember = spouse
+            certificateVC.familyMember = spouse
             basicInfoVC.spouse = spouse
         }
     }
     
     var currentIndex = 0 {
-        
         didSet {
             currentIndex %= self.children.count
             stepView.currentIndex = currentIndex
@@ -53,7 +53,7 @@ class YHSpouseInfoVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         
     let initalInfoVC =  YHSpouseInitialInfoVC()
     let uploadVC = UIViewController()
-    let passportInfoVC = YHCertificateViewController()
+    let certificateVC = YHCertificateInfoController()
     let basicInfoVC = YHSpouseBasicInfoVC()
 
     override func viewDidLoad() {
@@ -66,7 +66,8 @@ class YHSpouseInfoVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         guard let spouse = spouse else { return }
         
         initalInfoVC.delegate = self
-
+        certificateVC.delegate = self
+        basicInfoVC.delegate = self
         
         updateStepView()
 
@@ -84,7 +85,7 @@ class YHSpouseInfoVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         bottomView.saveBlock = {
             [weak self] in
             guard let self = self else { return }
-            self.save()
+            self.saveInfo()
         }
         
         stepView.snp.makeConstraints { make in
@@ -118,11 +119,11 @@ class YHSpouseInfoVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             
             self.addChild(initalInfoVC)
             self.addChild(uploadVC)
-            self.addChild(passportInfoVC)
+            self.addChild(certificateVC)
             self.addChild(basicInfoVC)
             
             self.view.addSubview(basicInfoVC.view)
-            self.view.addSubview(passportInfoVC.view)
+            self.view.addSubview(certificateVC.view)
             self.view.addSubview(uploadVC.view)
             self.view.addSubview(initalInfoVC.view)
             
@@ -152,15 +153,23 @@ class YHSpouseInfoVC: YHBaseViewController, YHSpouseInfoVCProtocol {
     }
 }
 
-extension YHSpouseInfoVC {
-    func save() {
+extension YHSpouseInfoContainerVC {
+    func saveInfo() {
         
         guard  let spouse = spouse else { return }
-        guard let info = spouse.toDictionary() else { return }
-        
-        let arr = info["has_degree_json"] as! [[String:Any]]
-        let parmas:[String:Any] = info
-        
+        guard var info = spouse.toDictionary() else { return }
+        
+//        let certi = [ "cnIdentityCard":
+//                        ["id":116871,"number":"421087199005010811","issue_at":"深圳","issue_date_start_at":"2017-01-01","issue_date_end_at":"2029-01-01","img_front":"","img_back":""],
+//                        "passport":["id":116872,"number":"421087199005010811","issue_at":"深圳","issue_date_start_at":"2020-01-01","issue_date_end_at":"2023-01-01","img_front":"","img_back":"","passport_type":3],
+//                        "hkMacaoPass":["id":118182,"number":"P103265(1)","issue_at":"SFAA","issue_date_start_at":"2024-01-31","issue_date_end_at":"2024-01-31","img_front":"","img_back":""]
+//                        ]
+//        
+//        if let cer = info["certificates"] {
+//            info["certificates"] = certi
+//        }
+        
+        let cer = info["certificates"]
         let dict:[String: Any] = ["orderId":self.orderId,
                                   "relation":spouse.relationType.rawValue,
                                   "step":0,

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

@@ -240,7 +240,7 @@ extension YHSpouseInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
                 cell.text = detailItem.value
                 cell.placeHolder = detailItem.placeHolder
                 cell.textChange = {
-                    [weak self] text in
+                    [weak self] (text, isEditEnd) in
                     guard let self = self else { return }
                     self.spouse?.address?.details = text
                     

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

@@ -536,6 +536,8 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     var childStepchild: YHChildStepchildClass?
     // 在港信息
     var childInHk: YHChildStepchildClass?
+    // 证件数组 (中国身份证、香港身份证、护照等)
+    var certificates: YHCertificates?
 
     // mark any
     var countryIdentity: SmartAny?
@@ -556,11 +558,6 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     // 婚前刑事
     var surname: String?
     
-    // mark any
-//    var certificates: YHCertificates?
-    var certificates: SmartAny?
-    var certificatesd: YHCertificates?
-    
     enum CodingKeys: String, CodingKey {
         case id = "id"
         case deceased = "deceased"
@@ -700,6 +697,19 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         self.hasDegree = val ? "1" : "0"
     }
     
+    // 是否已故
+    func isDead() -> Bool {
+        return self.deceased == 1
+    }
+    
+    func setIsDead(_ val:Bool) {
+        self.deceased = (val ? 1 : 0)
+    }
+    
+    // 是否在职
+    func isNowHaveJob() -> Bool {
+        return self.occupation == "在职"
+    }
     
     var relationType:YHFamilyMemberType {
         

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

@@ -10,4 +10,4 @@ import UIKit
 
 
 
-   
+

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

@@ -14,7 +14,8 @@ class YHFormItemInputTextCell: UITableViewCell {
     
     // 是否必填 如必填title会展示红色*
     var isMust = false
-    var textChange:((String?)->Void)?
+    // BOOL值表示编辑是否结束
+    var textChange:((String?, Bool)->Void)?
     
     var title:String? {
         didSet {
@@ -70,6 +71,7 @@ class YHFormItemInputTextCell: UITableViewCell {
         textField.tintColor = UIColor.mainTextColor
         textField.textColor = UIColor.mainTextColor
         textField.addTarget(self, action: #selector(textFieldChanged(textField:)), for: .editingChanged)
+        textField.addTarget(self, action: #selector(textFieldEditEnd(textField:)), for: .editingDidEnd)
         return textField
     }()
     
@@ -105,8 +107,13 @@ class YHFormItemInputTextCell: UITableViewCell {
     
     @objc func textFieldChanged(textField:UITextField) {
         if let textChange = textChange {
-            textChange(textField.text)
+            textChange(textField.text, false)
+        }
+    }
+     
+    @objc func textFieldEditEnd(textField:UITextField) {
+        if let textChange = textChange {
+            textChange(textField.text, true)
         }
     }
-
 }

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

@@ -11,11 +11,27 @@ import UIKit
 class YHSaveAndSubmitView: UIView {
 
     static let submitBtnHeight = 48.0
+    static let saveBtnWidth = 86.0
     static let gap = 8.0
     static let height = submitBtnHeight+gap*2
     
     var saveBlock:(()->Void)?
     var submitBlock:(()->Void)?
+    // 是否隐藏保存按钮
+    var isHiddenSave:Bool = false {
+        didSet {
+            self.saveBtn.isHidden = isHiddenSave
+            self.saveBtn.snp.updateConstraints { make in
+                make.width.equalTo(isHiddenSave ? 0 : Self.saveBtnWidth)
+            }
+            
+            self.submitBtn.snp.updateConstraints { make in
+                make.left.equalTo(saveBtn.snp.right).offset(isHiddenSave ? 0.0 : 10)
+            }
+            self.setNeedsLayout()
+            self.layoutIfNeeded()
+        }
+    }
 
     lazy var submitBtn:UIButton = {
         let btn = UIButton()
@@ -71,7 +87,8 @@ class YHSaveAndSubmitView: UIView {
         
         saveBtn.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
-            make.size.equalTo(CGSize(width: 86.0, height: Self.submitBtnHeight))
+            make.height.equalTo(Self.submitBtnHeight)
+            make.width.equalTo(Self.saveBtnWidth)
             make.top.equalTo(Self.gap)
         }