切换看点 ,剧集更新点赞收藏和播放器 ,自动播放下一集

“张旭”
1 parent 88a8de26
Showing 5 changed files with 306 additions and 40 deletions
metaCode/Classes/Main/HomePages/ViewModel/CNLiveHomePageViewModel.swift
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
metaCode/Classes/Main/HuBiLieHomePage/Util/CNLiveDownSlideTool.swift
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/CNLiveVodAlbumListCell.swift
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/CNLiveVodTrailersCell.swift
@@ -29,7 +29,7 @@ class CNLiveHomePageViewModel:NSObject,URLSessionTaskDelegate{
         let uuid = CNLiveBusinessTools.getUidForStat(Date())
-        let shortVersion = Bundle.main.infoDictionary!["CFBundleShortVersionString"] as! String
+        let shortVersion = "2.3.8"//Bundle.main.infoDictionary!["CFBundleShortVersionString"] as! String
         let param = NSMutableDictionary()
@@ -99,7 +99,7 @@ class CNLiveHomePageViewModel:NSObject,URLSessionTaskDelegate{
         completionHandler(nil)
     }
-    //点播详情
+    //点播详情 album.albumId为""是点播 ,否则专辑
     static func requestGetVodPlayApi( contentId:String,sid:String,resultBlock: @escaping downSlideResultBlock) {
         let param = NSMutableDictionary()
         param.setValue(contentId, forKey: "contentId")
@@ -13,10 +13,27 @@ import CNLiveShareToolKit
 class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITableViewDelegate{
+    var player: ZFPlayerController!
     //当前内容id
     var contentId = ""
     var playTitle = ""
     var isSeek = false
+    //当前播放列表 专辑true / 看点false
+    var isPlayAblumOrKandian = false
+    var isAblumVideo = false
+    //专辑列表数组   播放专辑时用
+    lazy var albumListArr: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    var albumIndex:Int = 0//当前专辑播放index
+    
+    //看点列表数组   播放看点时用
+    lazy var kanDianListArr: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    var kanDianIndex:Int = -1//当前看点播放index
     //CNLiveVodPlayModel 单集model
     var _vodPlayModel : CNLiveVodPlayModel?
@@ -29,7 +46,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
         }
     }
-    //CNLiveVodPlayModel 专辑列表model
+    // 专辑列表model
     var _vodAlbumListBaseModel : CNLiveVodAlbumListBaseModel?
     var vodAlbumListBaseModel : CNLiveVodAlbumListBaseModel? {
         get{
@@ -131,8 +148,6 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
         controlView.showCustomStatusBar = true
         return controlView
     }()
-    var player: ZFPlayerController!
-    var isAblumVideo = false
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = .black
@@ -180,12 +195,17 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
 //        self.addRefreshView()
         self.configDataArray()
         self.isAblumVideo = false
-        if let albumModel = self.vodAlbumListBaseModel{
+        self.isPlayAblumOrKandian = false
+        
+//        if let albumModel = self.vodAlbumListBaseModel{
+        if self.vodPlayModel?.album?.albumId.count ?? 0 > 0{
             //专辑
             self.isAblumVideo = true
+            self.isPlayAblumOrKandian = true
         }else{
             //单集
             self.isAblumVideo = false
+            self.isPlayAblumOrKandian = false
         }
     }
@@ -269,11 +289,22 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             guard let self = self else { return }
         }
+        var endAssetURL:URL?
         /// 播放完成
         self.player.playerDidToEnd = {
             [weak self] asset in
             guard let self = self else { return }
-            self.playNextIfExist()
+            if endAssetURL == nil {
+                endAssetURL = asset.assetURL
+                self.playNextIfExist()
+            }else{
+                //一个视频回调 两次end
+                endAssetURL = nil
+            }
+            let delayTime = DispatchTime.now()+3
+            DispatchQueue.main.asyncAfter(deadline: delayTime) {
+                endAssetURL = nil
+            }
         }
         var urls = [URL]()
@@ -308,14 +339,42 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
     }
     func playNextIfExist(){
-        //当前播放的是 专辑列表 ,播专辑列表下一条
-        //当前播放的是 看点列表 ,播看点列表下一条
-        if self.isAblumVideo{
-            //播专辑列表下一条
+        if self.isAblumVideo && self.isPlayAblumOrKandian{
+            //当前播放的是 专辑列表 ,播专辑列表下一条
+            let nextIdx = self.albumIndex + 1
+            if nextIdx < self.albumListArr.count{
+                self.albumIndex = nextIdx
+                if let albumModel = self.albumListArr[nextIdx] as? CNLiveVodAlbumListModel{
+                    //播专辑列表下一条
+                    self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: self.isAblumVideo, activeId: albumModel.activityId)
+//                    self.changeContentApi(vodModel: albumModel)
+                }
+
+            }else{
+//                self.player.stop()
+            }
         }else{
-            //
+            //当前播放的是 看点列表 ,播看点列表下一条
+            let nextIdx = self.kanDianIndex + 1
+            if nextIdx < self.kanDianListArr.count{
+                self.kanDianIndex = nextIdx
+                self.albumIndex = -1
+                if let albumModel = self.kanDianListArr[nextIdx] as? CNLiveVodPlayBlockListListModel{
+                    //播列表下一条
+                    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)
+//                    }else{
+//                        self.kanDianOrAlbumChangeContentApi(contentId: albumModel.contentId, title: albumModel.title, isAlbum: isAblumVideo, activeId: albumModel.pid)
+//                    }
+//                    self.changeContentApi(vodModel: albumModel)
+                }
+
+            }else{
+//                self.player.stop()
+            }
         }
         //            if (!self.player.isLastAssetURL) {
         //                [self.player playTheNext];
