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:
  //  家庭
  //  家庭确认

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/C/YHFamilyInfoUpdateViewController.swift

@@ -104,14 +104,16 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
     }
     
     @objc func didCancelBtnClicked() {
-        self.detailMember.info.isCheck = false
-        self.isInfoEditing = false
-        self.updateData()
+        YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
+            self.navigationController?.popViewController()
+        } callBack: {
+            
+        }
     }
     
     @objc func didConfirmBtnClicked() {
         self.detailMember.info.isCheck = true
-        self.tableView.reloadData()
+        self.updateData()
         
         if let arr1 = items.first {
             for item in arr1 {
@@ -120,6 +122,7 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
                 }
             }
         }
+        
         if let detaiParams = self.detailMember.info.toDictionary() {
             
             var relation = ""
@@ -133,7 +136,6 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
                 relation = "child"
             }
             
-            
             let param:[String: Any] = ["orderId": orderId,
                                         relation: detaiParams]
             YHHUD.show(.progress(message: "提交中..."))
@@ -201,12 +203,6 @@ extension YHFamilyInfoUpdateViewController: UITableViewDelegate, UITableViewData
                 guard let self = self else { return }
                 self.updateData()
             }
-            // 更改姓名
-            cell.updateName = {
-                [weak self] text in
-                guard let self = self else { return }
-                self.updateData()
-            }
             
         } else {
             

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHFamilyMemberInfoCell.swift

@@ -17,9 +17,12 @@ class YHFamilyMemberInfoCell: UITableViewCell {
         self.nameLabel.text = model.info.name
         self.pinyinLabel.text = "\(model.info.familyName) \(model.info.givenName)"
         self.statusLabel.text = model.confirmStatus == 1 ? "已确认" : "待核对"
-        let tintColor: UIColor = model.confirmStatus == 1 ? .brandMainColor : .init(hex: 0x3CC694)
-        let originArrowImg = UIImage(named: "family_info_status_arrow")
-        self.arrowImgView.image = originArrowImg?.withTintColor(tintColor, renderingMode: UIImage.RenderingMode.alwaysTemplate)
+        let textColor: UIColor = model.confirmStatus == 1 ? .brandMainColor : .init(hex: 0x3CC694)
+        self.statusLabel.textColor = textColor
+        
+        let img = UIImage(named: "family_info_status_arrow")?.withRenderingMode(.alwaysTemplate)
+        self.arrowImgView.image = img
+        self.arrowImgView.tintColor = textColor
     }
     
     lazy var lineView: UIView = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHIFamilyInfoListCell.swift

@@ -58,8 +58,50 @@ class YHFamilyInfoItem {
     var isEditMode: Bool = false
     var isShowPreviousInfo: Bool = false
     
-    var tips: String = ""
-    var isCheck: Bool = false
+    var tips: String {
+        get {
+            return self.getRedTips()
+        }
+    }
+    
+    func getRedTips() -> String {
+
+        if !self.value.isEmpty {  // value不为空
+            if self.id == .hongKongId, !self.value.isHKIdentityCardNumber() {
+                return "请输入正确的香港身份证号"
+            }
+            return ""
+        }
+        
+        // value 为空的情况
+        if self.id == .mainApplicantName {
+            return "请输入主申请人姓名"
+        }
+            
+        if self.id == .spouseName {
+            return "请输入配偶姓名"
+        }
+        
+        if self.id == .childName {
+            return "请输入子女姓名"
+            
+        } else if self.id == .firstName {
+            return "请输入姓(拼音)"
+            
+        } else if self.id == .lastName {
+            return "请输入名(拼音)"
+            
+        } else if self.id == .birthPlaceAboard {
+            return "请输入出生地"
+
+        } else if self.id == .occupation {
+            return "请输入职业"
+            
+        } else if self.id == .hongKongId {
+            return "请输入香港身份证号"
+        }
+        return ""
+    }
     
     required init() {
         
@@ -194,7 +236,6 @@ class YHIFamilyInfoListCell: UITableViewCell {
                 itemView.updateName = {
                     [weak self] text in
                     guard let self = self else { return }
-//                    self.updateName?(text)
                     
                     for subView in self.itemsContentView.subviews {
                         if subView is YHInfoItemView {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHInfoItemView.swift

@@ -300,7 +300,6 @@ class YHInfoItemView: UIView {
         }
         
         let isShowTips = (familyInfo.isCheck && !item.tips.isEmpty)
-        item.tips = self.getRedTips()
         errorTipsLabel.text = item.tips
         errorTipsLabel.isHidden = !isShowTips
         errorTipsLabel.snp.remakeConstraints { make in
@@ -321,10 +320,14 @@ extension YHInfoItemView: UITextFieldDelegate {
         
         let newText = (textField.text! as NSString).replacingCharacters(in: range, with: string)
         
-        //        if newText.count > Self.maxWordsCount {
-        //            YHHUD.flash(message: "限制最多\(Self.maxWordsCount)个字符")
-        //            return false
-        //        }
+        if self.item.id != .birthPlaceAboard {
+            if newText.count >= 30 {
+                textField.text = String(newText.prefix(30))
+                textFieldChanged(textField:textField)
+                return false
+            }
+        }
+        
         printLog("\(newText)")
         
         if self.item.id == .mainApplicantName || self.item.id == .spouseName || self.item.id == .childName {
@@ -346,7 +349,6 @@ extension YHInfoItemView: UITextFieldDelegate {
             self.updateText("")
         }
         
-        self.item.tips = self.getRedTips()
         self.updateItem(self.item, familyInfo: self.faimilyInfo)
     }
     
@@ -422,41 +424,6 @@ extension YHInfoItemView: UITextFieldDelegate {
         }
         return ""
     }
-    
-    func getRedTips() -> String {
-
-        if !self.item.value.isEmpty {
-            return ""
-        }
-        
-        if self.item.id == .mainApplicantName {
-            return "请输入主申请人姓名"
-        }
-            
-        if self.item.id == .spouseName {
-            return "请输入配偶姓名"
-        }
-        
-        if self.item.id == .childName {
-            return "请输入子女姓名"
-            
-        } else if self.item.id == .firstName {
-            return "请输入姓(拼音)"
-            
-        } else if self.item.id == .lastName {
-            return "请输入名(拼音)"
-            
-        } else if self.item.id == .birthPlaceAboard {
-            return "请输入出生地"
-
-        } else if self.item.id == .occupation {
-            return "请输入职业"
-            
-        } else if self.item.id == .hongKongId {
-            return "请输入香港身份证号"
-        }
-        return ""
-    }
 }
 
 class YHInfoOptionView: UIView {

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -345,8 +345,11 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
         
         if true {
             // test dy
+            if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") as? Int {
                 let vc = YHFamilyInfoConfirmViewController()
+                vc.orderId = orderID
                 self.navigationController?.pushViewController(vc)
+            }
             return
         }
         

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/办证段/赴港办证预约/family_info_status_arrow.imageset/Contents.json

@@ -18,5 +18,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }