优化点播详情页点击专辑或者看点刷新看点和相关推荐

“张旭”
1 parent c772e303
Showing 1 changed file with 99 additions and 99 deletions
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
@@ -352,7 +352,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             }
             self.isPlayAblumOrKandian = false
             self.kanDianIndex = seleIndex
-            self.kanDianOrAlbumChangeContentApi(contentId: vodPlayBlockListListModel.contentId, title: vodPlayBlockListListModel.title, isAlbum: isAblumVideo, activeId: vodPlayBlockListListModel.pid)
+            self.kanDianOrAlbumChangeContentApi(contentId: vodPlayBlockListListModel.contentId, title: vodPlayBlockListListModel.title, isAlbum: isAblumVideo, activeId: vodPlayBlockListListModel.pid, isRefreshPlayer:true )
         }
@@ -409,7 +409,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                 self.albumIndex = 0
                 self.kanDianIndex = -1
                 self.isPlayAblumOrKandian = true
-                self.kanDianOrAlbumChangeContentApi(contentId: self.vodPlayModel?.contentId ?? "", title: title, isAlbum: true, activeId: self.vodPlayModel?.contentId ?? "")
+                self.kanDianOrAlbumChangeContentApi(contentId: self.vodPlayModel?.contentId ?? "", title: title, isAlbum: true, activeId: self.vodPlayModel?.contentId ?? "", isRefreshPlayer: true)
                 self.player.allowOrentitaionRotation = true
             }else{
                 //没付费
@@ -556,7 +556,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                 if let albumModel = self.albumListArr[nextIdx] as? CNLiveVodAlbumListModel{
                     //播专辑列表下一条
                     self.contentId = albumModel.contentId
-                    self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: self.isAblumVideo, activeId: albumModel.activityId)
+                    self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: self.isAblumVideo, activeId: albumModel.activityId, isRefreshPlayer: true)
 //                    self.changeContentApi(vodModel: albumModel)
                 }
@@ -574,7 +574,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                     //播列表下一条
                     let isAblumVideo = (albumModel.album?.albumId.count ?? 0 > 0) ? true : false
 //                    if isAblumVideo{
-                    self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: isAblumVideo, activeId: albumModel.pid)
+                    self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: isAblumVideo, activeId: albumModel.pid, isRefreshPlayer: true)
 //                    }else{
 //                        self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: isAblumVideo, activeId: albumModel.pid)
 //                    }
@@ -659,74 +659,74 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
         self.player.stop()
     }
