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.xcodeproj/project.pbxproj

@@ -39,6 +39,8 @@
 		044CC6252B873F330083FF76 /* YHCollegeSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CC6242B873F330083FF76 /* YHCollegeSearchViewController.swift */; };
 		044CC6272B8740340083FF76 /* YHCollegeNameCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CC6262B8740340083FF76 /* YHCollegeNameCell.swift */; };
 		044CC6292B8741AC0083FF76 /* YHSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CC6282B8741AC0083FF76 /* YHSearchBar.swift */; };
+		044CC62B2B876A230083FF76 /* YHSheetPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CC62A2B876A230083FF76 /* YHSheetPickerView.swift */; };
+		044CC62D2B876C980083FF76 /* YHSheetPickerViewType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CC62C2B876C980083FF76 /* YHSheetPickerViewType.swift */; };
 		0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; };
 		0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; };
 		0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; };
@@ -323,6 +325,8 @@
 		044CC6242B873F330083FF76 /* YHCollegeSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCollegeSearchViewController.swift; sourceTree = "<group>"; };
 		044CC6262B8740340083FF76 /* YHCollegeNameCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCollegeNameCell.swift; sourceTree = "<group>"; };
 		044CC6282B8741AC0083FF76 /* YHSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSearchBar.swift; sourceTree = "<group>"; };
+		044CC62A2B876A230083FF76 /* YHSheetPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSheetPickerView.swift; sourceTree = "<group>"; };
+		044CC62C2B876C980083FF76 /* YHSheetPickerViewType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSheetPickerViewType.swift; sourceTree = "<group>"; };
 		0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVerificationCodeLoginController.swift; sourceTree = "<group>"; };
 		0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneMessageView.swift; sourceTree = "<group>"; };
 		0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; };
@@ -660,6 +664,8 @@
 		042FBBD22B67A2F900F9DE23 /* PickerView */ = {
 			isa = PBXGroup;
 			children = (
+				044CC62C2B876C980083FF76 /* YHSheetPickerViewType.swift */,
+				044CC62A2B876A230083FF76 /* YHSheetPickerView.swift */,
 				042FBBD32B67A2F900F9DE23 /* YHFormPickerView.swift */,
 				043955202B70955200955D49 /* YHFormPickerViewType.swift */,
 			);
@@ -1727,6 +1733,7 @@
 				0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */,
 				043955252B70D20300955D49 /* YHFormItemQuestionsCell.swift in Sources */,
 				0468D4532B6782BE00CFB916 /* YHCardExampleView.swift in Sources */,
+				044CC62B2B876A230083FF76 /* YHSheetPickerView.swift in Sources */,
 				A596C3A12B84D9100067BBB8 /* YHOtherTextViewItemView.swift in Sources */,
 				04010B952B6A1DE90093F3BB /* YHSaveAndSubmitView.swift in Sources */,
 				A5ACE9362B4564F7002C94D2 /* YHNetworkStatusManager.swift in Sources */,
@@ -1907,6 +1914,7 @@
 				0468D42B2B55019900CFB916 /* YHAnalytics.swift in Sources */,
 				A5ACE93C2B4564F7002C94D2 /* UIColor+Extension.swift in Sources */,
 				04E86E4F2B8479B700A35F4B /* YHWorkIntroductionItemView.swift in Sources */,
+				044CC62D2B876C980083FF76 /* YHSheetPickerViewType.swift in Sources */,
 				04E86E5B2B84BF2000A35F4B /* YHWorkExampleTypeView.swift in Sources */,
 				042FBBBD2B63519C00F9DE23 /* YHFormItemSelectSheetCell.swift in Sources */,
 				A5FD63C32B63438A00D1D9DA /* YHContactMainItemStatusModel.swift in Sources */,

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

@@ -357,10 +357,11 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
                 }
                 
             } else if detailItem.type == .degreeType { // 学位类型
-                YHFormPickerView.show(type: .degreeCategory, selectType: .degreeCategory(.accountantOrFinance)) {
-                    [weak self] selectType in
+                
+                YHSheetPickerView.show(type: .degreeCategory, selectTitle:"工程学") {
+                   [weak self]  selectItem in
                     guard let self = self else { return }
-                    detailInfo.degreeType = selectType.title
+                    detailInfo.degreeType = selectItem.title
                     loadInfo()
                     if detailId != 0 {
                         saveDetailInfo(isNeedPop: false)

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

@@ -318,10 +318,14 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
                         cell.isShowDeleteBtn = (isDegreeEditMode == .canCancel)
                         cell.detailLabel.textColor = (isNeedShowError && eduInfo.vacantNum > 0 ? .failColor : .labelTextColor2)
                         cell.deleteBlock = {
-                            [weak self]  in
-                            guard let self = self else { return }
-                            isDegreeEditMode = .none
-                            deleteEducationInfo(id:eduInfo.id)
+                            var title = "确定要删除该学历吗?"
+                            YHTwoOptionAlertView.showAlertView(message:title) {
+                                [weak self] sure in
+                                guard let self = self else { return }
+                                if !sure { return }
+                                isDegreeEditMode = .none
+                                deleteEducationInfo(id:eduInfo.id)
+                            }
                         }
                         return cell
                         
@@ -339,10 +343,14 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
                         }
                         cell.isShowDeleteBtn = (isDegreeEditMode == .canCancel)
                         cell.deleteBlock = {
-                            [weak self]  in
-                            guard let self = self else { return }
-                            isDegreeEditMode = .none
-                            deleteEducationInfo(id:eduInfo.id)
+                            var title = "确定要删除该学历吗?"
+                            YHTwoOptionAlertView.showAlertView(message:title) {
+                                [weak self] sure in
+                                guard let self = self else { return }
+                                if !sure { return }
+                                isDegreeEditMode = .none
+                                deleteEducationInfo(id:eduInfo.id)
+                            }
                         }
                         return cell
                     }
@@ -366,10 +374,14 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
                     cell.detailLabel.textColor = (isNeedShowError && quaInfo.vacantNum > 0 ? .failColor : .labelTextColor2)
                     cell.isShowDeleteBtn = (isQualificationEditMode == .canCancel)
                     cell.deleteBlock = {
-                        [weak self]  in
-                        guard let self = self else { return }
-                        isQualificationEditMode = .none
-                        deleteQualificationInfo(id:quaInfo.id)
+                        var title = "确定要删除该证书吗?"
+                        YHTwoOptionAlertView.showAlertView(message:title) { 
+                            [weak self] sure in
+                            guard let self = self else { return }
+                            if !sure { return }
+                            isQualificationEditMode = .none
+                            deleteQualificationInfo(id:quaInfo.id)
+                        }
                     }
                     return cell
                 }

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

+//
+//  YHSheetPickerViewType.swift
+//  galaxy
+//
+//  Created by edy on 2024/2/22.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+enum YHSheetPickerViewType: Int {
+
+    // 按自然顺序递增
+    case none = 0
+    // 学位
+    case degree
+    // 学位有无
+    case ownDegree
+    // 婚姻
+    case marriage
+    // 授课形式
+    case edution
+    // 职业
+    case occupation
+    // 职业2
+    case profession
+    // 性别
+    case gender
+    // 证件
+    case certificate
+    // 在港身份
+    case identity
+    // 颁发地区
+    case degreeLocation
+    // 专业证书
+    case professionCertificate
+    // 学位类型
+    case degreeCategory
+}
+
+class YHSheetPickerViewItem {
+    
+    var index:Int = -1
+    var title:String = ""
+    
+    init(title: String, index: Int) {
+        self.title = title
+        self.index = index
+    }
+}