1、删除不使用的带

2、修改 赴港计划书中的两处bug

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -254,6 +254,8 @@
 		04EA230E2BB538E9009DA928 /* YHDocumentUploadTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EA230D2BB538E9009DA928 /* YHDocumentUploadTableViewCell.swift */; };
 		04F4B76B2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F4B76A2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift */; };
 		6203A87EDC96313BBE789D9C /* Pods_galaxy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */; };
+		A501BE662BC2B76200C4F1FB /* YHHomeHeadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A501BE652BC2B76200C4F1FB /* YHHomeHeadView.swift */; };
+		A501BE682BC2B85F00C4F1FB /* YHHomeSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A501BE672BC2B85F00C4F1FB /* YHHomeSearchView.swift */; };
 		A51044182B493675006B60BB /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A51044172B493675006B60BB /* README.md */; };
 		A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51044192B495DD0006B60BB /* UIView+Extension.swift */; };
 		A514E5DC2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */; };
@@ -319,7 +321,6 @@
 		A5ACE93F2B4564F7002C94D2 /* UIViewController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8FF2B4564F7002C94D2 /* UIViewController+Extension.swift */; };
 		A5ACE9402B4564F7002C94D2 /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9002B4564F7002C94D2 /* String+Extension.swift */; };
 		A5ACE9412B4564F7002C94D2 /* Dictionary+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9012B4564F7002C94D2 /* Dictionary+Extension.swift */; };
-		A5ACE9422B4564F7002C94D2 /* AppDelegate+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9022B4564F7002C94D2 /* AppDelegate+Extension.swift */; };
 		A5ACE9432B4564F7002C94D2 /* UILable+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9032B4564F7002C94D2 /* UILable+Extension.swift */; };
 		A5ACE9442B4564F7002C94D2 /* Array+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9042B4564F7002C94D2 /* Array+Extension.swift */; };
 		A5ACE9452B4564F7002C94D2 /* YHHUDContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9072B4564F7002C94D2 /* YHHUDContainerView.swift */; };
@@ -668,6 +669,8 @@
 		19B28612265782F9DC1BE0B0 /* Pods-galaxy.testenv.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.testenv.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.testenv.xcconfig"; sourceTree = "<group>"; };
 		58C2405158A4A6632D0E7460 /* Pods-galaxy.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.debug.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.debug.xcconfig"; sourceTree = "<group>"; };
 		987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_galaxy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		A501BE652BC2B76200C4F1FB /* YHHomeHeadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeHeadView.swift; sourceTree = "<group>"; };
+		A501BE672BC2B85F00C4F1FB /* YHHomeSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeSearchView.swift; sourceTree = "<group>"; };
 		A51044172B493675006B60BB /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		A51044192B495DD0006B60BB /* UIView+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
 		A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceCenterSecondViewController.swift; sourceTree = "<group>"; };
@@ -736,7 +739,6 @@
 		A5ACE8FF2B4564F7002C94D2 /* UIViewController+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extension.swift"; sourceTree = "<group>"; };
 		A5ACE9002B4564F7002C94D2 /* String+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = "<group>"; };
 		A5ACE9012B4564F7002C94D2 /* Dictionary+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Dictionary+Extension.swift"; sourceTree = "<group>"; };
-		A5ACE9022B4564F7002C94D2 /* AppDelegate+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Extension.swift"; sourceTree = "<group>"; };
 		A5ACE9032B4564F7002C94D2 /* UILable+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UILable+Extension.swift"; sourceTree = "<group>"; };
 		A5ACE9042B4564F7002C94D2 /* Array+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+Extension.swift"; sourceTree = "<group>"; };
 		A5ACE9072B4564F7002C94D2 /* YHHUDContainerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHHUDContainerView.swift; sourceTree = "<group>"; };
@@ -1930,7 +1932,6 @@
 				A5ACE8FF2B4564F7002C94D2 /* UIViewController+Extension.swift */,
 				A5ACE9002B4564F7002C94D2 /* String+Extension.swift */,
 				A5ACE9012B4564F7002C94D2 /* Dictionary+Extension.swift */,
-				A5ACE9022B4564F7002C94D2 /* AppDelegate+Extension.swift */,
 				A5ACE9032B4564F7002C94D2 /* UILable+Extension.swift */,
 				A5ACE9042B4564F7002C94D2 /* Array+Extension.swift */,
 				04754A942B96FF3D00F8ADCA /* UITextField+Extension.swift */,
@@ -2117,6 +2118,8 @@
 				A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */,
 				044413F82BC279D200784A14 /* YHHomeWebBottomView.swift */,
 				044413FA2BC27E6F00784A14 /* YHHomeWebBottomButton.swift */,
+				A501BE652BC2B76200C4F1FB /* YHHomeHeadView.swift */,
+				A501BE672BC2B85F00C4F1FB /* YHHomeSearchView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2447,6 +2450,7 @@
 				045EEEDB2B9F171A0022A143 /* YHCollegeSearchViewController.swift in Sources */,
 				045EEE982B9F171A0022A143 /* YHPreviewInfoQuestionAndAnswerItemsView.swift in Sources */,
 				045EEE7A2B9F171A0022A143 /* YHPreviewForOtherInfoModel.swift in Sources */,
