南鑫林 %!s(int64=5) %!d(string=hai) anos
pai
achega
56927c6f60
Modificáronse 14 ficheiros con 32 adicións e 11 borrados
  1. 0 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Header/CommunityCommonSectionHeaderView.swift
  2. 3 3
      RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageList/View/MessageListTableCell.swift
  3. BIN=BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_attention.imageset/star_detail_attention@2x.png
  4. BIN=BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_attention.imageset/star_detail_attention@3x.png
  5. BIN=BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_like.imageset/star_detail_like@2x.png
  6. BIN=BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_like.imageset/star_detail_like@3x.png
  7. 22 0
      RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_new.imageset/Contents.json
  8. BIN=BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_new.imageset/star_detail_new@2x.png
  9. BIN=BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_new.imageset/star_detail_new@3x.png
  10. BIN=BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_read.imageset/star_detail_read @2x.png
  11. BIN=BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_read.imageset/star_detail_read @3x.png
  12. BIN=BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_share.imageset/star_detail_share@2x.png
  13. BIN=BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_share.imageset/star_detail_share@3x.png
  14. 7 7
      RainbowPlanet/RainbowPlanet/ViewModel/Community/CommunityFollowUserViewModel.swift

+ 0 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Header/CommunityCommonSectionHeaderView.swift

@@ -65,7 +65,6 @@ class CommunityCommonSectionHeaderView: BaseView {
                 if !(self?.communityRecommendTypeDataModels?.isEmpty ?? true) {
                     let communityRecommendTypeDataModel = self?.communityRecommendTypeDataModels?[0]
                     NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityPopularVideo"), object: communityRecommendTypeDataModel?.id)
-
                 }
                 break
             default:

+ 3 - 3
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageList/View/MessageListTableCell.swift

@@ -135,7 +135,7 @@ class MessageListTableCell: UITableViewCell {
         didSet {
             //6评论消息
             if MessageShowType.postComment == MessageShowType(rawValue: messageDataModel?.messageShowType ?? 6) {
-                typeImageView.image = kImage(name: "news_comment")
+                typeImageView.image = kImage(name: "star_detail_read")
                 setTitleLabel(oneStr: (messageDataModel?.param?.userName ?? ""), twoStr: " 评论了 ", Three: "你的作品")
                 contentLabel.text = "“\(messageDataModel?.param?.content ?? "")”"
                 contentImageViewConstraint(size: 60, cornerRadius: 4)
@@ -143,7 +143,7 @@ class MessageListTableCell: UITableViewCell {
             }
             //7回复消息
             if MessageShowType.postReply == MessageShowType(rawValue: messageDataModel?.messageShowType ?? 7) {
-                typeImageView.image = kImage(name: "news_comment")
+                typeImageView.image = kImage(name: "star_detail_read")
                 setTitleLabel(oneStr: (messageDataModel?.param?.userName ?? ""), twoStr: " 回复了 ", Three: "你的评论")
 
                 contentLabel.text = "“\(messageDataModel?.param?.content ?? "")”"
@@ -190,7 +190,7 @@ class MessageListTableCell: UITableViewCell {
             }
             //12关注消息
             if MessageShowType.follow == MessageShowType(rawValue: messageDataModel?.messageShowType ?? 12) {
-                typeImageView.image = kImage(name: "star_detail_read")
+                typeImageView.image = kImage(name: "star_detail_new")
                 setTitleLabel(oneStr: (messageDataModel?.param?.userName ?? ""), twoStr: " 关注了你", Three: "")
                 contentLabel.text = "\(messageDataModel?.param?.content ?? "")"
                 contentImageViewConstraint(size: 44, cornerRadius: 22)

BIN=BIN
RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_attention.imageset/star_detail_attention@2x.png


BIN=BIN
RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_attention.imageset/star_detail_attention@3x.png


BIN=BIN
RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_like.imageset/star_detail_like@2x.png


BIN=BIN
RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_like.imageset/star_detail_like@3x.png


+ 22 - 0
RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_new.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "star_detail_new@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "star_detail_new@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN=BIN
RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_new.imageset/star_detail_new@2x.png


BIN=BIN
RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_new.imageset/star_detail_new@3x.png


BIN=BIN
RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_read.imageset/star_detail_read @2x.png


BIN=BIN
RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_read.imageset/star_detail_read @3x.png


BIN=BIN
RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_share.imageset/star_detail_share@2x.png


BIN=BIN
RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/star_detail_share.imageset/star_detail_share@3x.png


+ 7 - 7
RainbowPlanet/RainbowPlanet/ViewModel/Community/CommunityFollowUserViewModel.swift

@@ -46,20 +46,20 @@ class CommunityFollowUserViewModel: NSObject {
             followButton?.setTitle("已关注", for: UIControl.State.normal)
             followButton?.setTitleColor(kThemeColor, for: UIControl.State.normal)
             followButton?.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-//            UIView.animate(withDuration: 1) {
-//                [weak followButton] in
-//            }
-            followButton?.alpha = 0
+            UIView.animate(withDuration: 1) {
+                [weak followButton] in
+                followButton?.alpha = 0
+            }
 
             break
         case .mutualFollow?:
             followButton?.setTitle("已互关", for: UIControl.State.normal)
             followButton?.setTitleColor(kThemeColor, for: UIControl.State.normal)
             followButton?.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-//            UIView.animate(withDuration: 1) {
-//                [weak followButton] in
+            UIView.animate(withDuration: 1) {
+                [weak followButton] in
                 followButton?.alpha = 0
-//            }
+            }
             break
         default:
             break