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(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateInfoController.swift

@@ -243,7 +243,7 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                 cell.isMust = detailItem.isNeed
                 cell.title = detailItem.getTitle()
                 cell.detail = detailItem.value
-                cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips)
+                cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isNeed && detailItem.isShowTips)
                 return cell
             }
         }
@@ -393,7 +393,6 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                 || familyMember.certificates.hkMacaoPass.issueAt.count <= 0
                 || familyMember.certificates.hkMacaoPass.issueDateStartAt.count <= 0
                 || familyMember.certificates.hkMacaoPass.issueDateEndAt.count <= 0
-                || familyMember.certificates.hkMacaoPass.passPortType == -1
             {
                 return false
             }

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

@@ -79,16 +79,16 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
             }
         }
         if model.term_begins.count != 0 {
-            mainModel.certificates.hkMacaoPass.issueDateStartAt = model.term_begins.toTimeString()
+            mainModel.certificates.cnIdentityCard.issueDateStartAt = model.term_begins.toTimeString()
         }
         if model.end_of_term.count != 0 {
-            mainModel.certificates.hkMacaoPass.issueDateEndAt = model.end_of_term.toTimeString()
+            mainModel.certificates.cnIdentityCard.issueDateEndAt = model.end_of_term.toTimeString()
         }
         if model.issuing_authority.count != 0 {
-            mainModel.certificates.hkMacaoPass.issueAt = model.issuing_authority
+            mainModel.certificates.cnIdentityCard.issueAt = model.issuing_authority
         }
         if model.card_num.count != 0 {
-            mainModel.certificates.hkMacaoPass.number = model.card_num
+            mainModel.certificates.cnIdentityCard.number = model.card_num
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -272,16 +272,16 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             }
         }
         if model.term_begins.count != 0 {
-            mainModel.certificates.hk_macao_pass.issue_date_start_at = model.term_begins.toTimeString()
+            mainModel.certificates.cn_identity_card.issue_date_start_at = model.term_begins.toTimeString()
         }
         if model.end_of_term.count != 0 {
-            mainModel.certificates.hk_macao_pass.issue_date_end_at = model.end_of_term.toTimeString()
+            mainModel.certificates.cn_identity_card.issue_date_end_at = model.end_of_term.toTimeString()
         }
         if model.issuing_authority.count != 0 {
-            mainModel.certificates.hk_macao_pass.issue_at = model.issuing_authority
+            mainModel.certificates.cn_identity_card.issue_at = model.issuing_authority
         }
         if model.card_num.count != 0 {
-            mainModel.certificates.hk_macao_pass.number = model.card_num
+            mainModel.certificates.cn_identity_card.number = model.card_num
         }
     }