Browse Source

no message

Chris 5 years ago
parent
commit
4c50a15116

File diff suppressed because it is too large
+ 6 - 5
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoCoverCollectionCell.swift


+ 8 - 4
RainbowPlanet/RainbowPlanet/ViewModel/Community/CommunityFollowUserViewModel.swift

@@ -75,8 +75,9 @@ class CommunityFollowUserViewModel: NSObject {
         case .futureFollow:
             followButton.setTitle("关注", for: UIControl.State.normal)
             followButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-            followButton.setImage(kImage(name: "star_attention"), 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)
             
@@ -84,8 +85,9 @@ class CommunityFollowUserViewModel: NSObject {
         case .alreadyFollow:
             followButton.setTitle("关注", for: UIControl.State.normal)
             followButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-            followButton.setImage(kImage(name: "star_followed"), 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
@@ -94,6 +96,8 @@ class CommunityFollowUserViewModel: NSObject {
             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)
             
@@ -249,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
@@ -260,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