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:
  // UI 走查
  //  证件上传

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateUploadVC.swift

@@ -11,6 +11,8 @@ import UIKit
 class YHCertificateUploadVC: YHBaseViewController, YHFamilyMemberProtol {
 
     var tableView: UITableView!
+    weak var delegate:YHSpouseInfoVCProtocol?
+
     var familyMember:YHFamilyMember? {
         didSet {
             if let familyMember = familyMember {
@@ -18,7 +20,15 @@ class YHCertificateUploadVC: YHBaseViewController, YHFamilyMemberProtol {
             }
         }
     }
-    var viewModel: YHFamilyMemberViewModel = YHFamilyMemberViewModel()
+    lazy var viewModel: YHFamilyMemberViewModel = {
+        let model = YHFamilyMemberViewModel()
+        model.saveInfoSilentBlock = {
+            if let delegate = self.delegate, delegate.responds(to: #selector(YHSpouseInfoVCProtocol.saveInfoSilent)) {
+                delegate.saveInfoSilent()
+            }
+        }
+        return model
+    }()
 
     override func viewDidLoad() {
         super.viewDidLoad()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildInfoContainerVC.swift

@@ -94,6 +94,7 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         guard let child = child else { return }
         
         primaryInfoVC.delegate = self
+        uploadVC.delegate = self
         certificateVC.delegate = self
         basicInfoVC.delegate = self
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift

@@ -110,6 +110,7 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         guard let spouse = spouse else { return }
     
         primaryInfoVC.delegate = self
+        uploadVC.delegate = self
         certificateVC.delegate = self
         basicInfoVC.delegate = self
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyMemberViewModel.swift

@@ -13,6 +13,8 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
 
     var mainModel: YHFamilyMember = YHFamilyMember()
     
+    var saveInfoSilentBlock:(()->())?
+    
     func getIDCardDataSource(_ isShowPrompt: Bool) -> [YHSectionItemModel] {
         let item = YHItemModel(id: .id5, isNeed: true, title: "身份证", isUserKeyBoard: false, prompts: "请输入", message: nil, isShowPrompts: isShowPrompt)
         let section = YHSectionItemModel(title: "中国身份证(选填)", models: [item])
@@ -58,6 +60,9 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
         } else if item.id == .id20 {
             mainModel.certificates.passport.issueDateEndAt = item.message ?? ""
         }
+        if let saveInfoSilentBlock = saveInfoSilentBlock {
+            saveInfoSilentBlock()
+        }
     }
     
     // 更新身份证
@@ -90,6 +95,9 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
         if model.card_num.count != 0 {
             mainModel.certificates.cnIdentityCard.number = model.card_num
         }
+        if let saveInfoSilentBlock = saveInfoSilentBlock {
+            saveInfoSilentBlock()
+        }
     }
     
     // 更新港澳通行证
@@ -122,6 +130,9 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
         if model.card_num.count != 0 {
             mainModel.certificates.hkMacaoPass.number = model.card_num
         }
+        if let saveInfoSilentBlock = saveInfoSilentBlock {
+            saveInfoSilentBlock()
+        }
     }
     
     func updateModel(_ type: YHCardType, isFront: Bool, url: String) {
@@ -139,6 +150,9 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
                 mainModel.certificates.hkMacaoPass.imgBack = url
             }
         }
+        if let saveInfoSilentBlock = saveInfoSilentBlock {
+            saveInfoSilentBlock()
+        }
     }
     
     func requestCnIDCardMessage(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/YHFormItemExpireDateCell.swift

@@ -78,7 +78,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
         let label = UILabel()
         label.textColor = UIColor.mainTextColor
         label.textAlignment = .left
-        label.font = UIFont.PFSC_R(ofSize: 14)
+        label.font = UIFont.PFSC_M(ofSize: 14)
         return label
     }()