Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -300,7 +300,7 @@
 		047AA3F82C5CC7B0009C4554 /* YHShareStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F72C5CC7B0009C4554 /* YHShareStepView.swift */; };
 		047AA3FA2C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */; };
 		047AA3FC2C61EE7F009C4554 /* YHSignAppendStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */; };
-		047AA4092C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift */; };
+		047AA4092C65C1AC009C4554 /* YHOfficialApprovalResultVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC.swift */; };
 		047AA40A2C65C1AC009C4554 /* YHOffivialApprovalSuccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4062C65C1AC009C4554 /* YHOffivialApprovalSuccessView.swift */; };
 		047AA40B2C65C1AC009C4554 /* YHOffivialApprovalGuildLineCheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4072C65C1AC009C4554 /* YHOffivialApprovalGuildLineCheckView.swift */; };
 		047AA40C2C65C1AC009C4554 /* YHOffivialApprovalSuccessCheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4082C65C1AC009C4554 /* YHOffivialApprovalSuccessCheckView.swift */; };
@@ -950,7 +950,7 @@
 		047AA3F72C5CC7B0009C4554 /* YHShareStepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHShareStepView.swift; sourceTree = "<group>"; };
 		047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInvitationWithGiftsSelectItemView.swift; sourceTree = "<group>"; };
 		047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSignAppendStepView.swift; sourceTree = "<group>"; };
-		047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOfficialApprovalResultVC2.swift; sourceTree = "<group>"; };
+		047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOfficialApprovalResultVC.swift; sourceTree = "<group>"; };
 		047AA4062C65C1AC009C4554 /* YHOffivialApprovalSuccessView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOffivialApprovalSuccessView.swift; sourceTree = "<group>"; };
 		047AA4072C65C1AC009C4554 /* YHOffivialApprovalGuildLineCheckView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOffivialApprovalGuildLineCheckView.swift; sourceTree = "<group>"; };
 		047AA4082C65C1AC009C4554 /* YHOffivialApprovalSuccessCheckView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOffivialApprovalSuccessCheckView.swift; sourceTree = "<group>"; };
@@ -2368,7 +2368,7 @@
 		047AA4032C65C1AC009C4554 /* C */ = {
 			isa = PBXGroup;
 			children = (
-				047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift */,
+				047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -3997,7 +3997,7 @@
 				04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */,
 				045EEEAF2B9F171A0022A143 /* YHWorkExperienceTextItemView.swift in Sources */,
 				A5ACE9492B4564F7002C94D2 /* YHHUDSuccessView.swift in Sources */,
-				047AA4092C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift in Sources */,
+				047AA4092C65C1AC009C4554 /* YHOfficialApprovalResultVC.swift in Sources */,
 				04B360EF2C620975001EB053 /* YHPrincipleUploadStatusCell.swift in Sources */,
 				045EEE9C2B9F171A0022A143 /* YHCompanyViewModel.swift in Sources */,
 				A58556BA2B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift in Sources */,
@@ -4274,7 +4274,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4299,7 +4299,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.4;
+				MARKETING_VERSION = 0.9.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4415,7 +4415,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4440,7 +4440,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.4;
+				MARKETING_VERSION = 0.9.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4619,7 +4619,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4644,7 +4644,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.4;
+				MARKETING_VERSION = 0.9.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4665,7 +4665,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4690,7 +4690,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.4;
+				MARKETING_VERSION = 0.9.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/V/YHInvitationWithGiftsSelectItemView.swift

@@ -232,9 +232,7 @@ extension YHInvitationWithGiftsSelectItemView: UITableViewDelegate, UITableViewD
         cell.block = {[weak self] index in
             if indexPath.section == 0 {
                 self?.selectOne = index
-                if index == 3 {
-                    self?.tableView.reloadData()
-                }
+                self?.tableView.reloadData()
             } else {
                 self?.selectTwo = index
             }
@@ -422,6 +420,14 @@ class YHInvitationWithGiftsSelectItemCell: UITableViewCell {
     }
     
     @objc func click(sender: UIButton) {
+        if selectIndex == sender.tag - 1000 {
+            sender.isSelected = false
+            sender.layer.borderWidth = 0
+            if let block = block {
+                block(100)
+            }
+            return
+        }
         guard let data = dataSource else { return }
         for i in 0..<data.count {
             let button = centerView.viewWithTag(1000+i) as! UIButton
@@ -433,6 +439,7 @@ class YHInvitationWithGiftsSelectItemCell: UITableViewCell {
                 button.layer.borderWidth = 0
             }
         }
+        selectIndex = sender.tag - 1000
         if let block = block {
             block(sender.tag - 1000)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/ OfficialApprovalBatch/C/YHOfficialApprovalResultVC2.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/ OfficialApprovalBatch/C/YHOfficialApprovalResultVC.swift

@@ -12,7 +12,7 @@ import UIKit
  正式批 结果页
  */
 
-class YHOfficialApprovalResultVC2: YHBaseViewController {
+class YHOfficialApprovalResultVC: YHBaseViewController {
 
     var contentView: YHOffivialApprovalSuccessView!
     
@@ -50,7 +50,7 @@ class YHOfficialApprovalResultVC2: YHBaseViewController {
     
 }
 
-private extension YHOfficialApprovalResultVC2 {
+private extension YHOfficialApprovalResultVC {
     func setupUI() {
         
         gk_navBarAlpha = 0.0
@@ -74,7 +74,6 @@ private extension YHOfficialApprovalResultVC2 {
         
         view.addSubview(docImageV)
         docImageV.snp.makeConstraints { make in
-            
             make.right.equalToSuperview()
             make.top.equalToSuperview().offset(64)
             make.width.equalTo(294)
@@ -86,13 +85,14 @@ private extension YHOfficialApprovalResultVC2 {
             view.updataView(data: ["祝贺您和您的家人申请的","【优秀人才入境计划】","2023年10月1日正式获批","这意味着，您领取香港居民身份证","仅有一步之遥！！"])
             return view
         }()
-        view.addSubview(contentView)
+        docImageV.addSubview(contentView)
         contentView.snp.makeConstraints { make in
-            make.left.equalTo(144)
-            make.top.equalTo(213)
-            make.width.equalTo(334)
-            make.height.equalTo(239)
+            make.left.equalTo(60)
+            make.top.equalTo(140)
+            make.width.equalTo(294)
+            make.height.equalTo(530)
         }
+//        contentView.backgroundColor = .red
         contentView.transform = rotatedTransform()
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/ OfficialApprovalBatch/V/YHOffivialApprovalSuccessView.swift

@@ -12,6 +12,8 @@ class YHOffivialApprovalSuccessView: UIView {
 
     var titleLabel: UILabel!
     
+    private var arrViews : [UIView] = []
+    
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -39,6 +41,11 @@ class YHOffivialApprovalSuccessView: UIView {
     }
     
     func updataView(data: [String]) {
+        
+        for (_,item) in arrViews.enumerated() {
+            item.removeFromSuperview()
+        }
+        
         var h = 80
         var index = 0
         for item in data {
@@ -61,12 +68,15 @@ class YHOffivialApprovalSuccessView: UIView {
             addSubview(line)
             line.snp.makeConstraints { make in
                 make.left.equalTo(5)
-                make.top.equalTo(h + 26 + 5)
+                make.top.equalTo(h + 26 + 2)
                 make.width.equalTo(234)
                 make.height.equalTo(1)
             }
-            h = h + 26 + 5
+            h = h + 26 + 10
             index = index + 1
+            
+            arrViews.append(label)
+            arrViews.append(line)
         }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift

@@ -568,6 +568,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
                                             safariViewController.dismissButtonStyle = .close
                                             safariViewController.delegate = self
                                             safariViewController.modalPresentationStyle = .fullScreen
+                                            present(safariViewController, animated: true, completion: nil)
                                         })
                                     }
                                 } else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsDetailViewModel.swift

@@ -179,7 +179,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
         let params: [String : Any] = ["user_name": name,
                                       "mobile": phone]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.personalUrl
-        let _ = YHNetRequest.postRequest(url: strUrl) { [weak self] json, code in
+        let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift

@@ -418,6 +418,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
                                         safariViewController.dismissButtonStyle = .close
                                         safariViewController.delegate = self
                                         safariViewController.modalPresentationStyle = .fullScreen
+                                        present(safariViewController, animated: true, completion: nil)
                                     })
                                 }
                             } else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHSignAppendStepView.swift

@@ -219,7 +219,7 @@ class YHSignAppendStepView: UIView {
             let button = UIButton(type: .custom)
             button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.contentHorizontalAlignment = .center
-            button.setTitle("确定", for: .normal)
+            button.setTitle("下一步", for: .normal)
             button.setTitleColor(UIColor.white, for: .normal)
             button.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.3)
             button.isEnabled = false

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/VM/YHMySignatureDetailViewModel.swift

@@ -92,7 +92,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
         let params: [String : Any] = ["user_name": name,
                                       "mobile": phone]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.personalUrl
-        let _ = YHNetRequest.postRequest(url: strUrl) { [weak self] json, code in
+        let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -95,14 +95,14 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         let view = YHUserInfoHeaderView.createView()
         view.settingBlock = {
             [weak self] in
-            guard let self = self else { return }
-            if !checkLogin() { return }
-            let vc = YHMySettingViewController()
-            self.navigationController?.pushViewController(vc)
+//            guard let self = self else { return }
+//            if !checkLogin() { return }
+//            let vc = YHMySettingViewController()
+//            self.navigationController?.pushViewController(vc)
             
-            
-//            let vc = YHOfficialApprovalResultVC()
-//            self?.navigationController?.pushViewController(vc) //for test hjl
+        
+            let vc = YHOfficialApprovalResultVC()
+            self?.navigationController?.pushViewController(vc) //for test hjl
         }
         view.evaluateBlock = {
             [weak self] in

galaxy/galaxy/Classes/Modules/PictureReview(图片预览)/YHPictureReviewManager.swift

@@ -26,7 +26,7 @@ class YHPictureReviewManager: NSObject {
 
 extension YHPictureReviewManager {
     func showNetWorkPicturs(curIndex : Int,arrPicturs:[String]) {
-        guard  curIndex > 0,arrPicturs.count > 0 else { return }
+        guard  curIndex > -1,arrPicturs.count > 0 else { return }
         
         self.curIndex = curIndex
         self.arrPics = arrPicturs