// 配偶基本信息

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

@@ -126,7 +126,7 @@ class YHSpouseInfoVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             self.view.addSubview(uploadVC.view)
             self.view.addSubview(initalInfoVC.view)
             
-            stepView.dataSource = ["初始信息".local, "证件上传".local, "基本信息".local, "证件信息".local]
+            stepView.dataSource = ["初始信息".local, "证件上传".local, "证件信息".local, "基本信息".local]
             stepView.block = {[weak self]  (index) in
                 guard let self = self else { return }
                 print("follow:%d", self.orderId)
@@ -139,7 +139,7 @@ class YHSpouseInfoVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             self.view.addSubview(basicInfoVC.view)
             self.view.addSubview(initalInfoVC.view)
             
-            stepView.dataSource = ["初始信息".local, "证件信息".local]
+            stepView.dataSource = ["初始信息".local, "基本信息".local]
             stepView.block = {[weak self]  (index) in
                 guard let self = self else { return }
                 print("follow:%d", self.orderId)
@@ -157,9 +157,7 @@ extension YHSpouseInfoVC {
         
         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,

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

@@ -175,6 +175,7 @@ extension YHSpouseInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
             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.isMust = detailItem.isNeed
                 cell.title = detailItem.getTitle()
                 
                 var select = false

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

@@ -457,10 +457,13 @@ enum YHFamilyMemberType: Int {
 class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     
     var id: Int = 0
+    // 是否已故
     var deceased: Int = 0
     var custody: Int = 0
+    // 国籍
     var nationality: String?
     var orderId: Int = 0
+    // 关系 1父亲  2母亲 3配偶 4子女 5兄弟姐妹
     var relation: String?
     var hasDegree: String?
     
@@ -468,58 +471,66 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     // var hasDegreeJson: [YHHasDegreeJson]?
     var hasDegreeJson: SmartAny?
     
+    // 是否随行至香港
     var follow: Int = 0
     var statement: Int = 0
+    // 姓名
     var subsetName: String?
     
     // mark any
 //    var subsetNamePinyin: YHSubsetNamePinyin?
     var subsetNamePinyin: SmartAny?
-    
+    // 曾用名
     var usedName: String?
+    // 出生日期
     var birthday: String?
+    // 出生国家地区 (国内/国外)
     var birthPlaceAboard: Int = 0
     
-    // mark any
-//    var birthPlace: YHAddress?
-    var birthPlace: SmartAny?
+    // 出生地址信息
+    var birthPlace: YHAddress?
     
+    // 职业
     var occupation: String?
+    // 职业名称
     var occupationName: String?
     
     // mark any
     var operatorAme: SmartAny?
-    
-    // mark any
-//    var childHasHkId: YHChildStepchildClass?
-    var childHasHkId: SmartAny?
-    
+    // 香港身份证号
     var hkIdentityCard: String?
+    // 性别
     var sex: Int = 0
+    // 婚姻状况
     var married: String?
+    // 是否与主申请人同住
     var nows: Int = 0
-    
+    // 居住地址
     var address: YHAddress?
     
-    // mark any
-//    var childStepchild: YHChildStepchildClass?
-    var childStepchild: SmartAny?
-    
-    // mark any
-//    var childInHk: YHChildStepchildClass?
-    var childInHk: SmartAny?
-    
+    // 香港身份证信息
+    var childHasHkId: YHChildStepchildClass?
+    var childStepchild: YHChildStepchildClass?
+    // 在港信息
+    var childInHk: YHChildStepchildClass?
+
     // mark any
     var countryIdentity: SmartAny?
     
+    // 在港身份
     var hkIdentity: String?
     var hkIdentityOther: String?
+    // 现居住国家
     var liveCountry: String?
+    // 是否要办理港澳通行证
     var isHandled: Int = 0
     var finishFollow: Int = 0
     var step: Int = 0
+    // 未填写项数
     var notFillNum: Int = 0
+    // 是否在海外居住满1年及以上
     var isLiveOverseaYear: Int = 0
+    // 婚前刑事
     var surname: String?
     
     // mark any
@@ -577,8 +588,8 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         return follow == 1
     }
     
-    func setFollow(_ follow:Bool) {
-        self.follow = (follow ? 1 : 0)
+    func setFollow(_ value:Bool) {
+        self.follow = (value ? 1 : 0)
     }
     
     // 是否要办理港澳通行证
@@ -586,8 +597,8 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         return  self.isHandled == 1
     }
     
-    func setNeedHandleHKPassPort(_ need:Bool) {
-        self.isHandled = (need ? 1 : 0)
+    func setNeedHandleHKPassPort(_ value:Bool) {
+        self.isHandled = (value ? 1 : 0)
     }
     
     // 是否与主申请人同住
@@ -595,8 +606,8 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         return self.nows == 1
     }
     
-    func setLiveTother(_ together:Bool) {
-        self.nows = (together ? 1 : 0)
+    func setLiveTother(_ value:Bool) {
+        self.nows = (value ? 1 : 0)
     }
     
     // 是否在海外居住满1年及以上
@@ -608,6 +619,46 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         self.isLiveOverseaYear = value ? 1 : 0
     }
     
+    // 是否出生国外
+    func isBirthOverSeas() -> Bool {
+        return self.birthPlaceAboard == 1
+    }
+    
+    func setBirthOverSeas(_ value:Bool) {
+        return self.birthPlaceAboard = value ? 1 : 0
+    }
+    
+    // 目前是否在港
+    func isNowInHK() -> Bool {
+        if let inHK = self.childInHk {
+            if inHK.has == "Y" {
+                return true
+            } else if inHK.has == "N" {
+                return false
+            }
+        }
+        return false
+    }
+    
+    func setNowIsInHK(_ value:Bool) {
+        self.childInHk?.has = value ?  "Y" : "N"
+    }
+    
+    // 是否办理过香港身份证
+    func isHaveHKIdentityCard() -> Bool {
+        if let hasHkId = self.childHasHkId {
+            if hasHkId.has == "Y" {
+                return true
+            } else if hasHkId.has == "N" {
+                return false
+            }
+        }
+        return false
+    }
+    
+    func setHaveHKIdentityCard(_ value:Bool) {
+        self.childHasHkId?.has = value ?  "Y" : "N"
+    }
     
     var relationType:YHFamilyMemberType {
         

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

@@ -21,6 +21,7 @@
      print(selectType.title)
  }
  
+
  */
 
 
@@ -30,17 +31,19 @@ enum YHFormPickerViewType: Int {
     // 按自然顺序递增
     case none = 0
     // 学位
-    case degree = 1
+    case degree
     // 婚姻
-    case marriage = 2
+    case marriage
     // 授课形式
-    case edution = 3
+    case edution
     // 职业
-    case occupation = 4
+    case occupation
     // 性别
-    case gender = 5
+    case gender
     // 证件
-    case certificate = 6
+    case certificate
+    // 在港身份
+    case identity
 }
 
 enum YHFormPickerViewSubType {
@@ -52,6 +55,7 @@ enum YHFormPickerViewSubType {
     case occupation(YHPickerViewOccupationType)
     case gender(YHPickerViewGenderType)
     case certificate(YHPickerViewCertificateType)
+    case identity(YHPickerViewIdentityType)
     
     var title:String {
         switch self {
@@ -113,72 +117,23 @@ enum YHFormPickerViewSubType {
         case .certificate(.officialPassport):
             return "公务护照".local
             
-            
+        case .identity(.student):
+            return "学生".local
+        case .identity(.employment):
+            return "就业".local
+        case .identity(.residence):
+            return "居留".local
+        case .identity(.visit):
+            return "访问".local
+        case .identity(.other):
+            return "其他".local
+
         }
     }
     
-    static func getType(_ title: String?) -> YHFormPickerViewSubType {
-        
-        guard let title = title else { return .none }
-        
-        if title == "未婚".local {
-            return .marriage(.unmarriage)
-        } else if title == "已婚".local {
-            return .marriage(.marriaged)
-        } else if title == "分居".local {
-            return .marriage(.separated)
-        } else if title == "离婚".local {
-            return .marriage(.divorced)
-        } else if title == "丧偶".local {
-            return .marriage(.widowed)
-            
-        } else if title == "学士学位".local {
-            return .degree(.bachelor)
-        } else if title == "硕士学位".local {
-            return .degree(.master)
-        } else if title == "硕士学位".local {
-            return .degree(.doctor)
-            
-        } else if title == "全日制".local {
-           return .education(.fullTime)
-        } else if title == "兼读制".local {
-           return .education(.partTime)
-        } else if title == "遥距课程".local {
-            return .education(.distanceCourses)
-            
-            
-        } else if title == "在职".local {
-            return .occupation(.onTheJob)
-        } else if title == "退休".local {
-            return .occupation(.retire)
-        } else if title == "无业".local {
-            return .occupation(.unemployed)
-        } else if title == "学生".local {
-            return .occupation(.student)
-        
-        } else if title == "男".local {
-            return .gender(.male)
-        } else if title == "女".local {
-            return .gender(.female)
-            
-        } else if title == "护照".local {
-            return .certificate(.passport)
-        } else if title == "外交护照".local {
-            return .certificate(.diplomaticPassport)
-        } else if title == "旅游通行证".local {
-            return .certificate(.travelPassport)
-        } else if title == "公务护照".local {
-            return .certificate(.officialPassport)
-        } else if title == "中国发无国籍旅游证件".local {
-            return .certificate(.chineseStatelessTravelPassport)
-        } else if title == "其他无国籍旅行证件".local {
-            return .certificate(.otherStatelessTravelPassport)
-        } else if title == "联合国通行证".local {
-            return .certificate(.unitedNationsPassport)
-        }
-        
-        return .none
-    }
+    
+    
+     
 }
     
 
@@ -249,6 +204,19 @@ enum YHPickerViewCertificateType {
 
 }
 
+enum YHPickerViewIdentityType {
+    // 学生
+    case student
+    // 就业
+    case employment
+    // 居留
+    case residence
+    // 访问
+    case visit
+    // 其他
+    case other
+}
+
 
 class YHFormPickerViewItem {
     
@@ -266,14 +234,14 @@ class YHFormPickerView: UIView {
 
     let type: YHFormPickerViewType
     
-    var selectType:YHFormPickerViewSubType?
-    var selectTitle:String? {
+    private var selectType:YHFormPickerViewSubType?
+    private var selectTitle:String? {
         didSet {
-            let type:YHFormPickerViewSubType = YHFormPickerViewSubType.getType(selectTitle)
+            let type:YHFormPickerViewSubType = getSubType(selectTitle)
             selectType = type
         }
     }
-    var selectBlock:((YHFormPickerViewSubType)->Void)?
+    private var selectBlock:((YHFormPickerViewSubType)->Void)?
     
     var title: String? {
         didSet {
@@ -397,6 +365,14 @@ class YHFormPickerView: UIView {
              YHFormPickerViewItem(type: .certificate(.travelPassport)),
              YHFormPickerViewItem(type: .certificate(.unitedNationsPassport)),
              YHFormPickerViewItem(type: .certificate(.otherStatelessTravelPassport))],
+            
+            // 在港身份
+            .identity:
+            [YHFormPickerViewItem(type: .identity(.student)),
+             YHFormPickerViewItem(type: .identity(.employment)),
+             YHFormPickerViewItem(type: .identity(.residence)),
+             YHFormPickerViewItem(type: .identity(.visit)),
+             YHFormPickerViewItem(type: .identity(.other))],
         ]
     }()
     
@@ -541,6 +517,8 @@ class YHFormPickerView: UIView {
             return "选择性别"
         case .certificate:
             return "选择证件"
+        case .identity:
+            return "选择在港身份"
         }
     }
 }
@@ -597,3 +575,89 @@ extension YHFormPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
         return label
     }
 }
+
+extension YHFormPickerView {
+    
+    func getSubType(_ title: String?) -> YHFormPickerViewSubType {
+       
+       guard let title = title else { return .none }
+       
+        switch type {
+        case .none:
+            return .none
+        case .degree:
+            if title == "学士学位".local {
+                return .degree(.bachelor)
+            } else if title == "硕士学位".local {
+                return .degree(.master)
+            } else if title == "硕士学位".local {
+                return .degree(.doctor)
+            }
+        case .marriage:
+            if title == "未婚".local {
+                return .marriage(.unmarriage)
+            } else if title == "已婚".local {
+                return .marriage(.marriaged)
+            } else if title == "分居".local {
+                return .marriage(.separated)
+            } else if title == "离婚".local {
+                return .marriage(.divorced)
+            } else if title == "丧偶".local {
+                return .marriage(.widowed)
+            }
+        case .edution:
+            if title == "全日制".local {
+               return .education(.fullTime)
+            } else if title == "兼读制".local {
+               return .education(.partTime)
+            } else if title == "遥距课程".local {
+                return .education(.distanceCourses)
+            }
+        case .occupation:
+            if title == "在职".local {
+                return .occupation(.onTheJob)
+            } else if title == "退休".local {
+                return .occupation(.retire)
+            } else if title == "无业".local {
+                return .occupation(.unemployed)
+            } else if title == "学生".local {
+                return .occupation(.student)
+            }
+        case .gender:
+            if title == "男".local {
+                return .gender(.male)
+            } else if title == "女".local {
+                return .gender(.female)
+            }
+        case .certificate:
+            if title == "护照".local {
+                return .certificate(.passport)
+            } else if title == "外交护照".local {
+                return .certificate(.diplomaticPassport)
+            } else if title == "旅游通行证".local {
+                return .certificate(.travelPassport)
+            } else if title == "公务护照".local {
+                return .certificate(.officialPassport)
+            } else if title == "中国发无国籍旅游证件".local {
+                return .certificate(.chineseStatelessTravelPassport)
+            } else if title == "其他无国籍旅行证件".local {
+                return .certificate(.otherStatelessTravelPassport)
+            } else if title == "联合国通行证".local {
+                return .certificate(.unitedNationsPassport)
+            }
+        case .identity:
+            if title == "学生".local {
+                return .identity(.student)
+            } else if title == "就业".local {
+                return .identity(.employment)
+            } else if title == "居留".local {
+                return .identity(.residence)
+            } else if title == "访问".local {
+                return .identity(.visit)
+            } else if title == "其他".local {
+                return .identity(.other)
+            }
+        }
+        return .none
+   }
+}

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

@@ -24,6 +24,7 @@ class YHFormChoiceItem {
 class YHFormItemDoubleChoiceCell: UITableViewCell {
     
     static let cellReuseIdentifier = "YHFormItemDoubleChoiceCell"
+    
     private let btnWidth = 70.0
     private let btnHeight = 32.0
     private let btnTitleSelectColor = UIColor.brandMainColor
@@ -32,21 +33,27 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
     private let btnBgSelectColor = UIColor.brandMainColor.withAlphaComponent(0.08)
     private let answerBaseTag  = 9527
     
+    // 是否必须字段
+    var isMust:Bool = false
     var answerBlock:(([YHFormChoiceItem], Int)->Void)?
     
     var title:String? {
         didSet {
             
-            if let question = title {
-                let str = "*"+question
+            if let title = title, !title.isEmpty {
+                let str = (isMust ? ("*"+title) : title) 
                 let attributes: [NSAttributedString.Key: Any] = [
                     .font: UIFont.PFSC_R(ofSize: 14),
-                    .foregroundColor: UIColor.mainTextColor
-                ]
+                    .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)
+                if isMust {
+                    let starRange = NSRange(location: 0, length: 1)
+                    questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor(hex:0xFF3A3A), range: starRange)
+                }
+                
                 titleLabel.attributedText = questionAttrStr
+            } else {
+                titleLabel.text = ""
             }
         }
     }
@@ -134,8 +141,6 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
     func setupUI() {
         
         self.selectionStyle = .none
-
-        title = "  1、是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？ "
         
         contentView.addSubview(titleLabel)
         contentView.addSubview(answer2Btn)

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

@@ -28,7 +28,7 @@ class YHFormItemEnterDetailCell: UITableViewCell {
     var title:String? {
         didSet {
             
-            if let title = title {
+            if let title = title, !title.isEmpty {
                 let str = (isMust ? ("*"+title) : title)
                 let attributes: [NSAttributedString.Key: Any] = [
                     .font: titleFont,
@@ -40,6 +40,8 @@ class YHFormItemEnterDetailCell: UITableViewCell {
                     questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor(hex:0xFF3A3A), range: starRange)
                 }
                 titleLabel.attributedText = questionAttrStr
+            } else {
+                titleLabel.text = ""
             }
         }
     }

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

@@ -20,7 +20,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
     var title:String? {
         didSet {
             
-            if let title = title {
+            if let title = title, !title.isEmpty {
                 let str = (isMust ? ("*"+title) : title)
                 let attributes: [NSAttributedString.Key: Any] = [
                     .font: UIFont.PFSC_R(ofSize: 14),
@@ -31,6 +31,8 @@ class YHFormItemExpireDateCell: UITableViewCell {
                     questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor(hex:0xFF3A3A), range: starRange)
                 }
                 titleLabel.attributedText = questionAttrStr
+            } else {
+                titleLabel.text = ""
             }
         }
     }

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

@@ -65,7 +65,7 @@ class YHFormItemInputTextCell: UITableViewCell {
     private lazy var textField:UITextField = {
         let textField = UITextField()
         textField.backgroundColor = .clear
-        textField.placeholder = "请如实填写"
+        textField.placeholder = "请输入"
         textField.font = UIFont.PFSC_M(ofSize: 14)
         textField.tintColor = UIColor.mainTextColor
         textField.textColor = UIColor.mainTextColor