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走查
  //  UI走查

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateListContainerVC.swift

@@ -116,11 +116,12 @@ class YHCertificateListContainerVC: YHBaseViewController {
         view.confirmBlock = {
            [weak self] dict in
            guard let self = self else { return }
-           self.segmentedView.selectItemAt(index: 0)
            self.filterDict =  dict
            if let vc = itemVCs.first {
               vc.requestList(status:vc.status, extra:dict)
            }
+           self.segmentedView.selectItemAt(index: 0)
+
         }
         return view
     }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateFilterButton.swift

@@ -61,7 +61,7 @@ class YHCertificateFilterButton: UIView {
     }
     
     @objc func didFilterBtnClicked() {
-        isSelect = !isSelect
+        isSelect = true
         if let clickBlock = clickBlock {
             clickBlock(isSelect)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift

@@ -84,7 +84,7 @@ class YHEducationDetailVC: YHBaseViewController {
         
         bottomView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-k_Height_safeAreaInsetsBottom())
+            make.bottom.equalToSuperview()
             make.height.equalTo(YHSaveAndSubmitView.height)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift

@@ -85,7 +85,7 @@ class YHEducationInfoListVC: YHBaseViewController {
         
         bottomView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-k_Height_safeAreaInsetsBottom())
+            make.bottom.equalToSuperview()
             make.height.equalTo(YHSaveAndSubmitView.height)
         }
         
@@ -114,7 +114,7 @@ class YHEducationInfoListVC: YHBaseViewController {
                 arr0.append(item)
             }
             // 多学历可编辑删除状态
-            if eduList.count <= 0 {
+            if eduList.count <= 1 {
                 isDegreeEditMode = .none
             } else {
                 if isDegreeEditMode == .none {
@@ -317,7 +317,7 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
                         }
                         let tips = String(format: "有%d项未填", eduInfo.vacantNum)
                         cell.detailLabel.text = tips
-                        cell.isShowDeleteBtn = (isDegreeEditMode == .canCancel)
+                        cell.isShowDeleteBtn = (isDegreeEditMode == .canCancel && eduList.count > 1)
                         cell.setTips(tips, isShow:(isNeedShowError && eduInfo.vacantNum > 0))
                         cell.deleteBlock = {
                             var title = "确定删除该学历吗?"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift

@@ -82,7 +82,7 @@ class YHQualificationDetailVC: YHBaseViewController {
         
         bottomView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-k_Height_safeAreaInsetsBottom())
+            make.bottom.equalToSuperview()
             make.height.equalTo(YHSaveAndSubmitView.height)
         }
         

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

@@ -54,7 +54,7 @@ class YHCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol {
         
         view.addSubview(tableView);
         let topHeight = k_Height_NavigationtBarAndStatuBar+YHStepView.height
-        let bottomHeight = k_Height_safeAreaInsetsBottom() + YHSaveAndSubmitView.height
+        let bottomHeight = YHSaveAndSubmitView.height
         tableView.snp.makeConstraints { make in
             make.top.equalToSuperview()
             make.left.equalToSuperview().offset(16)

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

@@ -62,7 +62,7 @@ class YHCertificateUploadVC: YHBaseViewController, YHFamilyMemberProtol {
         view.addSubview(tableView)
         
         let topHeight = k_Height_NavigationtBarAndStatuBar+YHStepView.height
-        let bottomHeight = k_Height_safeAreaInsetsBottom() + YHSaveAndSubmitView.height
+        let bottomHeight = YHSaveAndSubmitView.height
         tableView.snp.makeConstraints { make in
             make.top.equalToSuperview()
             make.left.equalToSuperview()

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

@@ -53,7 +53,7 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         
         view.addSubview(tableView);
         let topHeight = k_Height_NavigationtBarAndStatuBar+YHStepView.height
-        let bottomHeight = k_Height_safeAreaInsetsBottom() + YHSaveAndSubmitView.height
+        let bottomHeight = YHSaveAndSubmitView.height
         tableView.snp.makeConstraints { make in
             make.top.equalToSuperview()
             make.left.equalToSuperview().offset(16)

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

@@ -127,7 +127,7 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         
         bottomView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-k_Height_safeAreaInsetsBottom())
+            make.bottom.equalToSuperview()
             make.height.equalTo(YHSaveAndSubmitView.height)
         }
     }
@@ -160,7 +160,7 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         var titles:[String] = []
         for vcItem in stepVCs {
             let topHeight = k_Height_NavigationtBarAndStatuBar+YHStepView.height
-            let bottomHeight = k_Height_safeAreaInsetsBottom() + YHSaveAndSubmitView.height
+            let bottomHeight = YHSaveAndSubmitView.height
             vcItem.vc.view.frame = CGRectMake(0, topHeight, KScreenWidth, KScreenHeight-topHeight-bottomHeight)
             self.addChild(vcItem.vc)
             self.view.addSubview(vcItem.vc.view)

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

@@ -122,7 +122,7 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         
         view.addSubview(tableView);
         let topHeight = k_Height_NavigationtBarAndStatuBar+YHStepView.height
-        let bottomHeight = k_Height_safeAreaInsetsBottom() + YHSaveAndSubmitView.height
+        let bottomHeight = YHSaveAndSubmitView.height
         tableView.snp.makeConstraints { make in
             make.top.equalToSuperview()
             make.left.equalToSuperview().offset(16)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHBrotherInfoVC.swift

@@ -77,7 +77,7 @@ class YHBrotherInfoVC: YHBaseViewController {
         
         bottomView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-k_Height_safeAreaInsetsBottom())
+            make.bottom.equalToSuperview()
             make.height.equalTo(YHSaveAndSubmitView.height)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHParentInfoVC.swift

@@ -79,7 +79,7 @@ class YHParentInfoVC: YHBaseViewController {
         
         bottomView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-k_Height_safeAreaInsetsBottom())
+            make.bottom.equalToSuperview()
             make.height.equalTo(YHSaveAndSubmitView.height)
         }
         

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

@@ -70,7 +70,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         
         view.addSubview(tableView);
         let topHeight = k_Height_NavigationtBarAndStatuBar+YHStepView.height
-        let bottomHeight = k_Height_safeAreaInsetsBottom() + YHSaveAndSubmitView.height
+        let bottomHeight = YHSaveAndSubmitView.height
         tableView.snp.makeConstraints { make in
             make.top.equalToSuperview()
             make.left.equalToSuperview().offset(16)

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

@@ -142,7 +142,7 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         
         bottomView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-k_Height_safeAreaInsetsBottom())
+            make.bottom.equalToSuperview()
             make.height.equalTo(YHSaveAndSubmitView.height)
         }
     }
@@ -175,7 +175,7 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         var titles:[String] = []
         for vcItem in stepVCs {
             let topHeight = k_Height_NavigationtBarAndStatuBar+YHStepView.height
-            let bottomHeight = k_Height_safeAreaInsetsBottom() + YHSaveAndSubmitView.height
+            let bottomHeight = YHSaveAndSubmitView.height
             vcItem.vc.view.frame = CGRectMake(0, topHeight, KScreenWidth, KScreenHeight-topHeight-bottomHeight)
             self.addChild(vcItem.vc)
             self.view.addSubview(vcItem.vc.view)

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

@@ -126,7 +126,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         
         view.addSubview(tableView);
         let topHeight = k_Height_NavigationtBarAndStatuBar+YHStepView.height
-        let bottomHeight = k_Height_safeAreaInsetsBottom() + YHSaveAndSubmitView.height
+        let bottomHeight = YHSaveAndSubmitView.height
         tableView.snp.makeConstraints { make in
             make.top.equalToSuperview()
             make.left.equalToSuperview().offset(16)

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

@@ -13,7 +13,7 @@ class YHSaveAndSubmitView: UIView {
     static let submitBtnHeight = 48.0
     static let saveBtnWidth = 86.0
     static let gap = 8.0
-    static let height = submitBtnHeight+gap*2
+    static let height = submitBtnHeight+gap*2+k_Height_safeAreaInsetsBottom()
     
     var saveBlock:(()->Void)?
     var submitBlock:(()->Void)?