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(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift

@@ -317,10 +317,11 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
                self.navigationController?.pushViewController(vc)
                 
             } else if detailItem.type == .educationStyle { // 授课形式
-                YHFormPickerView.show(type: .edution, selectType: .education(.fullTime)) {
-                    [weak self] selectType in
+                
+                YHSheetPickerView.show(type:.educationStyle, selectTitle:detailInfo.teachingFormat) {
+                    [weak self]  item in
                     guard let self = self else { return }
-                    detailInfo.teachingFormat = selectType.title
+                    detailInfo.teachingFormat = item.title
                     loadInfo()
                     if detailId != 0 {
                         saveDetailInfo(isNeedPop: false, isShowToast:false)
@@ -346,10 +347,10 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
                 
             } else if detailItem.type == .educationDegree { // 学位
                 
-                YHFormPickerView.show(type: .degree, selectType: .degree(.bachelor)) {
-                    [weak self] selectType in
+                YHSheetPickerView.show(type:.educationDegree, selectTitle:detailInfo.degree) {
+                    [weak self]  item in
                     guard let self = self else { return }
-                    detailInfo.degree = selectType.title
+                    detailInfo.degree = item.title
                     loadInfo()
                     if detailId != 0 {
                         saveDetailInfo(isNeedPop: false, isShowToast:false)

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

@@ -161,6 +161,18 @@ class YHSheetPickerView: UIView {
                  YHSheetPickerViewItem(title:"博士学位".local, index:3)
                 ],
             
+            // 学位2
+            .educationDegree:
+                [YHSheetPickerViewItem(title:"无学位(专科)".local, index:0),
+                 YHSheetPickerViewItem(title:"无学位(本科)".local, index:1),
+                 YHSheetPickerViewItem(title:"无学位(硕士)".local, index:2),
+                 YHSheetPickerViewItem(title:"无学位(博士)".local, index:3),
+                 YHSheetPickerViewItem(title:"学士学位".local, index:4),
+                 YHSheetPickerViewItem(title:"硕士学位".local, index:5),
+                 YHSheetPickerViewItem(title:"博士学位".local, index:6)
+                ],
+
+            
             // 婚姻
             .marriage:
                 [YHSheetPickerViewItem(title:"未婚".local, index:0),
@@ -171,7 +183,7 @@ class YHSheetPickerView: UIView {
                 ],
     
             // 教育
-            .edution:
+            .educationStyle:
                 [YHSheetPickerViewItem(title:"全日制".local, index:0),
                  YHSheetPickerViewItem(title:"兼职制".local, index:1),
                  YHSheetPickerViewItem(title:"遥距课程".local, index:2),
@@ -343,9 +355,11 @@ extension YHSheetPickerView {
             return ""
         case .degree:
             return "选择学位"
+        case .educationDegree:
+            return "选择学位"
         case .marriage:
             return "选择婚姻状况"
-        case .edution:
+        case .educationStyle:
             return "选择学位"
         case .occupation:
             return "选择职业"

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

@@ -14,12 +14,14 @@ enum YHSheetPickerViewType: Int {
     case none = 0
     // 学位
     case degree
+    // 学位2 (包含无学位类型)
+    case educationDegree
     // 学位有无
     case ownDegree
     // 婚姻
     case marriage
     // 授课形式
-    case edution
+    case educationStyle
     // 职业
     case occupation
     // 职业2

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

@@ -227,7 +227,7 @@ class YHAddressPickView: UIView {
     @objc private func onClickHotCity(sender: UIButton) {
 
         let hotProvince = ["北京市","上海市","广东省","广东省","浙江省","江苏省","江苏省","天津市","湖北省","湖南省","重庆市","四川省"]
-        let hotCity = ["北京市","上海市","广州市","深圳市","杭州市","南京市","苏州市","天津市","武汉市","长沙市","重庆市","成都市"]
+        let hotCity = ["市辖区","市辖区","广州市","深圳市","杭州市","南京市","苏州市","天津市","武汉市","长沙市","市辖区","成都市"]
         let tag = sender.tag
         setHotCityData(province: hotProvince[tag], city: hotCity[tag])
     }

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

@@ -24,10 +24,12 @@ class YHCardExampleView: UIView {
             switch type {
             case .identity:
                 messageLabel.isHidden = false
+                titleLabel.text = "身份证示例模板"
                 topImageView.image = UIImage(named: "service_card_id_back")
                 bottomImageView.image = UIImage(named: "service_card_id_frant")
             case .passport:
                 messageLabel.isHidden = true
+                titleLabel.text = "港澳通行证示例模板"
                 topImageView.image = UIImage(named: "service_card_passport_frant")
                 bottomImageView.image = UIImage(named: "service_card_passport_back")
                 topImageView.snp.remakeConstraints { make in

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

@@ -331,9 +331,6 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
                     }
                 }
             }
-//            if let block = self.informationBlock {
-//                block(self.type, image, false)
-//            }
         }
     }
     
@@ -393,9 +390,6 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
                     }
                 }
             }
-//            if let block = self.informationBlock {
-//                block(self.type, image, true)
-//            }
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience(工作经验)/C/YHImageClipperViewController.swift

@@ -31,13 +31,18 @@ class YHImageClipperViewController: YHBaseViewController {
     public var successClippedHandler:SuccessClippedHandlerBlock?
     
     public func setBaseImg(_ baseImg: UIImage, resultImgSize: CGSize, type: YHClipperType) {
+        self.baseImg = baseImg
+        self.resultImgSize = resultImgSize
         clipperView = YHClipperView(frame: CGRect(x: 0, y: (isIphoneX() ? 88:64), width: KScreenWidth, height: KScreenHeight - k_Height_safeAreaInsetsBottom() - 54 - (isIphoneX() ? 88:64)))
         clipperView?.resultImgSize = resultImgSize
         clipperView?.baseImg = baseImg
         clipperView?.type = type
         self.view.addSubview(clipperView!)
+        self.view.sendSubviewToBack(clipperView!)
     }
 
+    private var baseImg: UIImage!
+    private var resultImgSize: CGSize!
     //MARK Private
     private var clipperView: YHClipperView?
     private var cannalButton: YHClipperButton!
@@ -59,6 +64,17 @@ class YHImageClipperViewController: YHBaseViewController {
     }
     
     func setView() {
+        let bottomView = {
+            let bottom = UIView()
+            bottom.backgroundColor = .black
+            return bottom
+        }()
+        view.addSubview(bottomView)
+        bottomView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(k_Height_safeAreaInsetsBottom() + 64)
+        }
+        
         sureButton = {
             let button = UIButton(type: .custom)
             button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
@@ -117,6 +133,8 @@ class YHImageClipperViewController: YHBaseViewController {
     }
     
     @objc private func backImageBtnClick() {
+        clipperView?.resultImgSize = resultImgSize
+        clipperView?.baseImg = baseImg
 //        if cancelClippedHandler != nil {
 //            cancelClippedHandler!()
 //        }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience(工作经验)/V/YHClipperView.swift

@@ -16,6 +16,7 @@ enum YHClipperType {
 class YHClipperView: UIView {
     public var resultImgSize:CGSize?{
         didSet{
+          self.clipperView?.removeFromSuperview()
           self.setClipperView()
         }
     }