-    // MARK: - 专辑/看点 列表切换某集,只刷新播放器和点赞收藏
-    func kanDianOrAlbumChangeContentApi(contentId:String,title:String,isAlbum:Bool,activeId:String){
+    // MARK: - 专辑/看点 列表切换某集
+    func kanDianOrAlbumChangeContentApi(contentId:String,title:String,isAlbum:Bool,activeId:String, isRefreshPlayer: Bool){
 //        if isAlbum{
-            self.changeContentApi(activityId: activeId, title: title, contentId: contentId)
+        self.changeContentApi(activityId: activeId, title: title, contentId: contentId, isRefreshPlayer: isRefreshPlayer)
 //        }else{
 //            self.kanDianChangeContentApi(contentId: contentId, title: title)
 //        }
     }
     // MARK: - 看点列表切换某集 只刷新播放器和点赞收藏
-    func kanDianChangeContentApi(contentId:String,title:String){
-        self.isPlayAblumOrKandian = false
-        //刷新url
-        CNLiveHomePageViewModel.shared.getVodVideoURL(contentId: contentId) {[weak self] result, status in
-            guard let self = self else { return }
-            if status == .success
-            {
-                if let url = result as? String{
-                    self.playWithUrlAndTitle(url: url, title: title)
-                    self.url = URL(string: url)
-                }
-            }else{
-                
-            }
-        }
-
-        //play接口刷新 看点和电商
-        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.vodPlayModel = vodPlayModel
-                    //单集有值-简介
-                    var index = 0
-                    var isReplace = false
-                    var tempMdl:CNLiveVodPlayBlockListModel?
-                    for (idx,mdl) in self.dataArray.enumerated(){
-                        if var tempVodMdl = mdl as? CNLiveVodPlayBlockListModel{
-                            if tempVodMdl.type ==  "5"{//点播详情数据
-                                
-                                for (_,vodMdl) in vodPlayModel.blockList.enumerated(){
-                                    if vodMdl.type == "5"{
-                                        tempMdl = vodMdl
-                                        index = idx
-                                        isReplace = true
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    if isReplace{
-                        self.dataArray.replaceObject(at: index, with: tempMdl as Any)
-                    }else{}
-                    self.controlView.vodPlayModel = vodPlayModel
-                    self.configDataArray()
-                    self.tableView.reloadData()
-                }else{
-                    
-                }
-            }else{
-                
-            }
-        }
-
-    }
+//    func kanDianChangeContentApi(contentId:String,title:String){
+//        self.isPlayAblumOrKandian = false
+//        //刷新url
+//        CNLiveHomePageViewModel.shared.getVodVideoURL(contentId: contentId) {[weak self] result, status in
+//            guard let self = self else { return }
+//            if status == .success
+//            {
+//                if let url = result as? String{
+//                    self.playWithUrlAndTitle(url: url, title: title)
+//                    self.url = URL(string: url)
+//                }
+//            }else{
+//                
+//            }
+//        }
+//
+//        //play接口刷新 看点和电商
+//        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.vodPlayModel = vodPlayModel
+//                    //单集有值-简介
+//                    var index = 0
+//                    var isReplace = false
+//                    var tempMdl:CNLiveVodPlayBlockListModel?
+//                    for (idx,mdl) in self.dataArray.enumerated(){
+//                        if var tempVodMdl = mdl as? CNLiveVodPlayBlockListModel{
+//                            if tempVodMdl.type ==  "5"{//点播详情数据
+//                                
+//                                for (_,vodMdl) in vodPlayModel.blockList.enumerated(){
+//                                    if vodMdl.type == "5"{
+//                                        tempMdl = vodMdl
+//                                        index = idx
+//                                        isReplace = true
+//                                    }
+//                                }
+//                            }
+//                        }
+//                    }
+//                    if isReplace{
+//                        self.dataArray.replaceObject(at: index, with: tempMdl as Any)
+//                    }else{}
+//                    self.controlView.vodPlayModel = vodPlayModel
+//                    self.configDataArray()
+//                    self.tableView.reloadData()
+//                }else{
+//                    
+//                }
+//            }else{
+//                
+//            }
+//        }
+//
+//    }
-    // MARK: -专辑列表切换某集 ,刷新看点和电商
-    func changeContentApi(activityId:String,title:String,contentId:String){
+    // MARK: -专辑/看点 列表切换某集 ,刷新看点和电商
+    func changeContentApi(activityId:String,title:String,contentId:String,isRefreshPlayer:Bool){
 //        self.isPlayAblumOrKandian = true
         //play接口刷新 看点和电商  1350755
@@ -773,16 +773,18 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                     self.controlView.vodPlayModel = tempVodPlayModel
                     //刷新url 1955_71512cfbcd5b497580732b48e26d16d6
-                    CNLiveHomePageViewModel.shared.getVodVideoURL(contentId: activityId) {[weak self] result, status in
-                        guard let self = self else { return }
-                        if status == .success
-                        {
-                            if let url = result as? String{
-                                self.playWithUrlAndTitle(url: url, title: title)
-                                self.url = URL(string: url)
+                    if isRefreshPlayer{
+                        CNLiveHomePageViewModel.shared.getVodVideoURL(contentId: activityId) {[weak self] result, status in
+                            guard let self = self else { return }
+                            if status == .success
+                            {
+                                if let url = result as? String{
+                                    self.playWithUrlAndTitle(url: url, title: title)
+                                    self.url = URL(string: url)
+                                }
+                            }else{
+                                
                             }
-                        }else{
-                            
                         }
                     }
@@ -876,10 +878,12 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                 }
                 cell.currSeleIdx = self.kanDianIndex//-1
                 cell.vodPlayBlockListModel = vodPlayBlockListModel
+                ////看点展开
                 cell.expandBlock = { [weak self] model in
                     guard let self = self else { return }
                     self.trailersCellDetailBtnAction(vodPlayBlockListModel: model)
                 }
+                ////看点点击
                 cell.selectBlock = { [weak self] model,index,kanDianListArr in
                     guard let self = self else { return }
                     //点击看点
@@ -927,7 +931,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                         //kanDianListArr cnLivevodPlayBlocjListlistModel
                         self.controlView.xuanjiBgView.currSeleIdx = index
                         self.controlView.xuanjiBgView.kanDianListArr = kanDianListArr
-                        self.kanDianOrAlbumChangeContentApi(contentId: model.contentId, title: model.title, isAlbum: isAblumVideo, activeId: model.pid)
+                        self.kanDianOrAlbumChangeContentApi(contentId: model.contentId, title: model.title, isAlbum: isAblumVideo, activeId: model.pid, isRefreshPlayer:true )
                         self.player.allowOrentitaionRotation = true
                     }else{
                         //没付费
@@ -939,16 +943,23 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                         self.controlView.vodPlayModel = vodMdl
                         self.controlView.payBgView.isHidden = false
                         self.controlView.payBgView.payBtn.setTitle("\(yuanString)元购买本集内容", for: .normal)
+                        
+                        self.contentId = model.contentId
+                        let isAblumVideo = (model.album?.albumId.count ?? 0 > 0) ? true : false
+                        self.albumIndex = -1
+                        self.kanDianIndex = index
+                        self.kanDianListArr = kanDianListArr
+                        self.isPlayAblumOrKandian = false
+
                         //成功用pay参数 刷新页面
                         self.payVodProductModel = model.product
                         self.payContentId = model.contentId
                         self.payIndex = -1
-                        self.kanDianIndex = index
-                        self.isPlayAblumOrKandian = false
                         self.payTitle = model.title
                         self.payIsAlbum = false
                         self.payActivityId = model.pid
                         self.player.allowOrentitaionRotation = false
+                        self.kanDianOrAlbumChangeContentApi(contentId: model.contentId, title: model.title, isAlbum: isAblumVideo, activeId: model.pid, isRefreshPlayer:false )
                     }
                 }
                 return cell
@@ -974,6 +985,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
 //                self.controlView.xuanjiBgView.kanDianListArr = self.kanDianListArr
                 //CNLiveVodPlayblockListListModel
             }
+            //点击专辑
             cell.selectBlock = {[weak self] vodModel, index ,albumListArr in
                 guard let self = self else { return }
                 self.player.currentPlayerManager.pause()
@@ -1006,24 +1018,6 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                     self.controlView.payBgView.isHidden = true
                     isPayZhuanJi = true
                 }
-
-                
-//                if vodModel.product?.productType == "2" || vodModel.product?.productType == "5"{//付费
-//
-//                }else{
-//                    if vodModel.product?.check == true {
-//                        
-//                    } else {
-//                        if vodModel.product?.productType == "4" {
-//                            //这里表示可以进行试听
-//                            self.controlView.payBgView.isHidden = true
-//                            isPayZhuanJi = true
-//                        } else {
-//                            self.controlView.payBgView.isHidden = true
-//                            isPayZhuanJi = true
-//                        }
-//                    }
-//                }
                 if isPayZhuanJi{
                     //已经付费
@@ -1033,7 +1027,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                     self.albumIndex = index
                     self.kanDianIndex = -1
                     self.isPlayAblumOrKandian = true
-                    self.kanDianOrAlbumChangeContentApi(contentId: vodModel.contentId, title: vodModel.title, isAlbum: true, activeId: vodModel.activityId)
+                    self.kanDianOrAlbumChangeContentApi(contentId: vodModel.contentId, title: vodModel.title, isAlbum: true, activeId: vodModel.activityId, isRefreshPlayer: true)
                     self.player.allowOrentitaionRotation = true
                 }else{
                     //没付费
@@ -1045,18 +1039,24 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                     self.controlView.vodPlayModel = vodMdl
                     self.controlView.payBgView.isHidden = false
                     self.controlView.payBgView.payBtn.setTitle("\(yuanString)元购买本专辑", for: .normal)
+                    
+                    self.contentId = vodModel.contentId
+                    self.albumListArr = albumListArr
+                    self.albumIndex = index
+                    self.kanDianIndex = -1
+                    self.isPlayAblumOrKandian = true
+                    
                     //成功用pay参数 刷新页面
                     self.payVodAlbumListModel = vodModel
                     self.payAid = vodModel.albumId//.contentId
                     self.payContentId = vodModel.contentId
                     self.payAlbumListArr = albumListArr
                     self.payIndex = index
-                    self.kanDianIndex = -1
-                    self.isPlayAblumOrKandian = true
                     self.payTitle = vodModel.title
                     self.payIsAlbum = true
                     self.payActivityId = vodModel.activityId
                     self.player.allowOrentitaionRotation = false
+                    self.kanDianOrAlbumChangeContentApi(contentId: vodModel.contentId, title: vodModel.title, isAlbum: true, activeId: vodModel.activityId, isRefreshPlayer: false)
                 }
             }
             return cell
@@ -1225,7 +1225,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                 //kanDianListArr cnLivevodPlayBlocjListlistModel
                 self.controlView.xuanjiBgView.currSeleIdx = seleIdx
                 self.controlView.xuanjiBgView.kanDianListArr = kanDianListArr
-                self.kanDianOrAlbumChangeContentApi(contentId: model.contentId, title: model.title, isAlbum: isAblumVideo, activeId: model.pid)
+                self.kanDianOrAlbumChangeContentApi(contentId: model.contentId, title: model.title, isAlbum: isAblumVideo, activeId: model.pid, isRefreshPlayer:true )
                 self.player.allowOrentitaionRotation = true
             }else{
                 //没付费
@@ -1268,7 +1268,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
 //            self.controlView.xuanjiBgView.currSeleIdx = seleIdx
 //            self.controlView.xuanjiBgView.kanDianListArr = kanDianListArr
 //
-//            self.kanDianOrAlbumChangeContentApi(contentId: model.contentId, title: model.title, isAlbum: isAblumVideo, activeId: model.pid)
+//            self.kanDianOrAlbumChangeContentApi(contentId: model.contentId, title: model.title, isAlbum: isAblumVideo, activeId: model.pid, isRefreshPlayer: )
         }
     }
     // MARK: - 简介cell点击事件