Merge branch 'feature/dev_Chris' into develop

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoSelTopicCell.swift

@@ -61,7 +61,7 @@ class CommunityVideoSelTopicCell: UICollectionViewCell {
         titleLabel.snp.makeConstraints { (make) in
             make.top.equalTo(3)
             make.left.equalTo(iconImageView.snp_right).offset(5)
-            make.right.equalTo(-26)
+            make.right.equalTo(-6)
             make.height.equalTo(19)
         }
     }

RainbowPlanet/RainbowPlanet/ViewModel/Community/CommunityFollowUserViewModel.swift

@@ -65,6 +65,46 @@ class CommunityFollowUserViewModel: NSObject {
         }
     }
     
+    /// 设置关注
+    ///
+    /// - Parameters:
+    ///   - followButton: 关注button
+    ///   - followType: 关注类型
+    func setVideoFollowType(followButton:UIButton,followType: FollowType) {
+        switch followType {
+        case .futureFollow:
+            followButton.setTitle("关注", for: UIControl.State.normal)
+            followButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+            followButton.setImage(kImage(name: "center_attention_white"), for: UIControl.State.normal)
+            followButton.layer.borderColor = kThemeColor.cgColor
+            followButton.layer.borderWidth = 0.5
+            followButton.setBackgroundImage(UIImage.imageWithColor(color: kThemeColor), for: UIControl.State.normal)
+            followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 2)
+            
+            break
+        case .alreadyFollow:
+            followButton.setTitle("关注", for: UIControl.State.normal)
+            followButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+            followButton.setImage(kImage(name: "center_followed_white"), for: UIControl.State.normal)
+            followButton.layer.borderColor = kffffffColor.cgColor
+            followButton.layer.borderWidth = 0.5
+            followButton.setBackgroundImage(UIImage.imageWithColor(color: UIColor.clear), for: UIControl.State.normal)
+            followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 2)
+            break
+        case .mutualFollow:
+            followButton.setTitle("互相关注", for: UIControl.State.normal)
+            followButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+            followButton.setImage(nil, for: UIControl.State.normal)
+            followButton.layer.borderColor = kffffffColor.cgColor
+            followButton.layer.borderWidth = 0.5
+
+            followButton.setBackgroundImage(UIImage.imageWithColor(color: UIColor.clear), for: UIControl.State.normal)
+            followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 0)
+            
+            break
+        }
+    }
+    
 }
 
 // MARK: - communityPostDetailModel
@@ -213,7 +253,7 @@ extension CommunityFollowUserViewModel {
         if communityVideoItemModel.isFollow == 0 {//加关注
             self.userFollow(followUid:  communityVideoItemModel.uid ?? 0, completion: { (isFollow) -> Void in
                 communityVideoItemModel.isFollow = isFollow
-                CommunityFollowUserViewModel.shared.setFollowType(followButton: button, followType: FollowType(rawValue: communityVideoItemModel.isFollow ?? 0) ?? .futureFollow)
+                CommunityFollowUserViewModel.shared.setVideoFollowType(followButton: button, followType: FollowType(rawValue: communityVideoItemModel.isFollow ?? 0)!)
                 for (_,model) in videoItemList.enumerated() {
                     if model.uid == communityVideoItemModel.uid {
                         model.isFollow = isFollow
@@ -224,7 +264,7 @@ extension CommunityFollowUserViewModel {
         }else {//取消关注
             self.userCancelFollow(followUid:  communityVideoItemModel.uid ?? 0, completion: { (isFollow) -> Void in
                 communityVideoItemModel.isFollow = isFollow
-                CommunityFollowUserViewModel.shared.setFollowType(followButton: button, followType: FollowType(rawValue: communityVideoItemModel.isFollow ?? 0) ?? .futureFollow)
+                CommunityFollowUserViewModel.shared.setVideoFollowType(followButton: button, followType: FollowType(rawValue: communityVideoItemModel.isFollow ?? 0)!)
                 for (_,model) in videoItemList.enumerated() {
                     if model.uid == communityVideoItemModel.uid {
                         model.isFollow = isFollow