Merge branch '630-dev'

* 630-dev:
  修改版本号
  取消 Ai 动画
  修改版本号  0.9.0.11

galaxy/fastlane/Fastfile

@@ -82,9 +82,9 @@ platform :ios do
     # 拉取最新代码
     sh "git pull origin #{myPack_branch}"
     # 显示git当前分支最新submit id
-    sh "git rev-parse HEAD"
+    # sh "git rev-parse HEAD"
     # 更新pod第三方库
-    cocoapods(use_bundle_exec: true)
+    # cocoapods(use_bundle_exec: true)
   
     gym(
     workspace: 'galaxy.xcworkspace',

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3740,7 +3740,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3944,7 +3944,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3990,7 +3990,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMatchUserViewController.swift

@@ -281,11 +281,24 @@ extension YHMatchUserViewController: YHMatchProtocol {
             self.launchLottieView.isHidden = true
             self.rotateLottieView.isHidden = false
             self.rotateLottieView.loopMode = .loop
-            self.rotateLottieView.play()
-            DispatchQueue.global().asyncAfter(deadline: .now()+2.0, execute: {
-                self.requestMatchUserList()
-            })
+            self.rotateLottieView.play { [weak self] completed in
+                if completed {
+                    print("yyyyyyyyy")
+                } else {
+                    print("nnnnnnnnnn")
+                    self?.isStartMatch = false
+                    self?.resetAnimation()
+                }
+            }
         }
+        
+        DispatchQueue.main.asyncAfter(deadline: .now()+2.0, execute: {
+            if self.isStartMatch {
+                self.requestMatchUserList()
+            } else {
+                self.resetAnimation()
+            }
+        })
     }
 }
 
@@ -297,10 +310,14 @@ extension YHMatchUserViewController {
                 let vc = YHMatchResultListViewController()
                 vc.delegate = self
                 vc.matchUsersArr = self.viewModel.matchUserArr
-                self.navigationController?.pushViewController(vc, completion: {
-                    self.resetAnimation()
-                })
-                
+                self.resetAnimation()
+                if let curVc = UIViewController.current as? YHCommunityViewController,curVc.segmentedView.selectedIndex == 0 {
+                    curVc.navigationController?.pushViewController(vc, completion: {
+                    })
+                } else {
+                    printLog("hhhhhhhhhhhhhhhhhhhhhhhh")
+                }
+               
             } else {
                 var msg = "匹配失败"
                 if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {