1. 只替换点播详情数据的点赞评论 ,看点专辑电商不替换

2. videoId 不重复加mc_

1. 只替换点播详情数据的点赞评论 ,看点专辑电商不替换
2. videoId 不重复加mc_
张旭
1 parent b9f01d49
Showing 6 changed files with 191 additions and 40 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/CNLiveVodIntroductionCell.swift
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/VideoPage/View/CNLiveShortVideoCommentListView.swift
metaCode/Classes/Main/VideoPage/ViewModel/CNLiveShortVideoViewModel.swift
@@ -2972,7 +2972,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.8.25.04.27.16;
+				CURRENT_PROJECT_VERSION = 1.1.8.25.04.28.22;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -3228,7 +3228,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.8.25.04.27.16;
+				CURRENT_PROJECT_VERSION = 1.1.8.25.04.28.22;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -454,6 +454,84 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
     }
+    //只替换 点播详情数据 ,看点 专辑 电商 不替换
+    func configDataArrayWithVodPlay5(vodPlayMdl : CNLiveVodPlayModel?){
+        //配置数据
+        let tempDataArray = NSMutableArray()
+        //单集 简介
+        var newVodPlayBlockListModel5:CNLiveVodPlayBlockListListModel?
+        if let vodPlayModel = vodPlayMdl{//单集有值-简介
+            for (_,mdl) in vodPlayModel.blockList.enumerated(){
+                if mdl.type == "5"{//点播详情数据
+                    newVodPlayBlockListModel5 = mdl.list.first
+                }
+            }
+        }
+        if let vodPlayModel = self.vodPlayModel{//单集有值-简介
+            for (_,mdl) in vodPlayModel.blockList.enumerated(){
+                if mdl.type == "5"{//点播详情数据
+                    //CNLiveVodPlayBlockListModel
+                    mdl.list[0] = newVodPlayBlockListModel5 ?? CNLiveVodPlayBlockListListModel()
+                    tempDataArray.add(mdl)
+                    self.vodPlayBlockListList5Model = newVodPlayBlockListModel5//mdl.list.first
+                }
+            }
+        }
+        //专辑-简介
+        if let vodAlbumListBaseModel = self.vodAlbumListBaseModel{//专辑有值-专辑列表
+            if let mdl = vodAlbumListBaseModel.list.first{
+                if let msgModel = mdl.vodAlbumMsgModel{
+                    let tempArr = NSMutableArray(array: tempDataArray as! [Any])
+                    if let vodMdl = tempArr.firstObject as? CNLiveVodPlayBlockListModel{
+                        for firMdl in vodMdl.list{
+                            firMdl.title = msgModel.albumName
+                            firMdl.desc = msgModel.desc
+                        }
+                        tempDataArray.removeAllObjects()
+                        tempDataArray.add(vodMdl)
+                    }
+                    
+                }
+            }
+        }
+        //专辑有值-专辑列表
+        if let vodAlbumListBaseModel = self.vodAlbumListBaseModel{//专辑有值-专辑列表
+            tempDataArray.add(vodAlbumListBaseModel)
+            self.albumListArr = NSMutableArray(array: vodAlbumListBaseModel.list)
+        }
+        //看点
+        ///**blockList.type 1/2/3/4/5  商品入口/片花资讯/活动推荐/相关推荐/点播详情 */
+        if let vodPlayModel = self.vodPlayModel{//单集有值-简介
+            for (_,mdl) in vodPlayModel.blockList.enumerated(){
+                if mdl.type == "2"{//看点list数据
+                    //CNLiveVodPlayBlockListModel
+                    tempDataArray.add(mdl)
+                    self.kanDianListArr = NSMutableArray(array: mdl.list)
+                }
+            }
+        }
+        //商品
+        if let vodPlayModel = self.vodPlayModel{//单集有值
+            
+            if vodPlayModel.goodsJson.count > 0{
+                let goodMdls = jsonArrayToModel(vodPlayModel.goodsJson, CNLiveVodPlayShopModel.self)
+                if goodMdls.count > 0{//CNLiveVodPlayModel [CNLiveVodPlayShopModel]
+                    //有商品
+                    tempDataArray.add(goodMdls)
+                }else{
+                    //没商品
+                    self.getGoodBlockContents()
+                }
+            }else{
+                //没商品
+                self.getGoodBlockContents()
+            }
+        }
+        
+        self.dataArray = NSMutableArray(array: tempDataArray)
+
+    }
+    
     func setupNewUI(model:CNLiveDownSlideContentsModel){
     }
@@ -1812,35 +1890,52 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
     }
+    // MARK: -点赞/收藏 刷新数据 不刷新看点列表 专辑列表
+    func getVodPlayApi(contentId:String){
+        //play接口刷新 看点和电商  1350755
+        showLoading(message: "")
+        CNLiveDownSlideTool.getVodPlayApi(contentId: contentId) {[weak self] result, status in
+            guard let self = self else { return }
+            if status == .success{
+                if let vodPlayModel = result as? CNLiveVodPlayModel{
+                    self.configDataArrayWithVodPlay5(vodPlayMdl: vodPlayModel)
+                    self.tableView.reloadData()
+                }
+            }
+        }
+    }
     func vodSupport(vodPlayBlockListListModel:CNLiveVodPlayBlockListListModel,isLiked:Bool,favoriteNum:Int){
         if metaAppDelegate.isLogin{
             CNLiveVodPlayViewModel.vodSupport(contentId: vodPlayBlockListListModel.pid, support: isLiked) {[weak self] result, status in
                 guard let self = self else { return }
                 if status == .success{
-                    if let vodPlayBlockListModel = self.dataArray[0] as? CNLiveVodPlayBlockListModel{
-                        if vodPlayBlockListModel.type == "5"{//简介
-                            if let model = vodPlayBlockListModel.list.first{
-                                model.liked = isLiked
-                                model.likesNum = favoriteNum
-                                self.dataArray.replaceObject(at: 0, with: vodPlayBlockListModel)
-                            }
-                            
-                        }
-                    }
-                    self.tableView.reloadRow(at: IndexPath(row: 0, section: 0), with: .none)
+                    self.getVodPlayApi(contentId: self.contentId.count>0 ? self.contentId : vodPlayBlockListListModel.contentId)
+//                    if let vodPlayBlockListModel = self.dataArray[0] as? CNLiveVodPlayBlockListModel{
+//                        if vodPlayBlockListModel.type == "5"{//简介
+//                            if let model = vodPlayBlockListModel.list.first{
+//                                model.liked = isLiked
+//                                model.likesNum = favoriteNum
+//                                self.dataArray.replaceObject(at: 0, with: vodPlayBlockListModel)
+//                            }
+//                            
+//                        }
+//                    }
+//                    self.tableView.reloadRow(at: IndexPath(row: 0, section: 0), with: .none)
                 }
             }
         }else{
             metaAppDelegate.pushLoginVC()
         }
     }
