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:
  // UI
  边框问题
  //  UI

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

@@ -14,6 +14,7 @@ class YHMatchUserViewController: YHBaseViewController {
     let viewModel = YHMatchUserViewModel()
     var informationAuthorizeViewModel: YHInformationAuthorizeViewModel = YHInformationAuthorizeViewModel()
     var needToMatch: Bool = false
+    var isStartMatch: Bool = false
     
     lazy var topLabel:UILabel = {
         let label = UILabel()
@@ -101,7 +102,7 @@ class YHMatchUserViewController: YHBaseViewController {
                 } else {
                     self.firstImageView.isHidden = true
                     self.bottomLabel.isHidden = true
-                    self.headLottieView.isHidden = false
+                    self.headLottieView.isHidden = self.isStartMatch ? true : false
                     self.launchLottieView.isHidden = false
                     self.rotateLottieView.isHidden = true
                     self.bottomBtn.setTitle("AI人脉雷达匹配", for: .normal)
@@ -217,6 +218,7 @@ class YHMatchUserViewController: YHBaseViewController {
     }
     
     func resetAnimation() {
+        self.isStartMatch = false
         self.launchLottieView.stop()
         self.rotateLottieView.stop()
         self.headLottieView.isHidden = false
@@ -237,6 +239,7 @@ extension YHMatchUserViewController: JXSegmentedListContainerViewListDelegate {
 
 extension YHMatchUserViewController: YHMatchProtocol {
     func startMatchUsers() {
+        self.isStartMatch = true
         self.bottomBtn.isHidden = true
         self.headLottieView.isHidden = true
         self.launchLottieView.isHidden = false

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

@@ -389,7 +389,7 @@ class YHEditInterestViewCell: UICollectionViewCell {
         if dataSource.isNormal {
             deleteButton.isHidden = true
             if dataSource.isSelect {
-                contentView.layer.borderWidth = 0.5
+                contentView.layer.borderWidth = 1
                 contentView.layer.borderColor = UIColor.brandMainColor.cgColor
                 titleLabel.textColor = UIColor.brandMainColor
             } else {
@@ -399,7 +399,7 @@ class YHEditInterestViewCell: UICollectionViewCell {
             }
         } else {
             if dataSource.isSelect {
-                contentView.layer.borderWidth = 0.5
+                contentView.layer.borderWidth = 1
                 contentView.layer.borderColor = UIColor.brandMainColor.cgColor
                 titleLabel.textColor = UIColor.brandMainColor
                 deleteButton.isHidden = true

galaxy/galaxy/Res/Assets.xcassets/Mine/mine_item_activity.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "wode_activity.png",
+      "filename" : "Frame@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "wode_activity 1.png",
+      "filename" : "Frame@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }