Merge branch 'main' into 630-dev

* main:
  修改版本号 0.8.1.2
  修改版本号 0.8.1.1

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3540,7 +3540,11 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
+<<<<<<< HEAD
 				CURRENT_PROJECT_VERSION = 1;
+=======
+				CURRENT_PROJECT_VERSION = 2;
+>>>>>>> main
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3790,7 +3794,11 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
+<<<<<<< HEAD
 				CURRENT_PROJECT_VERSION = 1;
+=======
+				CURRENT_PROJECT_VERSION = 2;
+>>>>>>> main
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3815,7 +3823,11 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+<<<<<<< HEAD
 				MARKETING_VERSION = 0.9.0;
+=======
+				MARKETING_VERSION = 0.8.1;
+>>>>>>> main
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHCodeSueecssViewController.swift

@@ -106,6 +106,7 @@ class YHCodeSueecssViewController: YHBaseViewController {
                             self.requestLogin(phone: phone, code: code)
                         }
                     } else {
+                        YHHUD.hide()
                         self.requestLogin(phone: phone, code: code)
                     }
                     
@@ -131,6 +132,7 @@ class YHCodeSueecssViewController: YHBaseViewController {
             button.backgroundColor = UIColor.brandMainColor16
             button.addTarget(self, action: #selector(startClicked), for: .touchUpInside)
             button.layer.cornerRadius = 3
+            button.isEnabled = false
             return button
         }()
         view.addSubview(getCodeButton)
@@ -227,7 +229,7 @@ class YHCodeSueecssViewController: YHBaseViewController {
                 sourceTimer.cancel()
                 DispatchQueue.main.async {
                     self.time = 60
-                    self.getCodeButton.setTitle("重新获取验证码", for: .normal)
+                    self.getCodeButton.setTitle("重新获取", for: .normal)
                     self.getCodeButton.isEnabled = true
                     self.getCodeButton.backgroundColor = UIColor.brandMainColor
                 }
@@ -239,9 +241,6 @@ class YHCodeSueecssViewController: YHBaseViewController {
     
     
     @objc func startClicked() {
-        if time > 0 {
-            return
-        }
         YHHUD.show(.progress(message: ""))
         viewModel?.getLoginCode(phoneNumber ?? "", callBackBlock: {[weak self] success,error in
             YHHUD.hide()