抽取公共方法---点击专辑/看点

“张旭”
1 parent 3a78176b
Showing 3 changed files with 324 additions and 176 deletions
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/CNLiveVodAlbumListCell.swift
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/HengPing/CNLiveVodLandscapeXuanjiView.swift
@@ -401,46 +401,61 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             // 将结果转换为字符串
             yuanString = String(yuan)
-            if isPayZhuanJi{
-                //已经付费
-                self.controlView.payBgView.isHidden = true
-                self.contentId = self.vodPlayModel?.contentId ?? ""
-                self.albumListArr = albumListArr
-                self.albumIndex = 0
-                self.kanDianIndex = -1
-                self.isPlayAblumOrKandian = true
-                self.kanDianOrAlbumChangeContentApi(contentId: self.vodPlayModel?.contentId ?? "", title: title, isAlbum: true, activeId: self.vodPlayModel?.contentId ?? "", isRefreshPlayer: true)
-                self.player.allowOrentitaionRotation = true
-            }else{
-                //没付费
-                //显示付费页面
-                let vodMdl = CNLiveVodPlayModel()
-                vodMdl.product = self.vodPlayModel?.product
-                vodMdl.contentId = self.vodPlayModel?.contentId ?? ""
-                vodMdl.model = self.vodPlayModel?.model ?? ""
-                self.controlView.vodPlayModel = vodMdl
-                self.controlView.payBgView.isHidden = false
-                self.controlView.payBgView.payBtn.setTitle("\(yuanString)元购买本专辑", for: .normal)
-                //成功用pay参数 刷新页面
-                self.albumListArr = NSMutableArray(array: self.vodAlbumListBaseModel?.list ?? [CNLiveVodAlbumListModel]())
-                if self.albumListArr.count > 0{
-                    if let vodAlbumListModel = self.albumListArr[0] as? CNLiveVodAlbumListModel{
-                        self.payVodAlbumListModel = vodAlbumListModel
-                        self.payAid = vodAlbumListModel.albumId//.contentId
-                        self.payContentId = vodAlbumListModel.contentId
-                        self.payAlbumListArr = albumListArr
-                        self.payIndex = 0
-                        self.kanDianIndex = -1
-                        self.isPlayAblumOrKandian = true
-                        self.payTitle = title
-                        self.payIsAlbum = true
-                        self.payActivityId = vodAlbumListModel.activityId
-                        self.player.allowOrentitaionRotation = false
-                    }
+            //true当前播放的专辑 false看点
+//            let isAblumVideo = false// (model.album?.albumId.count ?? 0 > 0) ? true : false
+            let isAblumVideo = (self.vodPlayModel?.album?.albumId.count ?? 0 > 0) ? true : false
+            var vodAlbumListModel:CNLiveVodAlbumListModel?
+            if self.albumListArr.count > 0{
+                if let vodAlbumListMdl = self.albumListArr[0] as? CNLiveVodAlbumListModel{
+                    vodAlbumListModel = vodAlbumListMdl
                 }
-                
             }
+            self.selectKanDianOrAlbum(isPayZhuanJi: isPayZhuanJi, mdlProduct: self.vodPlayModel?.product, mdlContentId: self.vodPlayModel?.contentId ?? "", isAblumVideo: isAblumVideo, albumSelectIndex: 0, albumListArray: albumListArr, kanDianSelectIndex: -1, kanDianListArray: NSMutableArray(), isPlayAblumOrKandian: isAblumVideo, xuanjiBgViewCurrSeleIdx: 0, xuanjiBgViewKanDianListArr: NSMutableArray(), modelTitle: title, mdlActiveId: self.vodPlayModel?.contentId ?? "", mdlModel: self.vodPlayModel?.model ?? "", yuanString: yuanString, payVodAlbumListModel: vodAlbumListModel, vodAlbumListBaseModel: self.vodAlbumListBaseModel)
+//            if isPayZhuanJi{
+//                //已经付费
+//                self.controlView.payBgView.isHidden = true
+//                self.contentId = self.vodPlayModel?.contentId ?? ""
+//                self.albumListArr = albumListArr
+//                self.albumIndex = 0
+//                self.kanDianIndex = -1
+//                self.isPlayAblumOrKandian = true
+//                self.kanDianOrAlbumChangeContentApi(contentId: self.vodPlayModel?.contentId ?? "", title: title, isAlbum: true, activeId: self.vodPlayModel?.contentId ?? "", isRefreshPlayer: true)
+//                self.player.allowOrentitaionRotation = true
+//            }else{
+//                //没付费
+//                //显示付费页面
+//                let vodMdl = CNLiveVodPlayModel()
+//                vodMdl.product = self.vodPlayModel?.product
+//                vodMdl.contentId = self.vodPlayModel?.contentId ?? ""
+//                vodMdl.model = self.vodPlayModel?.model ?? ""
+//                self.controlView.vodPlayModel = vodMdl
+//                self.controlView.payBgView.isHidden = false
+//                self.controlView.payBgView.payBtn.setTitle("\(yuanString)元购买本专辑", for: .normal)
+//                
+//                //成功用pay参数 刷新页面
+//                self.albumListArr = NSMutableArray(array: self.vodAlbumListBaseModel?.list ?? [CNLiveVodAlbumListModel]())
+//                if self.albumListArr.count > 0{
+//                    if let vodAlbumListModel = self.albumListArr[0] as? CNLiveVodAlbumListModel{
+//                        self.payVodAlbumListModel = vodAlbumListModel
+//                        self.payAid = vodAlbumListModel.albumId//.contentId
+//                        self.payContentId = vodAlbumListModel.contentId
+//                        self.payAlbumListArr = albumListArr
+//                        self.payIndex = 0
+//                        self.payTitle = title
+//                        self.payIsAlbum = true
+//                        self.payActivityId = vodAlbumListModel.activityId
+//                        self.player.allowOrentitaionRotation = false
+//                        
+//                        self.contentId = self.vodPlayModel?.contentId ?? ""
+//                        self.albumListArr = albumListArr
+//                        self.albumIndex = 0
+//                        self.kanDianIndex = -1
+//                        self.isPlayAblumOrKandian = true
+//                        self.kanDianOrAlbumChangeContentApi(contentId: self.vodPlayModel?.contentId ?? "", title: title, isAlbum: true, activeId: self.vodPlayModel?.contentId ?? "", isRefreshPlayer: false)
+//                    }
+//                }
+//            }
         }else{
             //免费
             self.controlView.payBgView.isHidden = true
@@ -556,7 +571,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, isRefreshPlayer: true)
+                    self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: true, activeId: albumModel.activityId, isRefreshPlayer: true)
 //                    self.changeContentApi(vodModel: albumModel)
                 }