+				A501BE682BC2B85F00C4F1FB /* YHHomeSearchView.swift in Sources */,
 				A5ACE94A2B4564F7002C94D2 /* YHHUDProgressView.swift in Sources */,
 				04A271232BABFF3200652B1B /* YHCertificateUploadTypeCell.swift in Sources */,
 				A582B2412BB95998009D098C /* YHHKPlanTipsCell.swift in Sources */,
@@ -2532,7 +2536,6 @@
 				045EEEE82B9F171A0022A143 /* YHFamilyMemberViewModel.swift in Sources */,
 				04E86E092B707ACE00A35F4B /* YHPhoneLoginViewController.swift in Sources */,
 				045EEED02B9F171A0022A143 /* YHScoreResultView.swift in Sources */,
-				A5ACE9422B4564F7002C94D2 /* AppDelegate+Extension.swift in Sources */,
 				0425E6442BA95FE100A5E763 /* YHSchemeTableHeadView.swift in Sources */,
 				045EEEBC2B9F171A0022A143 /* YHClipperButton.swift in Sources */,
 				045EEF102B9F171A0022A143 /* YHMainApplicantInformationViewModel.swift in Sources */,
@@ -2659,6 +2662,7 @@
 				045EEEF92B9F171A0022A143 /* YHFormItemTitleCell.swift in Sources */,
 				A580371E2BAD784B0031C312 /* YHMySchemeViewModel.swift in Sources */,
 				0425E6482BA96B4100A5E763 /* YHSchemeHeadScoreItemView.swift in Sources */,
+				A501BE662BC2B76200C4F1FB /* YHHomeHeadView.swift in Sources */,
 				04A271252BAC33BB00652B1B /* YHFilePreviewTool.swift in Sources */,
 				044413F92BC279D200784A14 /* YHHomeWebBottomView.swift in Sources */,
 				045EEEC32B9F171A0022A143 /* YHOtherResidenceFillView.swift in Sources */,

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStartPageViewController.swift

@@ -14,7 +14,7 @@ import ESTabBarController_swift
 
 class YHStartPageViewController: UIViewController {
     
-    private var MaxTime : Int = 10 //for test hjl
+    private var MaxTime : Int = 50 //for test hjl
     private var timer : Timer?
     
     lazy var imagV: UIImageView = {
@@ -82,8 +82,8 @@ private extension YHStartPageViewController {
         closeBtn.clipsToBounds = true
         closeBtn.layer.cornerRadius = 14
         closeBtn.snp.makeConstraints { make in
-            make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
-            make.right.equalTo(-10)
+            make.top.equalTo(k_Height_safeAreaInsetsTop() + 15)
+            make.right.equalTo(-20)
             make.width.equalTo(56)
             make.height.equalTo(28)
         }
@@ -112,10 +112,8 @@ private extension YHStartPageViewController {
         v3.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "me"), selectedImage: UIImage(named: "me_1"))
         
         tabBarController.viewControllers = [v0,v1,v2,v3]
-        //        tabBarController.viewControllers = [v1,v2] //for test hjl  配合测试同学做自动化测试 Moon 2023.03.12
         tabBarController.tabBar.backgroundColor = .white
         
-        
         let window = UIApplication.shared.yhKeyWindow()
         window?.rootViewController = tabBarController
         window?.makeKeyAndVisible()

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeHeadView.swift

+//
+//  YHHomeHeadView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/4/7.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHHomeHeadView: UIView {
+    
+}

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeSearchView.swift

+//
+//  YHHomeSearchView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/4/7.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+class YHHomeSearchView: UIView {
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        initView()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+private extension YHHomeSearchView {
+    func initView() {
+        backgroundColor = UIColor(hex: 0xF4F6FA, alpha: 1.0)
+        
+        let imageV : UIImageView = UIImageView()
+        imageV.contentMode = .scaleAspectFill
+        imageV.image = UIImage(named: "")
+        addSubview(imageV)
+        imageV.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(12)
+            make.width.height.equalTo(16)
+        }
+        
+        
+        let lable = UILabel()
+        lable.text = "大家正在搜香港身份"
+        lable.font = UIFont.PFSC_R(ofSize: 12)
+        lable.textColor = UIColor(hex: 0x94A3B8, alpha: 1.0)
+        addSubview(lable)
+        lable.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(imageV.snp.left).offset(8)
+            make.height.equalTo(18)
+            make.right.equalToSuperview().offset(-12)
+        }
+    }
+}

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

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Alamofire
 /*
  赴港计划书
  */
