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(服务中心)/MyCertificates(我的证书)/C/YHMaterialListViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateListContainerVC.swift

@@ -34,7 +34,7 @@ class YHCertificateCategoryItem {
     }
 }
 
-class YHMaterialListViewController: YHBaseViewController {
+class YHCertificateListContainerVC: YHBaseViewController {
     
     static let segmentHeight = 53.0
     
@@ -66,7 +66,7 @@ class YHMaterialListViewController: YHBaseViewController {
                           YHCertificateCategoryItem(type: .rejected),
                           YHCertificateCategoryItem(type: .review),
                           YHCertificateCategoryItem(type: .finish)]
-    var itemVCs:[YHCertificateResourceUploadVC] = []
+    var itemVCs:[YHCertificateListVC] = []
     
     lazy var segmentedView : JXSegmentedView = {
         let segview = JXSegmentedView(frame: CGRect(x: 0, y: k_Height_NavigationtBarAndStatuBar, width: KScreenWidth, height: Self.segmentHeight))
@@ -132,7 +132,7 @@ class YHMaterialListViewController: YHBaseViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(didCertificateCountStatistics(_:)), name:countStatisticsNotify , object: nil)
 
         for item in categoryItems {
-            let vc = YHCertificateResourceUploadVC()
+            let vc = YHCertificateListVC()
             vc.orderId = orderId
             vc.status = item.type
             vc.categoryInfo = categoryInfo
@@ -219,7 +219,7 @@ class YHMaterialListViewController: YHBaseViewController {
 }
 
 
-extension YHMaterialListViewController: JXSegmentedViewDelegate {
+extension YHCertificateListContainerVC: JXSegmentedViewDelegate {
     
     func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
         if 0 <= index && index < itemVCs.count {
@@ -240,7 +240,7 @@ extension YHMaterialListViewController: JXSegmentedViewDelegate {
     }
 }
 
-extension YHMaterialListViewController: JXSegmentedListContainerViewDataSource {
+extension YHCertificateListContainerVC: JXSegmentedListContainerViewDataSource {
     
     func numberOfLists(in listContainerView: JXSegmentedListContainerView) -> Int {
         if let titleDataSource = segmentedView.dataSource as? JXSegmentedBaseDataSource {

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

@@ -12,7 +12,7 @@ import UniformTypeIdentifiers
 import IQKeyboardManagerSwift
 import SwifterSwift
 
-class YHCertificateResourceUploadVC: YHBaseViewController {
+class YHCertificateListVC: YHBaseViewController {
 
     var orderId : Int?
     var status: YHCertificateUploadStatus = .all
@@ -84,12 +84,12 @@ class YHCertificateResourceUploadVC: YHBaseViewController {
         view.addSubview(tableView)
         tableView.snp.makeConstraints { make in
             make.top.left.right.equalToSuperview()
-            make.height.equalTo(KScreenHeight - k_Height_NavigationtBarAndStatuBar - YHMaterialListViewController.segmentHeight)
+            make.height.equalTo(KScreenHeight - k_Height_NavigationtBarAndStatuBar - YHCertificateListContainerVC.segmentHeight)
         }
     }
 }
 
-extension YHCertificateResourceUploadVC: UITableViewDelegate, UITableViewDataSource {
+extension YHCertificateListVC: UITableViewDelegate, UITableViewDataSource {
     
     func numberOfSections(in tableView: UITableView) -> Int {
         return items.count
@@ -138,7 +138,7 @@ extension YHCertificateResourceUploadVC: UITableViewDelegate, UITableViewDataSou
                 return
             }
             // 非待上传的进入详情
-            let vc = YHUploadContentVC()
+            let vc = YHCertificateUploadContentListVC()
             vc.orderId = orderId
             vc.categoryInfo = categoryInfo
             vc.supplementInfo = item
@@ -166,13 +166,13 @@ extension YHCertificateResourceUploadVC: UITableViewDelegate, UITableViewDataSou
 }
 
 // MARK: - JXSegmentedListContainerViewListDelegate
-extension YHCertificateResourceUploadVC: JXSegmentedListContainerViewListDelegate {
+extension YHCertificateListVC: JXSegmentedListContainerViewListDelegate {
     func listView() -> UIView {
         return view
     }
 }
 
-extension YHCertificateResourceUploadVC {
+extension YHCertificateListVC {
     
     func requestList(status: YHCertificateUploadStatus, extra:[String:Any] = [:]) {
         

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

@@ -169,7 +169,7 @@ extension YHCertificateSearchViewController: UITableViewDelegate, UITableViewDat
                 return
             }
             // 非待上传的进入详情
-            let vc = YHUploadContentVC()
+            let vc = YHCertificateUploadContentListVC()
             vc.orderId = orderId
             vc.categoryInfo = categoryInfo
             vc.supplementInfo = item

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

@@ -9,7 +9,7 @@
 import UIKit
 import IQKeyboardManagerSwift
 
-class YHUploadContentVC: YHBaseViewController {
+class YHCertificateUploadContentListVC: YHBaseViewController {
 
     var orderId : Int!
     var categoryInfo: YHCategoryData!
@@ -159,7 +159,7 @@ class YHUploadContentVC: YHBaseViewController {
     }
 }
 
-extension YHUploadContentVC: UITableViewDelegate, UITableViewDataSource {
+extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewDataSource {
     
     func numberOfSections(in tableView: UITableView) -> Int {
         return 2
@@ -408,7 +408,7 @@ extension YHUploadContentVC: UITableViewDelegate, UITableViewDataSource {
     }
 }
 
-extension YHUploadContentVC {
+extension YHCertificateUploadContentListVC {
     
     func addKeyBoardNotify() {
         
@@ -443,7 +443,7 @@ extension YHUploadContentVC {
     }
 }
 
-extension YHUploadContentVC {
+extension YHCertificateUploadContentListVC {
     
     func requestList() {
         

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

@@ -190,7 +190,7 @@ extension YHMineCertificateEntryViewController : UITableViewDelegate,UITableView
         
         guard let model = certificateReqVM.certificateEntryModel else { return }
 
-        let vc = YHMaterialListViewController()
+        let vc = YHCertificateListContainerVC()
         vc.orderId = orderId
         if indexPath.section < model.category_data.count {
             vc.categoryInfo = model.category_data[indexPath.section]

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

@@ -103,7 +103,7 @@ class YHCertificateNameCell: UITableViewCell {
         
         editBtn = UIButton()
         editBtn.setImage(UIImage(named:"my_cer_btn_edit"), for:.normal)
-        editBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
+        editBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 30, left: 30, bottom: 30, right: 30)
         editBtn.addTarget(self, action: #selector(didEditBtnClicked), for: .touchUpInside)
         whiteView.addSubview(editBtn)
 

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

@@ -582,9 +582,14 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                         cell.deleteBlock = {
                             [weak self] in
                             guard let self = self else { return }
-                            self.spouse?.hasDegreeJson.remove(at: indexPath.row-2)
-                            loadInfo()
-                            save()
+                            
+                            var msg = "确定删除学位信息\(indexPath.row-1)吗"
+                            YHTwoOptionAlertView.showAlertView(message:msg) { sure in
+                                if !sure { return }
+                                self.spouse?.hasDegreeJson.remove(at: indexPath.row-2)
+                                self.loadInfo()
+                                self.save()
+                            }
                         }
                     }