@@ -386,29 +445,58 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
         self.player.stop()
     }
-    // MARK: -专辑列表切换某集 ,刷新看点和电商
-    func changeContentApi(vodModel:CNLiveVodAlbumListModel){
-        
+    // MARK: - 专辑/看点 列表切换某集,只刷新播放器和点赞收藏
+    func kanDianOrAlbumChangeContentApi(contentId:String,title:String,isAlbum:Bool,activeId:String){
+//        if isAlbum{
+            self.changeContentApi(activityId: activeId, title: title, contentId: contentId)
+//        }else{
+//            self.kanDianChangeContentApi(contentId: contentId, title: title)
+//        }
+    }
+    // MARK: - 看点列表切换某集 只刷新播放器和点赞收藏
+    func kanDianChangeContentApi(contentId:String,title:String){
+        self.isPlayAblumOrKandian = false
         //刷新url
-        CNLiveHomePageViewModel.shared.getVodVideoURL(contentId: vodModel.activityId) {[weak self] result, status in
+        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: vodModel.title)
+                    self.playWithUrlAndTitle(url: url, title: title)
+                    self.url = URL(string: url)
                 }
             }else{
             }
         }
-        
         //play接口刷新 看点和电商
-        CNLiveDownSlideTool.getVodPlayApi(contentId: vodModel.contentId) {[weak self] result, status in
+        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
+//                    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.configDataArray()
                     self.tableView.reloadData()
                 }else{
@@ -420,6 +508,79 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
         }
     }
