Merge commit '1afd2a53' into davidhuang

* commit '1afd2a53':
  // 配偶初始信息
  // 配偶初始信息

galaxy/galaxy/Classes/Base/V/YHTwoOptionAlertView.swift

@@ -17,7 +17,7 @@ class YHTwoOptionAlertView: UIView {
         var rightButton: UIButton!
         var leftButton: UIButton!
         
-    static func showAlertView(message:String?,leftBtnTitle:String? = "取消".local, rightBtnTitle:String? = "确认".local, callBack: @escaping Block) {
+        static func showAlertView(message:String?,leftBtnTitle:String? = "取消".local, rightBtnTitle:String? = "确认".local, callBack: @escaping Block) {
             
             let view = YHTwoOptionAlertView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
             view.messageLabel.text = message

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

@@ -92,7 +92,7 @@ class YHChildInitialInfoVC: YHBaseViewController {
         
         if child.isFollow() { // 随行才加后面的信息
             // 国籍
-            let title1 = YHFormTitleItem(type: .country)
+            let title1 = YHFormTitleItem(type: .nationality)
             let item10 = YHFormDetailItem(type: .nationOrArea)
             let arr1:[YHFormItemProtocol] = [title1, item10]
             

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

@@ -70,8 +70,11 @@ class YHFamilyMemberFormVC: YHBaseViewController {
         self.gk_navTitle = "家庭成员信息填写".local
         view.backgroundColor = UIColor(hexString:"#F8F8F8")
         createUI()
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
         requestFamilyInfo()
-        
     }
     
      init(orderId: Int) {
@@ -208,7 +211,7 @@ extension YHFamilyMemberFormVC {
                                           "not_fill_num":"",
                                           "follow":0]]
         
-        self.familyRequest.addFamilyMember(params: dict) { [weak self] success, error in
+        self.familyRequest.addOrSaveFamilyMember(params: dict) { [weak self] success, error in
             guard let self = self else { return }
             if success {
                 self.requestFamilyInfo()
@@ -220,9 +223,7 @@ extension YHFamilyMemberFormVC {
     func deleteFamilyMember(orderId:Int, memberId:Int, callBack:((Bool)->Void)?) {
         if orderId > 0 && memberId > 0 {
             let dict = ["id":memberId, "orderId": orderId]
-            self.familyRequest.deleteFamilyMember(params: dict) { [weak self] success, error in
-                
-                guard let self = self else { return }
+            self.familyRequest.deleteFamilyMember(params: dict) { success, error in
                 if let callBack = callBack {
                     callBack(success)
                 }
@@ -435,18 +436,20 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
         
         if item is YHFamilyMember {
             let detailItem = item as! YHFamilyMember
-            // 父母
-            if detailItem.relationType == .father || detailItem.relationType == .mother {
-                let vc = YHParentInfoVC()
-                vc.parentInfo = 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
             }

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

@@ -8,7 +8,17 @@
 
 import UIKit
 
-class YHSpouseInfoVC: YHBaseViewController {
+@objc protocol YHSpouseInfoVCProtocol {
+    
+    @objc optional func updateStepView()
+    
+}
+
+class YHSpouseInfoVC: YHBaseViewController, YHSpouseInfoVCProtocol {
+
+    let familyRequest:YHFamilyRequestViewModel = YHFamilyRequestViewModel()
+
+    var orderId:Int = 0
 
     var spouse:YHFamilyMember? {
         didSet {
@@ -19,8 +29,9 @@ class YHSpouseInfoVC: YHBaseViewController {
     }
     
     var currentIndex = 0 {
+        
         didSet {
-            currentIndex %= 4
+            currentIndex %= self.children.count
             stepView.currentIndex = currentIndex
             for (i, vc) in self.children.enumerated() {
                 vc.view.isHidden = (currentIndex != i)
@@ -33,11 +44,6 @@ class YHSpouseInfoVC: YHBaseViewController {
     
     var stepView:YHStepView = {
         let step = YHStepView()
-        step.dataSource = ["初始信息", "证件上传", "基本信息", "证件信息"]
-        step.block = {  (index) in
-//            guard let self = self else { return }
-            
-        }
         return step
     }()
     
@@ -56,16 +62,13 @@ class YHSpouseInfoVC: YHBaseViewController {
     }
     
     func createUI() {
-                
-        self.addChild(initalInfoVC)
-        self.addChild(uploadVC)
-        self.addChild(passportInfoVC)
-        self.addChild(basicInfoVC)
-        
-        self.view.addSubview(basicInfoVC.view)
-        self.view.addSubview(passportInfoVC.view)
-        self.view.addSubview(uploadVC.view)
-        self.view.addSubview(initalInfoVC.view)
+        
+        guard let spouse = spouse else { return }
+        
+        initalInfoVC.delegate = self
+
+        
+        updateStepView()
 
         currentIndex = 0
         
@@ -81,7 +84,7 @@ class YHSpouseInfoVC: YHBaseViewController {
         bottomView.saveBlock = {
             [weak self] in
             guard let self = self else { return }
-            self.didClickSaveBtn()
+            self.save()
         }
         
         stepView.snp.makeConstraints { make in
@@ -102,7 +105,72 @@ class YHSpouseInfoVC: YHBaseViewController {
         
     }
     
-    func didClickSaveBtn() {
+    func updateStepView() {
+        
+        guard let spouse = spouse else { return }
         
+        for vc in self.children {
+            vc.willMove(toParent: nil)
+            vc.removeFromParent()
+        }
+        
+        if spouse.isFollow() {
+            
+            self.addChild(initalInfoVC)
+            self.addChild(uploadVC)
+            self.addChild(passportInfoVC)
+            self.addChild(basicInfoVC)
+            
+            self.view.addSubview(basicInfoVC.view)
+            self.view.addSubview(passportInfoVC.view)
+            self.view.addSubview(uploadVC.view)
+            self.view.addSubview(initalInfoVC.view)
+            
+            stepView.dataSource = ["初始信息".local, "证件上传".local, "基本信息".local, "证件信息".local]
+            stepView.block = {[weak self]  (index) in
+                guard let self = self else { return }
+                print("follow:%d", self.orderId)
+            }
+            
+        } else {
+            self.addChild(initalInfoVC)
+            self.addChild(basicInfoVC)
+            
+            self.view.addSubview(basicInfoVC.view)
+            self.view.addSubview(initalInfoVC.view)
+            
+            stepView.dataSource = ["初始信息".local, "证件信息".local]
+            stepView.block = {[weak self]  (index) in
+                guard let self = self else { return }
+                print("follow:%d", self.orderId)
+
+            }
+        }
+        self.view.bringSubviewToFront(stepView)
+        self.view.bringSubviewToFront(bottomView)
+
+    }
+}
+
+extension YHSpouseInfoVC {
+    func save() {
+        
+        guard  let spouse = spouse else { return }
+        guard let info = spouse.toDictionary() else { return }
+        
+        let follow = spouse.follow
+        
+        let dict:[String: Any] = ["orderId":self.orderId,
+                                  "relation":spouse.relationType.rawValue,
+                                  "step":spouse.step,
+                                  "next":false,
+                                  "info":info]
+        
+        self.familyRequest.addOrSaveFamilyMember(params:dict) { [weak self] success, error in
+            guard let self = self else { return }
+            if success {
+                
+            }
+        }
     }
 }

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

@@ -12,6 +12,7 @@ import SmartCodable
 class YHSpouseInitialInfoVC: YHBaseViewController {
     
     var spouse:YHFamilyMember?
+    weak var delegate:YHSpouseInfoVCProtocol?
     
     lazy var items:[[YHFormItemProtocol]] = [[YHFormItemProtocol]]()
     
@@ -56,13 +57,13 @@ class YHSpouseInitialInfoVC: YHBaseViewController {
         // 随行
         let title0 = YHFormTitleItem(type: .accompany)
         let item0 = YHFormDetailItem(type: .isAccompanyToHK)
-        item0.value = String(spouse.follow == 1)
+        item0.value = String(spouse.isFollow())
         let arr0:[YHFormItemProtocol] = [title0, item0]
         items.append(arr0)
         
         if spouse.isFollow() { // 随行才加后面的信息
             // 国籍
-            let title1 = YHFormTitleItem(type: .country)
+            let title1 = YHFormTitleItem(type: .nationality)
             let item10 = YHFormDetailItem(type: .nationOrArea)
             item10.value = spouse.nationality
             let arr1:[YHFormItemProtocol] = [title1, item10]
@@ -71,7 +72,7 @@ class YHSpouseInitialInfoVC: YHBaseViewController {
             var arr2 = [YHFormItemProtocol]()
             let title2 = YHFormTitleItem(type: .liveInfo)
             let item20 = YHFormDetailItem(type: .isLiveTother)
-            item20.value = String(spouse.finishFollow == 1)
+            item20.value = String(spouse.isLiveTother())
             arr2.append(title2)
             arr2.append(item20)
             
@@ -84,15 +85,29 @@ class YHSpouseInitialInfoVC: YHBaseViewController {
                 
                 if let address = spouse.address {
                     if  let country = address.country, !country.isEmpty {
-                        let item22 = YHFormDetailItem(type: .liveCity)
-                        if let area = address.area {
-                            item22.value = area.joined(separator: "/")
+                        
+                        // 居住信息中选择中国才会显示现居住城市
+                        let isLiveInChina = country.contains("中国".local)
+                        if isLiveInChina {
+                            let item22 = YHFormDetailItem(type: .liveCity)
+                            if let area = address.area {
+                                item22.value = area.joined(separator: "/")
+                            }
+                            arr2.append(item22)
                         }
+                        
                         let item23 = YHFormDetailItem(type: .detailAddress)
                         item23.value = address.details
-                        item23.placeHolder = "请填写小区、楼栋、单元室等"
-                        arr2.append(item22)
+                        item23.placeHolder = (isLiveInChina ? "请填写小区、楼栋、单元室等".local : "请填写国外居住地".local)
                         arr2.append(item23)
+                        
+                        if !isLiveInChina {// 在国外
+                            // 是否在海外居住满1年及以上
+                            let item24 = YHFormDetailItem(type: .isLiveOverSeasMore1Year)
+                            item24.value = String(spouse.isOverSeasOver1Year())
+                            arr2.append(item24)
+                        }
+                            
                     }
                 }
             }
@@ -153,7 +168,8 @@ extension YHSpouseInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
             
             let detailItem = item as! YHFormDetailItem
             
-            if detailItem.type == .isAccompanyToHK || detailItem.type == .isHandleHKPassPort || detailItem.type == .isLiveTother {
+            // 是否随行到香港 / 是否办理港澳通行证 / // 是否与主申请人同住 均用双项按钮cell
+            if detailItem.type == .isAccompanyToHK || detailItem.type == .isHandleHKPassPort || detailItem.type == .isLiveTother || detailItem.type == .isLiveOverSeasMore1Year {
                 
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
                 cell.title = detailItem.getTitle()
@@ -169,25 +185,34 @@ extension YHSpouseInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
                     
                     [weak self]  (arr, selectIndex) in
                     
+                    guard let self = self else { return }
+                    
                     let selectItem:YHFormChoiceItem = arr[selectIndex]
                     let option = (selectItem.title == "是".local ? true : false)
                     if detailItem.type == .isAccompanyToHK { // 是否随行
                         
-                        self?.spouse?.setFollow(option)
-                        self?.loadSponseInfo()
+                        self.spouse?.setFollow(option)
+                        self.loadSponseInfo()
+                        if let delegate = self.delegate {
+                            delegate.updateStepView?()
+                        }
                         
                     } else if detailItem.type == .isHandleHKPassPort { // 是否办理港澳通行证
-                        self?.spouse?.setNeedHandleHKPassPort(option)
-                        self?.loadSponseInfo()
+                        self.spouse?.setNeedHandleHKPassPort(option)
+                        self.loadSponseInfo()
                         
                     } else if detailItem.type == .isLiveTother { // 是否与主申请人同住
-                        self?.spouse?.setLiveTother(option)
+                        self.spouse?.setLiveTother(option)
                         if option {
-                            self?.spouse?.address?.country = nil
-                            self?.spouse?.address?.details = nil
-                            self?.spouse?.address?.area = nil
+                            self.spouse?.address?.country = nil
+                            self.spouse?.address?.details = nil
+                            self.spouse?.address?.area = nil
                         }
-                        self?.loadSponseInfo()
+                        self.loadSponseInfo()
+                        
+                    } else if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
+                        self.spouse?.setOverSearsOver1Year(option)
+                        self.loadSponseInfo()
                     }
                 }
                 return cell
@@ -253,7 +278,8 @@ extension YHSpouseInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
             let detailItem = item as! YHFormDetailItem
             if detailItem.type == .isLiveTother ||
                 detailItem.type == .isAccompanyToHK ||
-                detailItem.type == .isHandleHKPassPort
+                detailItem.type == .isHandleHKPassPort ||
+                detailItem.type == .isLiveOverSeasMore1Year
             {
                 return UITableView.automaticDimension
             }
@@ -286,30 +312,36 @@ extension YHSpouseInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
         
         if item is YHFormDetailItem {
             let detailItem = item as! YHFormDetailItem
-            
-            if detailItem.type == .nationOrArea ||
-                detailItem.type == .liveCity ||
-                detailItem.type == .detailAddress
-            {
-                YHFormPickerView.show(type:.certificate, selectType: .certificate(.passport)) { [weak self] selectType in
-                    let res = selectType.title
-                    if let self = self {
-                        if detailItem.type == .nationOrArea {
-                            let title = arr[0] as! YHFormTitleItem
-                            if title.type == .liveInfo {
-                                self.spouse?.address?.country = res
-                            } else if title.type == .country {
-                                self.spouse?.nationality = res
-                            }
-                            
-                        } else if detailItem.type == .liveCity {
-                            self.spouse?.address?.area = [res, res]
-                        } else if detailItem.type == .detailAddress {
-                            self.spouse?.address?.details = res
-                        }
-                        self.loadSponseInfo()
+            // 选国籍/现居住城市/详细地址
+            if detailItem.type == .nationOrArea {
+               let vc = YHSelectCountryViewController()
+                vc.backLocationStringController = {
+                    [weak self] country in
+                    guard let self = self else { return }
+                    let title = arr[0] as! YHFormTitleItem
+                    if title.type == .nationality {
+                        self.spouse?.nationality = country
+
+                    } else if title.type == .liveInfo {
+                        self.spouse?.address?.country = country
+
                     }
+                    self.loadSponseInfo()
                 }
+                self.navigationController?.pushViewController(vc)
+                
+            } else if detailItem.type == .liveCity {
+                
+                let vc = YHAddressViewController()
+                vc.backLocationStringController = {
+                     [weak self] (string1, string2, string3, string4) in
+                     guard let self = self else { return }
+                     print("\(string1)\n\(string2)\n\(string3)\n\(string4)")
+                     self.spouse?.address?.area = [string2, string3, string4]
+                     self.loadSponseInfo()
+                 }
+                self.present(vc, animated: true)
+
             }
         }
     }

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

@@ -30,7 +30,7 @@ enum YHFormTitleItemType:Int, CaseIterable {
     // 随行
     case accompany
     // 国籍
-    case country
+    case nationality
     // 居住信息
     case liveInfo
     // 港澳通信证
@@ -88,6 +88,8 @@ enum YHFormDetailItemType:Int {
     case liveCity
     // 详细地址
     case detailAddress
+    // 是否在海外居住满1年及以上
+    case isLiveOverSeasMore1Year
     // 是否办理
     case isHandleHKPassPort
     
@@ -208,7 +210,7 @@ class YHFormTitleItem : YHFormItemProtocol {
             return "子女".local
         case .accompany:
             return "随行".local
-        case .country:
+        case .nationality:
             return "国籍".local
         case .liveInfo:
             return "居住信息".local
@@ -258,7 +260,7 @@ class YHFormTitleItem : YHFormItemProtocol {
             return "".local
         case .accompany:
             return "".local
-        case .country:
+        case .nationality:
             return "".local
         case .liveInfo:
             return "".local
@@ -323,70 +325,50 @@ class YHFormDetailItem : YHFormItemProtocol {
             return "现居住城市".local
         case .detailAddress:
             return "详细地址".local
+        case .isLiveOverSeasMore1Year:
+            return "是否在海外居住满1年及以上".local
         case .isHandleHKPassPort:
             return "是否办理".local
-        // 证件类别
         case .certificateType:
             return "证件类别".local
-        // 证件号码
         case .certificateNumber:
             return "证件号码".local
-            
-        // 证件号码
         case .chinaIdentityCardNumber:
             return "中国身份证号".local
-        // 旅行证件号码
         case .traverlPassportNumber:
             return "旅行证件号码".local
-            
-        // 签发日期
         case .certificateSignDate:
             return "签发日期".local
-        // 届满日期
         case .certificateValidDate:
             return "届满日期".local
         case .certificateSignPlace:
             return "签发地".local
-        // 配偶姓名
         case .spouseName:
             return "配偶姓名".local
-            // 曾用名
         case .everName:
             return "曾用名".local
-            // 婚前姓氏
         case .befourMarryFirstName:
             return "婚前姓氏".local
-            // 出生日期
         case .birthday:
             return "出生日期".local
-            // 出生国家/地区
         case .birthNation:
             return "出生国家/地区".local
-            // 出生城市
         case .birthCity:
             return "出生城市".local
-            // 职业
         case .occupation:
             return "职业".local
-            // 职业名称
         case .occupationName:
             return "职业名称".local
-            // 是否拥有学位
         case .ownDegree:
             return "是否拥有学位".local
-            // 目前是否在港
         case .isNowInHK:
             return "目前是否在港".local
-            // 获准逗留至
         case .stayHKDate:
             return "获准逗留至".local
-            // 在港身份
         case .roleInHK:
             return "在港身份".local
-            // 是否办理过(香港身份证)
         case .isHaveHkIdentityCard:
             return "是否办理过".local
-            // 香港身份证号码
         case .hkIdentityCardNumber:
             return "香港身份证号码".local
         case .degreeDetailInfo:
@@ -474,34 +456,6 @@ enum YHFamilyMemberType: Int {
 
 class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     
-    // 是否随行
-    func isFollow() -> Bool {
-        return follow == 1
-    }
-    
-    func setFollow(_ follow:Bool) {
-        self.follow = (follow ? 1 : 0)
-    }
-    
-    // 是否要办理港澳通行证
-    func isNeedHandleHKPassPort() -> Bool {
-        return  self.isHandled == 1
-    }
-    
-    func setNeedHandleHKPassPort(_ need:Bool) {
-        self.isHandled = (need ? 1 : 0)
-    }
-    
-    // 是否与主申请人同住
-    func isLiveTother() -> Bool {
-        return self.finishFollow == 1
-    }
-    
-    func setLiveTother(_ together:Bool) {
-        self.finishFollow = (together ? 1 : 0)
-    }
-    
-    
     var id: Int = 0
     var deceased: Int = 0
     var custody: Int = 0
@@ -618,6 +572,43 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         
     }
     
+    // 是否随行
+    func isFollow() -> Bool {
+        return follow == 1
+    }
+    
+    func setFollow(_ follow:Bool) {
+        self.follow = (follow ? 1 : 0)
+    }
+    
+    // 是否要办理港澳通行证
+    func isNeedHandleHKPassPort() -> Bool {
+        return  self.isHandled == 1
+    }
+    
+    func setNeedHandleHKPassPort(_ need:Bool) {
+        self.isHandled = (need ? 1 : 0)
+    }
+    
+    // 是否与主申请人同住
+    func isLiveTother() -> Bool {
+        return self.nows == 1
+    }
+    
+    func setLiveTother(_ together:Bool) {
+        self.nows = (together ? 1 : 0)
+    }
+    
+    // 是否在海外居住满1年及以上
+    func isOverSeasOver1Year() -> Bool {
+        return self.isLiveOverseaYear == 1
+    }
+    
+    func setOverSearsOver1Year(_ value:Bool) {
+        self.isLiveOverseaYear = value ? 1 : 0
+    }
+    
+    
     var relationType:YHFamilyMemberType {
         
         if relation == "1" {

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

@@ -43,7 +43,7 @@ class YHFamilyRequestViewModel {
     }
     
     // 添加家庭成员
-    func addFamilyMember(params:[String:Any], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+    func addOrSaveFamilyMember(params:[String:Any], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
        
        YHHUD.show(.progress(message: "数据加载中..."))
 
@@ -76,9 +76,8 @@ class YHFamilyRequestViewModel {
 
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.familyMemberDeleteApi
         
-        let _ = YHNetRequest.postRequest(url: strUrl, params:params) {[weak self] json, code in
+        let _ = YHNetRequest.postRequest(url: strUrl, params:params) { json, code in
             YHHUD.hide()
-            guard let self = self else { return }
             guard let model = NetBaseModel.deserialize(dict: json) else {
                 let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
                 callBackBlock(false,error)

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

@@ -86,6 +86,7 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
         label.textAlignment = .left
         label.numberOfLines = 0
         label.font = UIFont.systemFont(ofSize: 14)
+        label.lineBreakMode = .byCharWrapping
         return label
     }()
     
@@ -160,6 +161,7 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
         }
     }
     
+    
     @objc func didClickResponseBtn(btn: UIButton) {
         
         let selectIndex = btn.tag-answerBaseTag

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

@@ -55,6 +55,7 @@ class YHStepView: UIScrollView {
     }
     
     func setUpView(_ array: [String]) {
+        self.removeSubviews()
         for i in 0 ..< array.count {
             let button = UIButton(type: .custom)
             button.setBackgroundImage(UIImage(named: "service_step_fail"), for: .normal)