+    
     func vodCollection(vodPlayBlockListListModel:CNLiveVodPlayBlockListListModel,isCollectioned:Bool){
         if metaAppDelegate.isLogin{
             let type = isCollectioned ? "1" : "2"
+            showLoading(message: "")
             CNLiveVodPlayViewModel.vodCollection(type: type, vodPlayBlockListListModel: vodPlayBlockListListModel) {[weak self] result, status in
                 guard let self = self else { return }
                 if status == .success{
-                    //不改数据了
+                    self.getVodPlayApi(contentId: self.contentId.count>0 ? self.contentId : vodPlayBlockListListModel.contentId)
                 }
             }
         }else{
@@ -210,28 +210,34 @@ class CNLiveVodIntroductionCell:UITableViewCell{
     @objc func likeBtnAction(){
         let vodMdl = self.vodPlayBlockListModel!.list.first!
-        let num = likeBtn.isSelected ? 1 : -1
-        var likeNum = 0//((vodMdl.likesNum+num) == -1) ? 0 : vodMdl.likesNum+num
-        if metaAppDelegate.isLogin{
-            likeNum = ((vodMdl.likesNum+num) == -1) ? 0 : vodMdl.likesNum+num
-            likeBtn.isSelected = likeBtn.isSelected ? false : true
-        }else{
-            likeNum = vodMdl.likesNum
-            likeBtn.isSelected = false
-        }
-        likeBtn.setTitle("\(likeNum)", for: .normal)
-        likeBtn.setTitle("\(likeNum)", for: .selected)
+        let isLike = !vodMdl.liked
+        
+//        let num = likeBtn.isSelected ? 1 : -1
+//        var likeNum = 0//((vodMdl.likesNum+num) == -1) ? 0 : vodMdl.likesNum+num
+//        if metaAppDelegate.isLogin{
+//            likeNum = ((vodMdl.likesNum+num) == -1) ? 0 : vodMdl.likesNum+num
+//            likeBtn.isSelected = likeBtn.isSelected ? false : true
+//        }else{
+//            likeNum = vodMdl.likesNum
+//            likeBtn.isSelected = false
+//        }
+//        print("1111111likeNum\(likeNum)")
+//        likeBtn.setTitle("\(likeNum)", for: .normal)
+//        likeBtn.setTitle("\(likeNum)", for: .selected)
+
+//        self.updateCellBlock?(false, likeBtn.isSelected,likeNum, false, "2",self.vodPlayBlockListModel!.list.first!)
+        self.updateCellBlock?(false, isLike,0, false, "2",self.vodPlayBlockListModel!.list.first!)
-        self.updateCellBlock?(false, likeBtn.isSelected,likeNum, false, "2",self.vodPlayBlockListModel!.list.first!)
     }
     @objc func collectionBtnAction(){
-        
-        if metaAppDelegate.isLogin{
-            collectionBtn.isSelected = collectionBtn.isSelected ? false : true
-        }else{
-            collectionBtn.isSelected = false
-        }
-        self.updateCellBlock?(false, false,0, true, "3",self.vodPlayBlockListModel!.list.first!)
+        let vodMdl = self.vodPlayBlockListModel!.list.first!
+        let isCollectioned = !vodMdl.collectioned
+//        if metaAppDelegate.isLogin{
+//            collectionBtn.isSelected = collectionBtn.isSelected ? false : true
+//        }else{
+//            collectionBtn.isSelected = false
+//        }
+        self.updateCellBlock?(false, false,0, isCollectioned, "3",self.vodPlayBlockListModel!.list.first!)
     }
     @objc func shareBtnAction(){
         self.updateCellBlock?(false, false,0, false, "4",self.vodPlayBlockListModel!.list.first!)
@@ -342,14 +342,13 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
                             NotificationCenter.default.post(name: Notification.Name.LoginManage.CNLiveLoginSuccessNotification, object: nil)
                             metaAppDelegate.isLogin = true
                             if self.navBackButton.isHidden{
-                                //未登录push过来的
+                                //退出登录后->登录
                                 let window = UIApplication.shared.delegate?.window
                                 window??.rootViewController = CNLiveBaseTabBarViewController.init()
                             }else{
-                                //发通知
+                                //未登录push过来的
                                 self.navigationController?.popViewController(animated: true)
                             }
-
                         }
                     }else{
                         let window = UIApplication.shared.delegate?.window
@@ -716,16 +716,44 @@ class CNLiveShortVideoCommentListTableViewCell: UITableViewCell , UITableViewDel
     @objc func longPressGestureRecognizerAction(gestureRecognizer: UIGestureRecognizer) {
         if gestureRecognizer.state == .began {
+            let commentModelUid = commentModel.uid
+            let uid = UserInfoManager.shared.userInfo.uid
+            let contentsid = contentSid
+            print("\(commentModelUid),\(uid),\(contentsid)")
             if commentModel.uid == UserInfoManager.shared.userInfo.uid || contentSid == UserInfoManager.shared.userInfo.uid {
-                AlertTool.systemAlert(title: "确认删除该条评论吗?", message: "", cancelTitle: "取消", confirmTitle: "确定") {[weak self] index in
+                AlertTool.systemActionSheet(title: "请选择", message: "", actionTitles: ["删除该条评论","举报"], cancelTitle: "取消") {[weak self] index in
                     guard let self = self else { return }
                     if index == 1 {
+                        //"删除该条评论"
                         showLoading(message: "")
                         CNLiveShortVideoViewModel.requestCommentDelete(videoId: self.videoId, commentId: self.commentModel.commentId!) {result, respStatue in
                             if respStatue == .success {
                                 self.deleteBlock(self.commentModel!)
                             }
                         }
+                    }else if index == 2 {
+                        //"举报"
+                        currentViewController()?.navigationController?.pushViewController(CNLiveInputFeedBackViewController.init(show_type: .problem), animated: true)
+                    }
+                }
+//                AlertTool.systemAlert(title: "确认删除该条评论吗?", message: "", cancelTitle: "取消", confirmTitle: "确定") {[weak self] index in
+//                    guard let self = self else { return }
+//                    if index == 1 {
+//                        showLoading(message: "")
+//                        CNLiveShortVideoViewModel.requestCommentDelete(videoId: self.videoId, commentId: self.commentModel.commentId!) {result, respStatue in
+//                            if respStatue == .success {
+//                                self.deleteBlock(self.commentModel!)
+//                            }
+//                        }
+//                    }
+//                }
+            }else{
+                //不是本人
+                AlertTool.systemActionSheet(title: "请选择", message: "", actionTitles: ["举报"], cancelTitle: "取消") {[weak self] index in
+                    guard let self = self else { return }
+                    if index == 1 {
+                        //"举报"
+                        currentViewController()?.navigationController?.pushViewController(CNLiveInputFeedBackViewController.init(show_type: .problem), animated: true)
                     }
                 }
             }
@@ -302,7 +302,14 @@ class CNLiveShortVideoViewModel: NSObject {
     ///   - reultShortVideoBlock: 返回
     static func requestCommentList(pid: String,page: NSInteger,reultShortVideoBlock: @escaping resultShortVideoBlock) {
         let param = NSMutableDictionary()
-        param.setValue("mc_\(pid)", forKey: "topicId")
+        var videoId = pid
+        let isContainMC = videoId.contains("mc_")
+        if isContainMC{
+            param.setValue("\(videoId)", forKey: "topicId")
+        }else{
+            param.setValue("mc_\(videoId)", forKey: "topicId")
+        }
+//        param.setValue("\(videoId)", forKey: "topicId")
         param.setValue("i", forKey: "plat")
         param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
@@ -351,7 +358,17 @@ class CNLiveShortVideoViewModel: NSObject {
     ///   - reultShortVideoBlock: 返回
     static func requestCommentWithSend(videoId: String, comment: String, isAuthor: Bool,reultShortVideoBlock: @escaping resultShortVideoBlock) {
         let param = NSMutableDictionary()
-        param.setValue("mc_\(videoId)", forKey: "topicId")
+        
+        var videoIdStr = videoId
+        let isContainMC = videoIdStr.contains("mc_")
+        if isContainMC{
+            param.setValue("\(videoIdStr)", forKey: "topicId")
+        }else{
+            param.setValue("mc_\(videoIdStr)", forKey: "topicId")
+        }
+//        param.setValue("\(videoIdStr)", forKey: "topicId")
+
+//        param.setValue("mc_\(videoId)", forKey: "topicId")
         param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
         param.setValue("i", forKey: "plat")
         param.setValue(comment.qmui_trim, forKey: "comment")
@@ -503,7 +520,13 @@ class CNLiveShortVideoViewModel: NSObject {
         let param = NSMutableDictionary()
         param.setValue(commentId, forKey: "commentId")
         param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
-        param.setValue("mc_\(videoId)", forKey: "topicId")
+//        param.setValue("mc_\(videoId)", forKey: "topicId")
+        let isContainMC = videoId.contains("mc_")
+        if isContainMC{
+            param.setValue("\(videoId)", forKey: "topicId")
+        }else{
+            param.setValue("mc_\(videoId)", forKey: "topicId")
+        }
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         let custom_param = NSMutableDictionary()
         custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")