+
+    
+    // MARK: -专辑列表切换某集 ,刷新看点和电商
+    func changeContentApi(activityId:String,title:String,contentId:String){
+//        self.isPlayAblumOrKandian = true
+        
+        //play接口刷新 看点和电商  1350755
+        CNLiveDownSlideTool.getVodPlayApi(contentId: contentId) {[weak self] result, status in
+            guard let self = self else { return }
+            if status == .success{
+                if var vodPlayModel = result as? CNLiveVodPlayModel{
+//                    self.vodPlayModel = vodPlayModel
+                    //单集有值-简介
+                    var temp5Mdl:CNLiveVodPlayBlockListModel?
+                    var temp2Mdl:CNLiveVodPlayBlockListModel?
+
+                    var tempVodPlayModel = self.vodPlayModel
+                    for (_,vodMdl) in vodPlayModel.blockList.enumerated(){
+                        if vodMdl.type == "5"{
+                            temp5Mdl = vodMdl
+                        }
+                        if vodMdl.type == "2"{
+                            temp2Mdl = vodMdl
+                        }
+                    }
+                    for(index,vodModel) in tempVodPlayModel!.blockList.enumerated(){
+                        if self.isPlayAblumOrKandian{
+                            //切换剧集时, 调用play接口, 更新片花列表和商品列表
+                            if temp2Mdl != nil{
+                                if vodModel.type == "2"{//更新片花
+                                    tempVodPlayModel!.blockList[index] = temp2Mdl!
+                                }
+                            }
+
+                        }else{
+                            //切换看点时, 调用play接口, 只更新商品列表
+                        }
+                        
+                        //更新简介里的 点赞和收藏 简介
+                        if temp5Mdl != nil{
+                            if vodModel.type == "5"{
+                                tempVodPlayModel!.blockList[index] = temp5Mdl!
+                            }
+                        }
+                    }
+                    tempVodPlayModel?.goodsJson = vodPlayModel.goodsJson
+                    self.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)
+                            }
+                        }else{
+                            
+                        }
+                    }
+
+                    self.configDataArray()
+                    self.tableView.reloadData()
+                }else{
+                    
+                }
+            }else{
+                
+            }
+        }
+        
+    }
     // MARK: - 刷新 整个页面
     func refreshVodData(isAblumVideo:Bool){
         CNLiveDownSlideTool.getVodData(contentId: self.contentId, isAblumVideo: isAblumVideo) {[weak self] vodPlayModel, contentId,url, result, status  in
@@ -494,17 +655,25 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                     let cell = CNLiveVodTrailersCell()
                     return cell
                 }
-                cell.currSeleIdx = -1
+                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 in
+                cell.selectBlock = { [weak self] model,index,kanDianListArr in
                     guard let self = self else { return }
                     self.contentId = model.contentId
-                    let isAblumVideo = model.model == "1" ? false : true
-                    self.refreshVodData(isAblumVideo: isAblumVideo)
+                    let isAblumVideo = (model.album?.albumId.count ?? 0 > 0) ? true : false
+//                    let isAblumVideo = model.model == "1" ? false : true
+                    self.albumIndex = -1
+                    self.kanDianIndex = index
+                    self.kanDianListArr = kanDianListArr
+                    //只更新 此视频的长id,换url(不管是不是专辑)
+                    self.isPlayAblumOrKandian = false
+
+                    self.kanDianOrAlbumChangeContentApi(contentId: model.contentId, title: model.title, isAlbum: isAblumVideo, activeId: model.pid)
+//                    self.refreshVodData(isAblumVideo: isAblumVideo)
                 }
                 return cell
             }else{
@@ -517,12 +686,18 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
                 let cell = CNLiveVodAlbumListCell()
                 return cell
             }
+            cell.currSeleIdx = self.albumIndex
             cell.vodAlbumListBaseModel = vodAlbumListBaseModel
