推荐,关注,话题,点赞完成

RainbowPlanet/RainbowPlanet/Macro/EnumMacro.swift

@@ -96,6 +96,7 @@ enum BehaviorFlagType : String {
     case collect = "collect"
     case publish = "publish"
     case register = "register"
+    case commentLike = "comment_like"
 }
 
 // MARK: - 关注类型

RainbowPlanet/RainbowPlanet/Model/ConfigModel/ConfigModel.swift

@@ -63,10 +63,12 @@ class VirusModel : NSObject, Mappable{
     var comment : String?
     var forward : String?
     var like : String?
+    
     var publish : String?
     var read : String?
     var register : String?
     var unlike : String?
+    var commentLike : String?
     
     
     class func newInstance(map: Map) -> Mappable?{
@@ -85,6 +87,7 @@ class VirusModel : NSObject, Mappable{
         read <- map["read"]
         register <- map["register"]
         unlike <- map["unlike"]
+        commentLike <- map["comment_like"]
         
     }
     

RainbowPlanet/RainbowPlanet/Model/VirusModel/VirueRecordAddParameterModel.swift

@@ -71,6 +71,8 @@ class VirueRecordAddParameterModel: NSObject, Mappable{
     var openId : String?
     /// 帖子类型
     var postType :String?
+    ///  当前评论UID
+    var commentUId : Int?
     
     func mapping(map: Map) {
         //必传
@@ -118,6 +120,8 @@ class VirueRecordAddParameterModel: NSObject, Mappable{
         postId <- map["post_id"]
         /// 评论ID
         commentId <- map["comment_id"]
+        /// 评论ID
+        commentUId <- map["comment_uid"]
         /// 评论的@人id
         replyUid <- map["reply_uid"]
         /// 评论的@人昵称

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/CommentList/CardContentCommentListContentTableViewCell.swift

@@ -39,6 +39,8 @@ class CardContentCommentListContentTableViewCell: UITableViewCell {
         addSubview(commentLabel)
         addSubview(likeCountLabel)
         addSubview(likeButton)
+
+
     }
     
     private func setupLayouts() {
@@ -63,7 +65,7 @@ class CardContentCommentListContentTableViewCell: UITableViewCell {
         commentLabel.numberOfLines = 0
         commentLabel.textColor = k333333Color
         commentLabel.font = kRegularFont14
-        commentLabel.isUserInteractionEnabled = true
+        commentLabel.isUserInteractionEnabled = false
         commentLabel.textAlignment = .left
         return commentLabel
     }()
@@ -73,6 +75,7 @@ class CardContentCommentListContentTableViewCell: UITableViewCell {
         likeButton.setImage(kImage(name: "btn_praise"), for: UIControl.State.normal)
         likeButton.setImage(kImage(name: "btn_praise_pre_36px"), for: UIControl.State.selected)
         likeButton.addTarget(self, action: #selector(likeAction), for: UIControl.Event.touchUpInside)
+
         return likeButton
     }()
     
@@ -81,13 +84,67 @@ class CardContentCommentListContentTableViewCell: UITableViewCell {
         likeCountLabel.textColor = k313334Color
         likeCountLabel.font = kRegularFont14
         likeCountLabel.addTapGesture(1, target: self, action:  #selector(likeAction))
+
         return likeCountLabel
     }()
     
     @objc func likeAction() {
+        if communityRecommendCommentModel != nil {
+            VirusViewModel.shared.commentlikeVirueRecordApi(button: likeButton,
+                                                            label: likeCountLabel,
+                                                            isCommentLike: communityRecommendCommentModel?.isLike,
+                                                            postId: communityRecommendDataModel?.id,
+                                                            postAuthorUid: "\(communityRecommendDataModel?.uid ?? 0)",
+                                                            title: communityRecommendDataModel?.title,
+                                                            content: communityRecommendDataModel?.content,
+                                                            postCover: communityRecommendDataModel?.img,
+                                                            actionId: "\(communityRecommendCommentModel?.id ?? 0)",
+                                                            postType: communityRecommendDataModel?.type,
+                                                            commentContent: communityRecommendCommentModel?.content,
+                                                            commentId: communityRecommendCommentModel?.id,
+                                                            commentUId: communityRecommendCommentModel?.uid,
+                                                            commentLikeCount: communityRecommendCommentModel?.likeCount) {
+                                                                [weak self] (isCommentLike) in
+                                                                self?.communityRecommendCommentModel?.isLike = isCommentLike
+                                                                if isCommentLike == 1 {
+                                                                    self?.communityRecommendCommentModel?.likeCount = (self?.communityRecommendCommentModel?.likeCount ?? 0) + 1
+                                                                }
+                                                                if isCommentLike == 0 {
+                                                                    self?.communityRecommendCommentModel?.likeCount = (self?.communityRecommendCommentModel?.likeCount ?? 0) - 1
+                                                                }
+                                                            }
+        }
         
+        if communityFollowPostCommentModel != nil {
+            VirusViewModel.shared.commentlikeVirueRecordApi(button: likeButton,
+                                                            label: likeCountLabel,
+                                                            isCommentLike: communityFollowPostCommentModel?.isLike,
+                                                            postId: communityFollowRelateDataModel?.id,
+                                                            postAuthorUid: "\(communityFollowRelateDataModel?.uid ?? 0)",
+                                                            title: communityFollowRelateDataModel?.title,
+                                                            content: communityFollowRelateDataModel?.content,
+                                                            postCover: communityFollowRelateDataModel?.img,
+                                                            actionId: "\(communityFollowPostCommentModel?.id ?? 0)",
+                                                            postType: communityFollowRelateDataModel?.type,
+                                                            commentContent: communityFollowPostCommentModel?.content,
+                                                            commentId: communityFollowPostCommentModel?.id,
+                                                            commentUId: communityFollowPostCommentModel?.uid,
+                                                            commentLikeCount: communityFollowPostCommentModel?.likeCount) {
+                                                                [weak self] (isCommentLike) in
+                                                                self?.communityFollowPostCommentModel?.isLike = isCommentLike
+
+                                                                if isCommentLike == 1 {
+                                                                    self?.communityFollowPostCommentModel?.likeCount = (self?.communityFollowPostCommentModel?.likeCount ?? 0) + 1
+                                                                }
+                                                                if isCommentLike == 0 {
+                                                                    self?.communityFollowPostCommentModel?.likeCount = (self?.communityFollowPostCommentModel?.likeCount ?? 0) - 1
+                                                                }
+
+            }
+        }
     }
     
+    var communityRecommendDataModel: CommunityRecommendDataModel?
     var communityRecommendCommentModel: CommunityRecommendCommentModel? {
         didSet {
             let nameStr = "\(communityRecommendCommentModel?.username ?? ""):"
@@ -110,6 +167,8 @@ class CardContentCommentListContentTableViewCell: UITableViewCell {
         }
     }
     
+    
+    var communityFollowRelateDataModel : CommunityFollowRelateDataModel?
     var communityFollowPostCommentModel: CommunityFollowPostCommentModel? {
         didSet {
             let nameStr = "\(communityFollowPostCommentModel?.username ?? ""):"

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/CommentList/CardContentCommentListTableViewCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SwiftyMediator
 
 
 class CardContentCommentListTableViewCell: UITableViewCell {
@@ -57,7 +58,6 @@ class CardContentCommentListTableViewCell: UITableViewCell {
         tableView.dataSource = self
         tableView.delegate = self
         tableView.isScrollEnabled = false
-        tableView.isUserInteractionEnabled = false
         return tableView
     }()
     
@@ -117,8 +117,10 @@ extension CardContentCommentListTableViewCell : UITableViewDelegate,UITableViewD
         let cell = CardContentCommentListContentTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
         if communityType == .follow {
             cell.communityFollowPostCommentModel = communityFollowDataModel?.relateData?.postComment?[indexPath.row]
+            cell.communityFollowRelateDataModel = communityFollowDataModel?.relateData
         }else {
             cell.communityRecommendCommentModel = communityRecommendDataModel?.comment?[indexPath.row]
+            cell.communityRecommendDataModel = communityRecommendDataModel
 
         }
         return cell
@@ -126,6 +128,23 @@ extension CardContentCommentListTableViewCell : UITableViewDelegate,UITableViewD
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
+
+        if communityType == .follow {
+
+            if PostType(rawValue:  communityFollowDataModel?.relateData?.type ?? "video") == .video {
+ 
+                Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(communityFollowDataModel?.relateData?.id ?? 0)", departType: .others, topicId: 0))
+                
+            }else {
+                Mediator.push(CommunityRouterModuleType.pushPostDetailContent(postId: "\(communityFollowDataModel?.relateData?.id ?? 0)"))
+            }
+        }else {
+            if PostType(rawValue: communityRecommendDataModel?.type ?? "video") == .video {
+                Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(communityRecommendDataModel?.id ?? 0)", departType: .others, topicId: 0))
+            }else {
+                Mediator.push(CommunityRouterModuleType.pushPostDetailContent(postId: "\(communityRecommendDataModel?.id ?? 0)"))
+            }
+        }
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/FollowStatus/CommunityFollowStatusTableViewCell.swift

@@ -9,6 +9,8 @@
 import UIKit
 import RxSwift
 import Kingfisher
+import SwiftyMediator
+
 class CommunityFollowStatusTableViewCell: UITableViewCell {
     
     let disposeBag = DisposeBag()
@@ -445,13 +447,13 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
     
     /// 内容详情页面
     @objc func contentDetail() {
+        
         if PostType(rawValue: communityFollowDataModel?.content?.postType ?? "video") == .video {
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityContentVideoClosure"), object: communityFollowDataModel?.relateId)
-
+            Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(communityFollowDataModel?.relateId ?? 0)", departType: .others, topicId: 0))
         }else {
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityContentDetailClosure"), object: communityFollowDataModel?.relateId)
-
+            Mediator.push(CommunityRouterModuleType.pushPostDetailContent(postId: "\(communityFollowDataModel?.relateId ?? 0)"))
         }
+        
     }
     
 }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/PopularVideo/PopularVideoTableViewCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SwiftyMediator
 
 class PopularVideoTableViewCell: UITableViewCell {
     class func cellWith(tableView:UITableView,indexPath:IndexPath) -> PopularVideoTableViewCell {
@@ -89,7 +90,7 @@ extension PopularVideoTableViewCell: UICollectionViewDelegateFlowLayout,UICollec
     
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         let communityRecommendTypeDataModel = communityRecommendTypeDataModels?[indexPath.row]
-        NotificationCenter.default.post(name: NSNotification.Name("CommunityPopularVideo"), object: communityRecommendTypeDataModel?.id)
+        Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(communityRecommendTypeDataModel?.id ?? 0)", departType: .hotVideos, topicId: 0))
     }
     
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Header/CommunityCommonSectionHeaderView.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SwiftyMediator
 
 
 /// 分区类型
@@ -68,7 +69,8 @@ class CommunityCommonSectionHeaderView: BaseView {
             case .popularVideo?:
                 if !(self?.communityRecommendTypeDataModels?.isEmpty ?? true) {
                     let communityRecommendTypeDataModel = self?.communityRecommendTypeDataModels?[0]
-                    NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityPopularVideo"), object: communityRecommendTypeDataModel?.id)
+                    Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(communityRecommendTypeDataModel?.id ?? 0)", departType: .hotVideos, topicId: 0))
+
                 }
                 break
             default:

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -9,6 +9,7 @@
 import UIKit
 import JXSegmentedView
 import Kingfisher
+import SwiftyMediator
 
 class CommunityFollowViewController: BaseViewController {
     
@@ -490,12 +491,11 @@ extension CommunityFollowViewController : UITableViewDelegate,UITableViewDataSou
                 case 0:
                     break
                 //图片视频/内容标题/评论列表
-                case 1,2,4:
-                    if PostType(rawValue: communityFollowDataModel?.relateData?.type ?? "video") == .video {
-                        NotificationCenter.default.post(name: NSNotification.Name("CommunityContentVideoClosure"), object: communityFollowDataModel?.relateData?.id)
-                        
+                case 1,2:
+                    if PostType(rawValue: communityFollowDataModel?.type ?? "video") == .video {
+                        Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(communityFollowDataModel?.relateData?.id ?? 0)", departType: .others, topicId: 0))
                     }else {
-                        NotificationCenter.default.post(name: NSNotification.Name("CommunityContentDetailClosure"), object: communityFollowDataModel?.relateData?.id)
+                        Mediator.push(CommunityRouterModuleType.pushPostDetailContent(postId: "\(communityFollowDataModel?.relateData?.id ?? 0)"))
                     }
                     break
                 //点赞,收藏,分享
@@ -520,12 +520,11 @@ extension CommunityFollowViewController : UITableViewDelegate,UITableViewDataSou
                     case 0:
                         break
                     //图片视频/内容标题/评论列表
-                    case 1,2,4:
+                    case 1,2:
                         if PostType(rawValue: communityFollowDataModel?.relateData?.type ?? "video") == .video {
-                            NotificationCenter.default.post(name: NSNotification.Name("CommunityContentVideoClosure"), object: communityFollowDataModel?.relateData?.id)
-                            
+                            Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(communityFollowDataModel?.relateData?.id ?? 0)", departType: .others, topicId: 0))
                         }else {
-                            NotificationCenter.default.post(name: NSNotification.Name("CommunityContentDetailClosure"), object: communityFollowDataModel?.relateData?.id)
+                            Mediator.push(CommunityRouterModuleType.pushPostDetailContent(postId: "\(communityFollowDataModel?.relateData?.id ?? 0)"))
                         }
                         break
                     //点赞,收藏,分享

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -209,24 +209,6 @@ class CommunityViewController: BaseViewController {
             }
         }
         
-        // 内容详情页面
-        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityContentDetailClosure"), object: nil, queue: OperationQueue.main) {
-            [weak self] (notification) in
-            let id = notification.object as? Int
-            let vc = CommunityRecommendController()
-            vc.id = id ?? 0
-            self?.navigationController?.pushViewController(vc, animated: true)
-        }
-        
-        // 视频播放页面
-        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityContentVideoClosure"), object: nil, queue: OperationQueue.main) {
-            [weak self] (notification) in
-            let id = notification.object as? Int
-            let vc = CommunityVideoListController()
-            vc.contentId = id ?? 0
-            self?.navigationController?.pushViewController(vc, animated: true)
-        }
-        
         // 待发布
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("DismissFromPublishEditVc"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
             self?.reloadSegmentedFollowView()

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift

@@ -9,6 +9,7 @@
 import UIKit
 import JXSegmentedView
 import Kingfisher
+import SwiftyMediator
 
 class CommunityRecommnendViewController: UIViewController {
     
@@ -387,12 +388,11 @@ extension CommunityRecommnendViewController : UITableViewDelegate,UITableViewDat
             case 0:
                 break
             //图片视频/内容标题/评论列表
-            case 1,2,4:
+            case 1,2:
                 if PostType(rawValue: communityRecommendDataModel.type ?? "video") == .video {
-                    NotificationCenter.default.post(name: NSNotification.Name("CommunityContentVideoClosure"), object: communityRecommendDataModel.id)
-                    
+                    Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(communityRecommendDataModel.id ?? 0)", departType: .others, topicId: 0))
                 }else {
-                    NotificationCenter.default.post(name: NSNotification.Name("CommunityContentDetailClosure"), object: communityRecommendDataModel.id)
+                    Mediator.push(CommunityRouterModuleType.pushPostDetailContent(postId: "\(communityRecommendDataModel.id ?? 0)"))
                 }
                 break
             //点赞,收藏,分享

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFeaturedTopics/ViewController/CommunityFeaturedTopicsViewController.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import Kingfisher
+import SwiftyMediator
 
 class CommunityFeaturedTopicsViewController: BaseViewController {
     
@@ -470,17 +471,11 @@ extension CommunityFeaturedTopicsViewController : UITableViewDelegate,UITableVie
         case 0:
             break
         //图片视频/内容标题/评论列表
-        case 1,2,4:
+        case 1,2:
             if PostType(rawValue: communityRecommendDataModel.type ?? "video") == .video {
-                let vc = CommunityVideoListController()
-                vc.contentId = communityRecommendDataModel.id ?? 0
-                vc.topicId = self.id
-                vc.departureVc = .others
-                self.navigationController?.pushViewController(vc, animated: true)
+                Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(communityRecommendDataModel.id ?? 0)", departType: .others, topicId: 0))
             }else {
-                let vc = CommunityRecommendController()
-                vc.id = communityRecommendDataModel.id ?? 0
-                self.navigationController?.pushViewController(vc, animated: true)
+                Mediator.push(CommunityRouterModuleType.pushPostDetailContent(postId: "\(communityRecommendDataModel.id ?? 0)"))
             }
             break
         //点赞,收藏,分享

RainbowPlanet/RainbowPlanet/ViewModel/Virus/VirusViewModel.swift

@@ -898,6 +898,67 @@ extension VirusViewModel {
     }
 }
 
+// MARK: - 评论点赞
+extension VirusViewModel {
+    func commentlikeVirueRecordApi(button:UIButton?,
+                                   label:UILabel?,
+                                   isCommentLike:Int? = 0,
+                                   postId:Int?,
+                                   postAuthorUid:String?,
+                                   title:String?,
+                                   content:String?,
+                                   postCover:String?,
+                                   actionId:String?,
+                                   postType:String?,
+                                   commentContent:String?,
+                                   commentId:Int? = 0,
+                                   commentUId:Int? = 0,
+                                   commentLikeCount:Int? = 0,
+                                   completion:@escaping (_ isCommentLike:Int) -> Void) {
+        
+        let virueRecordAddParameterModel = VirueRecordAddParameterModel()
+        virueRecordAddParameterModel.behaviorId = (ConfigModel.shared.object()?.virus?.commentLike ?? "")
+        virueRecordAddParameterModel.behaviorFlag = BehaviorFlagType.commentLike.rawValue
+        if isCommentLike == 0 {
+            virueRecordAddParameterModel.behaviorValue = 1
+        }else {
+            virueRecordAddParameterModel.behaviorValue = 0
+        }
+        virueRecordAddParameterModel.postId = postId
+        virueRecordAddParameterModel.postAuthorUid = postAuthorUid
+        
+        if title == nil ||  title == "" {
+            virueRecordAddParameterModel.postDesc = "\(content?.prefix(20) ?? "")"
+        }else {
+            virueRecordAddParameterModel.postDesc = title
+        }
+        
+        virueRecordAddParameterModel.postCover = postCover
+        virueRecordAddParameterModel.actionId = actionId ?? ""
+        virueRecordAddParameterModel.postType = postType
+        virueRecordAddParameterModel.commentId = commentId
+        virueRecordAddParameterModel.commentContent = commentContent
+        virueRecordAddParameterModel.commentUId = commentUId
+        
+        SwiftMoyaNetWorkServiceVirus.shared().virueRecordAddApi(virueRecordAddParameterModel: virueRecordAddParameterModel, completion: {
+            [weak button,weak label] (data) -> (Void) in
+            if isCommentLike == 1 {
+                button?.isSelected = false
+                let commentLikeCount = (commentLikeCount ?? 0) - 1
+                label?.text = "\(commentLikeCount)"
+                completion(0)
+
+            }else {
+                button?.isSelected = true
+                let commentLikeCount = ((commentLikeCount ?? 0) + 1)
+                label?.text = "\(commentLikeCount)"
+                completion(1)
+
+            }
+        }, fail: {_ in})
+    }
+}
+
 // MARK: - 阅读
 extension VirusViewModel {
     
@@ -949,6 +1010,8 @@ extension VirusViewModel {
     }
 }
 
+
+
 // MARK: - 发布
 extension VirusViewModel {
     func publishVirueRecordAddApi(postId:Int?,postType:String?,title:String?,content:String?,postCover:String?,completion:@escaping ()->Void,fail:@escaping ()->Void) {