@@ -24,6 +25,7 @@ class YHHKPlanDoctumentVC: YHBaseViewController {
     private var canEditFlag : Bool = false
     
     private var timer : Timer?
+    private var finishHandleFlag : Bool = true
     
     
     override func viewDidLoad() {
@@ -43,6 +45,8 @@ class YHHKPlanDoctumentVC: YHBaseViewController {
     
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
+        YHHUD.hide()
+        finishHandleFlag = true
         cancelTimer()
     }
     
@@ -85,9 +89,13 @@ extension YHHKPlanDoctumentVC {
     }
     
     @objc fileprivate func flipNext(sender: Timer?) {
-        YHHUD.hide()
-        YHHUD.flash(message: "提交成功")
-        getData()
+        finishHandleFlag = true
+        DispatchQueue.main.async {
+            
+            YHHUD.hide()
+            YHHUD.flash(message: "提交成功")
+            self.getData()
+        }
     }
     
     
@@ -117,7 +125,12 @@ extension YHHKPlanDoctumentVC {
     
     //点击提交按钮
     @objc func clickSubmitBtn() {
-        submitOp()
+        YHCommonAlertView.show("", "是否已完成对文本框的内容修改，并确认提交？", "取消", "确认") {
+            self.viewModel.requestSignaturePersonalURL(callBackBlock: {[weak self] success, error in
+                guard let self = self else { return }
+                self.submitOp()
+            })
+        }
     }
     
     //提交数据
@@ -136,17 +149,27 @@ extension YHHKPlanDoctumentVC {
                               "content_save":1]
                 cancelTimer()
                 startTimer()
+                
+                finishHandleFlag = false
                 YHHUD.show(.progress(message: ""))
-                viewModel.submitHKPlanDocument(params) { success, error in
-                    YHHUD.hide()
+                viewModel.submitHKPlanDocument(params) {[weak self ] success, error in
+                    guard let self = self else { return }
+                    
+                    if self.finishHandleFlag {
+                        return
+                    }
+                    self.finishHandleFlag = true
+                    
                     self.cancelTimer()
-                    self.getData()
+                    YHHUD.hide()
                     if success {
                         YHHUD.flash(message: "提交成功")
+                        self.getData()
                     } else {
                         YHHUD.flash(message: error?.errorMsg ?? "提交失败")
                     }
                 }
+                
             } else {
                 YHHUD.flash(message: "订单ID 为空")
             }

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

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Alamofire
 
 class YHMyDocumentsDetailViewModel: YHBaseViewModel {
     var mainModel: YHMyDocumentDetailModel?
@@ -92,7 +93,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
     //提交赴港计划书
     func submitHKPlanDocument(_ params : [String : Any], callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Documents.hkPlanApi
-        let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
+        _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard self != nil else { return }
             if json.code == 200 {

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

@@ -50,8 +50,8 @@ class YHCommonAlertView: UIView {
             messageLabel.snp.remakeConstraints { make in
                 make.left.equalTo(22)
                 make.right.equalTo(-22)
-                make.height.equalTo(42)
-                make.top.equalTo(40)
+                make.height.lessThanOrEqualTo(60)
+                make.top.equalTo(37)
             }
         }
     }
@@ -96,7 +96,7 @@ class YHCommonAlertView: UIView {
             let label = UILabel()
             label.textAlignment = .center
             label.textColor = UIColor.mainTextColor
-            label.font = UIFont.PFSC_M(ofSize: 16)
+            label.font = UIFont.PFSC_R(ofSize: 16)
             label.numberOfLines = 0
             return label
         }()

galaxy/galaxy/Classes/Tools/Extention/AppDelegate+Extension.swift

-//
-//  AppDelegate + UIAppearance.swift
-//  SleepDoctor
-//
-//  Created by DAVIDiOS1 on 2020/12/24.
-//  Copyright © 2020 sumian. All rights reserved.
-//
-
-import UIKit
-// MARK: - Pay 支付
-extension AppDelegate {
-    
-    func payCallback(url: URL) {
-//        //支付宝支付
-//        if url.host == "safepay" {
-//            AlipaySDK.defaultService().processOrder(withPaymentResult: url, standbyCallback: { resultDic in
-//                let status = resultDic?["resultStatus"] as? String ?? ""
-//                var success: Bool = false
-//                if status == "9000" {
-//                    success = true
-//                    print("支付宝: 支付成功")
-//                } else {
-//                    success = false
-//                    print("支付宝: 支付失败")
-//                }
-//                NotificationCenter.default.post(name: BsConstant.BsNotification.payResultNotification, object: success)
-//            })
-//        }
-    }
-    
-}
-

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -52,6 +52,9 @@ let k_TabBar_Height :CGFloat = 49.0
 /** 底部导航栏高度（包括安全区），一般使用这个值 */
 let k_Height_TabBar :CGFloat = k_Height_safeAreaInsetsBottom() + k_TabBar_Height
 
+//比例
+let kRadio = KScreenWidth / 375.0
+
 // MARK: - 尺寸信息： -
 /* 状态栏高度  20 或 44 */
 // 然而从iOS 14开始，全面屏iPhone的状态栏高度不一定是 44 或 20 了，比如下面就是这些设备在iOS 14.1上的状态栏高度。（还可能时47、48）