-            cell.selectBlock = {[weak self] vodModel, index in
+            cell.selectBlock = {[weak self] vodModel, index ,albumListArr in
                 guard let self = self else { return }
                 self.contentId = vodModel.contentId
-                self.changeContentApi(vodModel: vodModel)
+                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)
+//                self.changeContentApi(vodModel: vodModel)
             }
             return cell
         }else if let vodPlayShopModels = self.dataArray[indexPath.row] as? [CNLiveVodPlayShopModel]{
@@ -624,12 +799,20 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             guard let self = self else { return }
             self.contentId = model.contentId
             var isAblumVideo = false
-            if model.model == "1"{
-                isAblumVideo = false
-            }else{
+//            let isAblumVideo = (model.album?.albumId.count ?? 0 > 0) ? true : false
+            if model.album?.albumId.count ?? 0 > 0{
                 isAblumVideo = true
+            }else{
+                isAblumVideo = false
             }
-            self.refreshVodData(isAblumVideo: isAblumVideo)
+//            if model.model == "1"{
+//                isAblumVideo = false
+//            }else{
+//                isAblumVideo = true
+//            }
+            self.isPlayAblumOrKandian = false
+            self.kanDianOrAlbumChangeContentApi(contentId: model.contentId, title: model.title, isAlbum: isAblumVideo, activeId: model.pid)
+//            self.refreshVodData(isAblumVideo: isAblumVideo)
         }
     }
     // MARK: - 简介cell点击事件
@@ -351,7 +351,89 @@ class CNLiveDownSlideTool:NSObject{
     }
     class func pushVodController(contentId:String,navigationVC:UINavigationController?,isAblumVideo:Bool){
-        showLoading(message: "")
+showLoading(message: "")
+var tempIsAblumVideo = isAblumVideo
+//获取play
+CNLiveDownSlideTool.getVodPlayApi(contentId: contentId){ result, status in
+    if status == .success{
+        if let tempVodModel = result as? CNLiveVodPlayModel{
+            if tempVodModel.album?.albumId.count ?? 0 > 0{
+                //专辑
+                //获取专辑详情
+                CNLiveDownSlideTool.getVodAlbumMsgApi(contentId: tempVodModel.album!.albumId){ result, status in
+                    if status == .success{
+                        if let vodModel = result as? CNLiveVodAlbumMsgModel{
+                            //获取专辑列表
+                            CNLiveHomePageViewModel.requstWithVodAlbumVideoList(aid: tempVodModel.album!.albumId){result, status in
+                                if let  albumListBaseModel = result as? CNLiveVodAlbumListBaseModel{
+                                    var currVodModel:CNLiveVodAlbumListModel?
+                                    for (idx,albumListModel) in  albumListBaseModel.list.enumerated(){
+                                        albumListModel.vodAlbumMsgModel = vodModel
+                                        if idx == vodModel.episodeLast{
+                                            currVodModel =
+                                            albumListModel                                    }
+                                    }
+                                    //拿最新播放集数的单集pid,再请求play
+//                                    CNLiveDownSlideTool.getVodPlayApi(contentId: currVodModel?.contentId ?? ""){ result, status in
+//                                        if status == .success{
+//                                            if let vodModel = result as? CNLiveVodPlayModel{
+                                                //获得点播url
+                                                //获取301播放地址
+                                    CNLiveHomePageViewModel.shared.getVodVideoURL(contentId: tempVodModel.contentId) {result,status in //vodModel.contentId result, status in
+                                                    hiddenLoading()
+                                                    if status == .success{
+                                                        let vc =  CNLiveTVPlayerViewController()
+                                                        let url = result as! String
+                                                        vc.url = URL(string: url)
+                                                        vc.vodPlayModel = tempVodModel//vodModel
+                                                        vc.contentId = contentId
+                                                        vc.vodAlbumListBaseModel = albumListBaseModel
+                                                        navigationVC?.pushViewController(vc, animated: pushAnimated)
+                                                    }else{
+                                                        
+                                                    }
+//                                                }
+//
+//                                            }else{
+//                                                
+//                                            }
+//                                        }
+                                    }
+                                    
+                                }
+                            }
+                        }
+                    }
+                }
+            }else{
+                //单集
+                //获得点播url
+                //获取301播放地址
+                CNLiveHomePageViewModel.shared.getVodVideoURL(contentId: tempVodModel.contentId) { result, status in
+                    hiddenLoading()
+                    if status == .success{
+                        let vc =  CNLiveTVPlayerViewController()
+                        let url = result as! String
+                        vc.url = URL(string: url)
+                        vc.vodPlayModel = tempVodModel
+                        vc.contentId = contentId
+                        navigationVC?.pushViewController(vc, animated: pushAnimated)
+                    }else{
+                        
+                    }
+                }
+            }
+        }else{
+            
+        }
+    }
+}
+        
+        
+
+        
+        
+        /*
         if isAblumVideo{
             //专辑
             //获取专辑详情
@@ -431,6 +513,7 @@ class CNLiveDownSlideTool:NSObject{
             }
         }
+         */
     }
     //专辑详情