@@ -572,7 +587,9 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                 self.albumIndex = -1
                 if let albumModel = self.kanDianListArr[nextIdx] as? CNLiveVodPlayBlockListListModel{
                     //播列表下一条
-                    let isAblumVideo = (albumModel.album?.albumId.count ?? 0 > 0) ? true : false
+                    //true当前播放的专辑 false看点
+                    let isAblumVideo = false// (model.album?.albumId.count ?? 0 > 0) ? true : false
+//                    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, isRefreshPlayer: true)
 //                    }else{
@@ -727,8 +744,6 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
     // MARK: -专辑/看点 列表切换某集 ,刷新看点和电商
     func changeContentApi(activityId:String,title:String,contentId:String,isRefreshPlayer:Bool){
-//        self.isPlayAblumOrKandian = true
-        
         //play接口刷新 看点和电商  1350755
         CNLiveDownSlideTool.getVodPlayApi(contentId: contentId) {[weak self] result, status in
             guard let self = self else { return }
@@ -915,52 +930,63 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                         self.controlView.payBgView.isHidden = true
                         isPayZhuanJi = true
                     }
-                                        
-                    if isPayZhuanJi{
-                        //已经付费
-                        self.controlView.payBgView.isHidden = true
-
-                        self.contentId = model.contentId
-                        let isAblumVideo = (model.album?.albumId.count ?? 0 > 0) ? true : false
-                        self.albumIndex = -1
-                        self.kanDianIndex = index
-                        self.kanDianListArr = kanDianListArr
-                        //只更新 此视频的长id,换url(不管是不是专辑)
-                        self.isPlayAblumOrKandian = false
-                        //更新选集-看点列表
-                        //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, isRefreshPlayer:true )
-                        self.player.allowOrentitaionRotation = true
-                    }else{
-                        //没付费
-                        //显示付费页面
-                        let vodMdl = CNLiveVodPlayModel()
-                        vodMdl.product = model.product
-                        vodMdl.contentId = model.contentId
-                        vodMdl.model = model.model
-                        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.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 )
+                    
+                    //true当前播放的专辑 false看点
+                    let isAblumVideo = false// (model.album?.albumId.count ?? 0 > 0) ? true : false
+                    var vodAlbumListModel:CNLiveVodAlbumListModel?
+                    if self.albumListArr.count > 0{
+                        if let vodAlbumListMdl = self.albumListArr[0] as? CNLiveVodAlbumListModel{
+                            vodAlbumListModel = vodAlbumListMdl
+                        }
                     }
+                    self.selectKanDianOrAlbum(isPayZhuanJi: isPayZhuanJi, mdlProduct: model.product, mdlContentId: model.contentId, isAblumVideo: isAblumVideo, albumSelectIndex: -1, albumListArray: NSMutableArray(), kanDianSelectIndex: index, kanDianListArray: kanDianListArr, isPlayAblumOrKandian: isAblumVideo, xuanjiBgViewCurrSeleIdx: index, xuanjiBgViewKanDianListArr: kanDianListArr, modelTitle: model.title, mdlActiveId: model.pid, mdlModel: model.model, yuanString: yuanString, payVodAlbumListModel: vodAlbumListModel, vodAlbumListBaseModel: nil)
+
+                    
+//                    if isPayZhuanJi{
+//                        //已经付费
+//                        self.controlView.payBgView.isHidden = true
+//
+//                        self.contentId = model.contentId
+//                        let isAblumVideo = (model.album?.albumId.count ?? 0 > 0) ? true : false
+//                        self.albumIndex = -1
+//                        self.kanDianIndex = index
+//                        self.kanDianListArr = kanDianListArr
+//                        //只更新 此视频的长id,换url(不管是不是专辑)
+//                        self.isPlayAblumOrKandian = false
+//                        //更新选集-看点列表
+//                        //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, isRefreshPlayer:true )
+//                        self.player.allowOrentitaionRotation = true
+//                    }else{
+//                        //没付费
+//                        //显示付费页面
+//                        let vodMdl = CNLiveVodPlayModel()
+//                        vodMdl.product = model.product
+//                        vodMdl.contentId = model.contentId
+//                        vodMdl.model = model.model
+//                        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.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
             }else{
@@ -986,12 +1012,11 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                 //CNLiveVodPlayblockListListModel
             }
             //点击专辑
-            cell.selectBlock = {[weak self] vodModel, index ,albumListArr in
+            cell.selectBlock = {[weak self] vodModel, index ,albumListArr,vodAlbumListBaseModel in
                 guard let self = self else { return }
                 self.player.currentPlayerManager.pause()
                 isPayZhuanJi = false//是否付过费
                 var yuanString = "1"
-                
                 let isPaid = CNLivePlayerTool.isPaid(product: vodModel.product)
                 if isPaid{
                     //需要付费
@@ -1019,45 +1044,56 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                     isPayZhuanJi = true
                 }
-                if isPayZhuanJi{
-                    //已经付费
-                    self.controlView.payBgView.isHidden = true
-                    self.contentId = vodModel.contentId
-                    self.albumListArr = albumListArr
-                    self.albumIndex = index
-                    self.kanDianIndex = -1
-                    self.isPlayAblumOrKandian = true
-                    self.kanDianOrAlbumChangeContentApi(contentId: vodModel.contentId, title: vodModel.title, isAlbum: true, activeId: vodModel.activityId, isRefreshPlayer: true)
-                    self.player.allowOrentitaionRotation = true
-                }else{
-                    //没付费
-                    //显示付费页面
-                    let vodMdl = CNLiveVodPlayModel()
-                    vodMdl.product = vodModel.product
-                    vodMdl.contentId = vodModel.contentId
-                    vodMdl.model = vodModel.modelId
-                    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.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)
+                //true当前播放的专辑 false看点
+                let isAblumVideo = true// (model.album?.albumId.count ?? 0 > 0) ? true : false
+//                let isAblumVideo = (vodModel.albumId.count > 0) ? true : false
+                var vodAlbumListModel:CNLiveVodAlbumListModel?
+                if self.albumListArr.count > 0{
+                    if let vodAlbumListMdl = self.albumListArr[0] as? CNLiveVodAlbumListModel{
+                        vodAlbumListModel = vodAlbumListMdl
+                    }
                 }
+                self.selectKanDianOrAlbum(isPayZhuanJi: isPayZhuanJi, mdlProduct: vodModel.product, mdlContentId: vodModel.contentId, isAblumVideo: isAblumVideo, albumSelectIndex: index, albumListArray: albumListArr, kanDianSelectIndex: -1, kanDianListArray: NSMutableArray(), isPlayAblumOrKandian: isAblumVideo, xuanjiBgViewCurrSeleIdx: 0, xuanjiBgViewKanDianListArr: NSMutableArray(), modelTitle: vodModel.title, mdlActiveId: vodModel.contentId, mdlModel: vodModel.modelId, yuanString: yuanString, payVodAlbumListModel: vodAlbumListModel, vodAlbumListBaseModel: vodAlbumListBaseModel)
+
+//                if isPayZhuanJi{
+//                    //已经付费
+//                    self.controlView.payBgView.isHidden = true
+//                    self.contentId = vodModel.contentId
+//                    self.albumListArr = albumListArr
+//                    self.albumIndex = index
+//                    self.kanDianIndex = -1
+//                    self.isPlayAblumOrKandian = true
+//                    self.kanDianOrAlbumChangeContentApi(contentId: vodModel.contentId, title: vodModel.title, isAlbum: true, activeId: vodModel.activityId, isRefreshPlayer: true)
+//                    self.player.allowOrentitaionRotation = true
+//                }else{
+//                    //没付费
+//                    //显示付费页面
+//                    let vodMdl = CNLiveVodPlayModel()
+//                    vodMdl.product = vodModel.product
+//                    vodMdl.contentId = vodModel.contentId
+//                    vodMdl.model = vodModel.modelId
+//                    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.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
         }else if let vodPlayShopModels = self.dataArray[indexPath.row] as? [CNLiveVodPlayShopModel]{
@@ -1165,6 +1201,107 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
         }
     }
+    // MARK: - 点击 看点/专辑
+    //isAblumVideo true:播放或选择的专辑 false:看点
+    func selectKanDianOrAlbum(isPayZhuanJi:Bool,mdlProduct:CNLiveAlbumProductModel?,mdlContentId:String,isAblumVideo:Bool,albumSelectIndex:Int,albumListArray:NSMutableArray,kanDianSelectIndex:Int,kanDianListArray: NSMutableArray,isPlayAblumOrKandian:Bool,xuanjiBgViewCurrSeleIdx:Int,xuanjiBgViewKanDianListArr:NSMutableArray,modelTitle:String,mdlActiveId:String,mdlModel:String,yuanString:String,payVodAlbumListModel:CNLiveVodAlbumListModel?,vodAlbumListBaseModel : CNLiveVodAlbumListBaseModel?){
+        
+        if isPayZhuanJi{
+            //已付费
+            if isAblumVideo{
+                //点击专辑
+                self.controlView.payBgView.isHidden = isPayZhuanJi
+                self.contentId = mdlContentId
+                self.albumListArr = albumListArray
+                self.albumIndex = albumSelectIndex
+                self.kanDianIndex = kanDianSelectIndex
+                self.isPlayAblumOrKandian = isPlayAblumOrKandian
+                //更新选集-专辑列表
+                self.controlView.xuanjiBgView.currSeleIdx = xuanjiBgViewCurrSeleIdx
+                self.controlView.xuanjiBgView.vodAlbumListBaseModel = vodAlbumListBaseModel
+                self.kanDianOrAlbumChangeContentApi(contentId: mdlContentId, title: modelTitle, isAlbum: isAblumVideo, activeId: mdlActiveId, isRefreshPlayer: isPayZhuanJi)
+                self.player.allowOrentitaionRotation = isPayZhuanJi
+            }else{
+                //点击看点
+                self.controlView.payBgView.isHidden = isPayZhuanJi
+                self.contentId = mdlContentId
+                self.albumIndex = albumSelectIndex
+                self.albumListArr = albumListArray
+                self.kanDianIndex = kanDianSelectIndex
+                self.kanDianListArr = kanDianListArray
+                //只更新 此视频的长id,换url(不管是不是专辑)
+                self.isPlayAblumOrKandian = isPlayAblumOrKandian
+                //更新选集-看点列表
+                self.controlView.xuanjiBgView.currSeleIdx = xuanjiBgViewCurrSeleIdx
+                self.controlView.xuanjiBgView.kanDianListArr = kanDianListArray
+                self.kanDianOrAlbumChangeContentApi(contentId: mdlContentId, title: modelTitle, isAlbum: isAblumVideo, activeId: mdlActiveId, isRefreshPlayer:isPayZhuanJi)
+                self.player.allowOrentitaionRotation = isPayZhuanJi
+            }
+        }else{
+            //未付费
+            if isAblumVideo{
+                //点击专辑
+                //显示付费页面
+                let vodMdl = CNLiveVodPlayModel()
+                vodMdl.product = mdlProduct
+                vodMdl.contentId = mdlContentId
+                vodMdl.model = mdlModel
+                self.controlView.vodPlayModel = vodMdl
+                self.controlView.payBgView.isHidden = isPayZhuanJi
+                self.controlView.payBgView.payBtn.setTitle("\(yuanString)元购买本专辑", for: .normal)
+                
+                self.contentId = mdlContentId
+                self.albumListArr = albumListArray
+                self.albumIndex = albumSelectIndex
+                self.kanDianIndex = kanDianSelectIndex
+                self.isPlayAblumOrKandian = isPlayAblumOrKandian
+                
+                //成功用pay参数 刷新页面
+                self.payVodAlbumListModel = payVodAlbumListModel
+                self.payAid = payVodAlbumListModel?.albumId ?? ""
+                self.payContentId = payVodAlbumListModel?.contentId ?? ""
+                self.payAlbumListArr = albumListArray
+                self.payIndex = albumSelectIndex
+                self.payTitle = modelTitle
+                self.payIsAlbum = isAblumVideo
+                self.payActivityId = mdlActiveId
+                self.player.allowOrentitaionRotation = isPayZhuanJi
+                
+                //更新选集-专辑列表
+                self.controlView.xuanjiBgView.currSeleIdx = xuanjiBgViewCurrSeleIdx
+                self.controlView.xuanjiBgView.vodAlbumListBaseModel = vodAlbumListBaseModel
+                self.kanDianOrAlbumChangeContentApi(contentId: mdlContentId, title: modelTitle, isAlbum: isAblumVideo, activeId: mdlActiveId, isRefreshPlayer: isPayZhuanJi)
+            }else{
+                //点击看点
+                let vodMdl = CNLiveVodPlayModel()
+                vodMdl.product = mdlProduct
+                vodMdl.contentId = mdlContentId
+                vodMdl.model = mdlModel
+                self.controlView.vodPlayModel = vodMdl
+                self.controlView.payBgView.isHidden = false
+                self.controlView.payBgView.payBtn.setTitle("\(yuanString)元购买本集内容", for: .normal)
+                
+                self.contentId = mdlContentId
+                self.albumIndex = albumSelectIndex
+                self.kanDianIndex = kanDianSelectIndex
+                self.kanDianListArr = kanDianListArray
+                self.isPlayAblumOrKandian = isPlayAblumOrKandian
+
+                //成功用pay参数 刷新页面
+                self.payVodProductModel = mdlProduct
+                self.payContentId = mdlContentId
+                self.payIndex = albumSelectIndex
+                self.payTitle = modelTitle
+                self.payIsAlbum = isAblumVideo
+                self.payActivityId = mdlActiveId
+                self.player.allowOrentitaionRotation = isPayZhuanJi
+                //更新选集-看点列表
+                self.controlView.xuanjiBgView.currSeleIdx = xuanjiBgViewCurrSeleIdx
+                self.controlView.xuanjiBgView.kanDianListArr = kanDianListArray
+                self.kanDianOrAlbumChangeContentApi(contentId: mdlContentId, title: modelTitle, isAlbum: isAblumVideo, activeId: mdlActiveId, isRefreshPlayer:isPayZhuanJi)
+            }
+        }
+    }
+    
     // MARK: - 看点cell展开
     func trailersCellDetailBtnAction(vodPlayBlockListModel:CNLiveVodPlayBlockListModel) {
         bottomCommentShowContainView.isHidden = false
@@ -1209,46 +1346,61 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                 self.controlView.payBgView.isHidden = true
                 isPayZhuanJi = true
             }
-                                
-            if isPayZhuanJi{
-                //已经付费
-                self.controlView.payBgView.isHidden = true
-
-                self.contentId = model.contentId
-                let isAblumVideo = (model.album?.albumId.count ?? 0 > 0) ? true : false
-                self.albumIndex = -1
-                self.kanDianIndex = seleIdx
-                self.kanDianListArr = kanDianListArr
-                //只更新 此视频的长id,换url(不管是不是专辑)
-                self.isPlayAblumOrKandian = false
-                //更新选集-看点列表
-                //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, isRefreshPlayer:true )
-                self.player.allowOrentitaionRotation = true
-            }else{
-                //没付费
-                //显示付费页面
-                let vodMdl = CNLiveVodPlayModel()
-                vodMdl.product = model.product
-                vodMdl.contentId = model.contentId
-                vodMdl.model = model.model
-                self.controlView.vodPlayModel = vodMdl
-                self.controlView.payBgView.isHidden = false
-                self.controlView.payBgView.payBtn.setTitle("\(yuanString)元购买本集内容", for: .normal)
-                //成功用pay参数 刷新页面
-                self.payVodProductModel = model.product
-                self.payContentId = model.contentId
-                self.payIndex = -1
-                self.kanDianIndex = seleIdx
-                self.isPlayAblumOrKandian = false
-                self.payTitle = model.title
-                self.payIsAlbum = false
-                self.payActivityId = model.pid
-                self.player.allowOrentitaionRotation = false
+                 
+//            let isAblumVideo = (model.album?.albumId.count ?? 0 > 0) ? true : false
+//            self.selectKanDianOrAlbum(isPayZhuanJi: isPayZhuanJi, mdlProduct: model.product, mdlContentId: model.contentId, isAblumVideo: isAblumVideo, albumSelectIndex: -1, kanDianSelectIndex: seleIdx, kanDianListArray: kanDianListArr, isPlayAblumOrKandian: false, xuanjiBgViewCurrSeleIdx: seleIdx, xuanjiBgViewKanDianListArr: kanDianListArr, modelTitle: model.title, mdlActiveId: model.pid, mdlModel: model.model, yuanString: yuanString)
+            
+            //true当前播放的专辑 false看点
+            let isAblumVideo = false// (model.album?.albumId.count ?? 0 > 0) ? true : false
+//            let isAblumVideo = (model.album?.albumId.count ?? 0 > 0) ? true : false
+            var vodAlbumListModel:CNLiveVodAlbumListModel?
+            if self.albumListArr.count > 0{
+                if let vodAlbumListMdl = self.albumListArr[0] as? CNLiveVodAlbumListModel{
+                    vodAlbumListModel = vodAlbumListMdl
+                }
             }
+            self.selectKanDianOrAlbum(isPayZhuanJi: isPayZhuanJi, mdlProduct: model.product, mdlContentId: model.contentId, isAblumVideo: isAblumVideo, albumSelectIndex: -1, albumListArray: NSMutableArray(), kanDianSelectIndex: seleIdx, kanDianListArray: kanDianListArr, isPlayAblumOrKandian: isAblumVideo, xuanjiBgViewCurrSeleIdx: seleIdx, xuanjiBgViewKanDianListArr: kanDianListArr, modelTitle: model.title, mdlActiveId: model.pid, mdlModel: model.model, yuanString: yuanString, payVodAlbumListModel: vodAlbumListModel, vodAlbumListBaseModel: nil)
+//            if isPayZhuanJi{
+//                //已经付费
+//                self.controlView.payBgView.isHidden = true
+//
+//                self.contentId = model.contentId
+//                let isAblumVideo = (model.album?.albumId.count ?? 0 > 0) ? true : false
+//                self.albumIndex = -1
+//                self.kanDianIndex = seleIdx
+//                self.kanDianListArr = kanDianListArr
+//                //只更新 此视频的长id,换url(不管是不是专辑)
+//                self.isPlayAblumOrKandian = false
+//                //更新选集-看点列表
+//                //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, isRefreshPlayer:true )
+//                self.player.allowOrentitaionRotation = true
+//            }else{
+//                //没付费
+//                //显示付费页面
+//                let vodMdl = CNLiveVodPlayModel()
+//                vodMdl.product = model.product
+//                vodMdl.contentId = model.contentId
+//                vodMdl.model = model.model
+//                self.controlView.vodPlayModel = vodMdl
+//                self.controlView.payBgView.isHidden = false
+//                self.controlView.payBgView.payBtn.setTitle("\(yuanString)元购买本集内容", for: .normal)
+//                //成功用pay参数 刷新页面
+//                self.payVodProductModel = model.product
+//                self.payContentId = model.contentId
+//                self.payIndex = -1
+//                self.kanDianIndex = seleIdx
+//                self.isPlayAblumOrKandian = false
+//                self.payTitle = model.title
+//                self.payIsAlbum = false
+//                self.payActivityId = model.pid
+//                self.player.allowOrentitaionRotation = false
+//            }
+
+            
 //            self.contentId = model.contentId
@@ -7,7 +7,7 @@
 import Foundation
-typealias CNLiveVodAlbumListCellSelectBlock = (_ vodModel:CNLiveVodAlbumListModel,_ index:Int,_ albumListModels:NSMutableArray)->Void;
+typealias CNLiveVodAlbumListCellSelectBlock = (_ vodModel:CNLiveVodAlbumListModel,_ index:Int,_ albumListModels:NSMutableArray,_ vodAlbumListBaseModel:CNLiveVodAlbumListBaseModel?)->Void;
 class CNLiveVodAlbumListCell:UITableViewCell, UICollectionViewDelegate, UICollectionViewDataSource{
     var currSeleIdx:Int = 0
@@ -91,7 +91,7 @@ class CNLiveVodAlbumListCell:UITableViewCell, UICollectionViewDelegate, UICollec
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         if let vodAlbumListModel = self.albumListArr[indexPath.row] as? CNLiveVodAlbumListModel{
             //点击某集,刷新页面
-            self.selectBlock?(vodAlbumListModel, indexPath.row, self.albumListArr)
+            self.selectBlock?(vodAlbumListModel, indexPath.row, self.albumListArr, self.vodAlbumListBaseModel)
             self.currSeleIdx = indexPath.row
             self.realHotCollectionView.reloadData()
@@ -66,15 +66,11 @@ class CNLiveVodLandscapeXuanjiView:UIView, UITableViewDataSource, UITableViewDel
             _vodAlbumListBaseModel
         }
         set{
-            _vodAlbumListBaseModel = newValue!
-            self.setupNewUI(model: vodAlbumListBaseModel!)
+            _vodAlbumListBaseModel = newValue
+            self.setupNewUI(model: vodAlbumListBaseModel)
         }
     }
-//    lazy var kanDianListArr :NSMutableArray = {
-//        let kanDianListArr = NSMutableArray()
-//        return kanDianListArr
-//    }()
     var _kanDianListArr : NSMutableArray?
     var kanDianListArr : NSMutableArray? {
         get{
@@ -214,7 +210,7 @@ class CNLiveVodLandscapeXuanjiView:UIView, UITableViewDataSource, UITableViewDel
     }
     //专辑列表
-    func setupNewUI(model:CNLiveVodAlbumListBaseModel){
+    func setupNewUI(model:CNLiveVodAlbumListBaseModel?){
 //        self.albumListArr = NSMutableArray(array: model.list)
 //        self.realHotCollectionView.reloadData()
@@ -236,8 +232,8 @@ class CNLiveVodLandscapeXuanjiView:UIView, UITableViewDataSource, UITableViewDel
         var hangIndex = 1
         var maxContentHeight:CGFloat = self.bgScrollView.height
-        for i in 0..<model.list.count{
-            let listMdl = model.list[i]
+        for i in 0..<(model?.list.count ?? 0){
+            let listMdl = model?.list[i]
             let rowH = WH+padding
             let imgX = CGFloat(lieIndex)*(WH+padding)
             let imgY = rowH*CGFloat(hangIndex-1)
@@ -277,7 +273,7 @@ class CNLiveVodLandscapeXuanjiView:UIView, UITableViewDataSource, UITableViewDel
             layerView.frame = CGRect(x: 0, y: 0, width: 26, height: 15)
             expandBtn.addSubview(layerView)
-            let isPaid = CNLivePlayerTool.isPaid(product: listMdl.product)
+            let isPaid = CNLivePlayerTool.isPaid(product: listMdl?.product)
             if isPaid{
                 layerView.isHidden = false
             }else{