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

* '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  6666
  //  匹配动画优化

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

@@ -35,6 +35,8 @@ class YHMatchUserViewController: YHBaseViewController {
         return btn
     }()
     
+    var isBottomBtnEnabled = true
+    
     lazy var headLottieView: LottieAnimationView = {
         let view = LottieAnimationView(name: "people_head")
         view.loopMode = .loop
@@ -226,6 +228,12 @@ extension YHMatchUserViewController: JXSegmentedListContainerViewListDelegate {
 
 extension YHMatchUserViewController: YHMatchProtocol {
     func startMatchUsers() {
+        
+        if !self.isBottomBtnEnabled {
+            return
+        }
+        
+        self.isBottomBtnEnabled = false
         self.headLottieView.isHidden = true
         self.launchLottieView.isHidden = false
         self.launchLottieView.loopMode = .playOnce
@@ -236,7 +244,9 @@ extension YHMatchUserViewController: YHMatchProtocol {
             self.rotateLottieView.isHidden = false
             self.rotateLottieView.loopMode = .loop
             self.rotateLottieView.play()
-            self.requestMatchUserList()
+            DispatchQueue.global().asyncAfter(deadline: .now()+2.0, execute: {
+                self.requestMatchUserList()
+            })
         }
     }
 }
@@ -245,7 +255,7 @@ extension YHMatchUserViewController {
     func requestMatchUserList() {
         self.viewModel.getMatchUserlist { 
             success, error in
-            
+            self.isBottomBtnEnabled = true
             if success, self.viewModel.matchUserArr.count > 0 {
                 let vc = YHMatchResultListViewController()
                 vc.delegate = self

galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/VM/YHEditViewModel.swift

@@ -205,7 +205,7 @@ class YHEditViewModel: YHBaseViewModel {
     }
     
     func requestSaveTopics(topics: [String], draft_topics: [String], callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
-        let interest: [String: Any] = ["topics": topics, "is_update": true, "draft_topics": draft_topics]
+        let interest: [String: Any] = ["is_update": true, "topics": topics, "draft_topics": draft_topics]
         let params: [String: Any] = ["interest": interest]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.People.cardSave
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in