@@ -7,11 +7,10 @@
 import Foundation
-typealias CNLiveVodAlbumListCellSelectBlock = (_ vodModel:CNLiveVodAlbumListModel,_ index:Int)->Void;
+typealias CNLiveVodAlbumListCellSelectBlock = (_ vodModel:CNLiveVodAlbumListModel,_ index:Int,_ albumListModels:NSMutableArray)->Void;
 class CNLiveVodAlbumListCell:UITableViewCell, UICollectionViewDelegate, UICollectionViewDataSource{
-    
-    var selectIdx:Int = 0
+    var currSeleIdx:Int = 0
     var selectBlock:CNLiveVodAlbumListCellSelectBlock?
     //实时热榜的列表
     lazy var albumListArr: NSMutableArray = {
@@ -78,7 +77,7 @@ class CNLiveVodAlbumListCell:UITableViewCell, UICollectionViewDelegate, UICollec
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveVodAlbumListCollectionCellIdentifier, for: indexPath) as! CNLiveVodAlbumListCollectionCell
-        if self.selectIdx == indexPath.row{
+        if self.currSeleIdx == indexPath.row{
             //当前cell选中
             cell.isJiShuSelected = true
         }else{
@@ -92,8 +91,8 @@ 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.selectIdx = indexPath.row
+            self.selectBlock?(vodAlbumListModel, indexPath.row, self.albumListArr)
+            self.currSeleIdx = indexPath.row
             self.realHotCollectionView.reloadData()
         }
@@ -8,7 +8,7 @@
 import Foundation
 typealias CNLiveVodTrailersCellExpandBlock = (_ model:CNLiveVodPlayBlockListModel)->Void
-typealias CNLiveVodTrailersCellSelectBlock = (_ model:CNLiveVodPlayBlockListListModel)->Void
+typealias CNLiveVodTrailersCellSelectBlock = (_ model:CNLiveVodPlayBlockListListModel,_ index:Int ,_ albumListArr: NSMutableArray)->Void
 class CNLiveVodTrailersCell:UITableViewCell, UICollectionViewDelegate, UICollectionViewDataSource{
@@ -105,7 +105,8 @@ class CNLiveVodTrailersCell:UITableViewCell, UICollectionViewDelegate, UICollect
     func setupNewUI(model:CNLiveVodPlayBlockListModel){
         self.titleLabel.text = model.name
         self.albumListArr = NSMutableArray(array: model.list)
-        self.realHotCollectionView.scrollToItem(at: IndexPath(item: 0, section: 0), at: .left, animated: false)
+        var index = self.currSeleIdx >= 0 ? self.currSeleIdx : 0
+        self.realHotCollectionView.scrollToItem(at: IndexPath(item: index, section: 0), at: .left, animated: false)
         self.realHotCollectionView.reloadData()
     }
@@ -135,7 +136,7 @@ class CNLiveVodTrailersCell:UITableViewCell, UICollectionViewDelegate, UICollect
         if let vodAlbumListModel = self.albumListArr[indexPath.row] as? CNLiveVodPlayBlockListListModel{
             self.currSeleIdx = indexPath.row
             //点击某集,刷新页面
-            self.selectBlock?(vodAlbumListModel)
+            self.selectBlock?(vodAlbumListModel,currSeleIdx,self.albumListArr)
             self.realHotCollectionView.reloadData()
         }
     }