实时热榜进入切换为短剧播放器 , 其他情况为剧集播放器

“张旭”
1 parent 796ecda9
Showing 1 changed file with 167 additions and 45 deletions
metaCode/Classes/Main/VideoPage/Controller/CNLiveShortVideoViewController.swift
@@ -168,6 +168,16 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
     var currentDuanJuIndex: NSInteger! = 0//播放短剧index
     var isDuanJuPlayer = false//是否 短剧播放器
     var isTempDuanJuPlayer = false//临时是否 短剧播放器
+    var isPausePlayer = false//是否暂停播放
+    var isHomePagePush = false//是否 主页Push
+    lazy var tempDataArray: NSMutableArray = {//临时剧集
+        let dataArray = NSMutableArray.init()
+        return dataArray
+    }()
+    lazy var tempDataURLArray: NSMutableArray = {//临时剧集url
+        let dataArray = NSMutableArray.init()
+        return dataArray
+    }()
     /// 初始化播放器
     /// - Parameters:
@@ -180,12 +190,15 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         self.pageNum = page
         self.isSelectable = true
         self.currentIndex = currentIndex
+        self.isHomePagePush = true
         super.init(nibName:nil, bundle:nil)
         self.dataArray.addObjects(from: dataArray)
         dataArray.forEach {[weak self] listModel in
             guard let self = self else { return }
             self.dataURLArray.add(listModel.videoUrl)
         }
+        self.tempDataArray.addObjects(from: dataArray)
+        self.tempDataURLArray.addObjects(from: self.dataURLArray as! [Any])
     }
     /// 初始化播放器
@@ -283,6 +296,9 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         addRefreshView()
+        if self.tableView.mj_footer == nil  {
+            self.tableView.mj_footer = footerRefreshView
+        }
         player = ZFPlayerController(scrollView: tableView, playerManager: playerManager, containerViewTag: 100)
         player.disableGestureTypes = [.pan, .pinch]
@@ -296,14 +312,17 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             guard let self = self else { return }
             self.controlView.videoPlayer((self.player)!, currentTime: self.player.currentTime, totalTime: self.player.totalTime)
             let index = self.dataURLArray.index(of: assetURL.absoluteString)
-            let homeModel = self.dataArray[index] as! CNLiveAlbumListModel
-            self.currentIndex = index
-            if homeModel.product?.check == false {
-                if homeModel.product?.productType == "4" {
-                    //这里表示可以进行试听
-                } else {
-                    (self.player)!.stopCurrentPlayingCell()
+            if let homeModel = self.dataArray[index] as? CNLiveAlbumListModel{
+                self.currentIndex = index
+                if homeModel.product?.check == false {
+                    if homeModel.product?.productType == "4" {
+                        //这里表示可以进行试听
+                    } else {
+                        (self.player)!.stopCurrentPlayingCell()
+                    }
                 }
+            }else{
+                
             }
         }
         // 更新另一个控制层的时间
@@ -328,7 +347,15 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             guard let self = self else { return }
             self.controlView.videoPlayer((self.player)!)
             self.player.currentPlayerManager.stop()
+            //短剧播放器->剧集播放器  播放下一集
+            self.currentIndex = self.currentIndex + 1
+            if self.currentIndex >= self.dataArray.count{
+                //最后一集,重置为最后一集
+                self.currentIndex = self.dataArray.count - 1
+            }
+            
             let indexPath = IndexPath(row: self.currentIndex, section: 0)
+            self.player.scrollView?.setContentOffset(CGPoint(x: 0, y:CGFloat(self.currentIndex)*KSreenHeight), animated: true)//校正偏移量
             self.playVideo(at: indexPath as IndexPath)
         }
@@ -398,10 +425,17 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         self.tableView.refreshControl = headerRefreshView
         footerRefreshView = CNLiveFooterRefresh(refreshingBlock: { [weak self] in
             guard let self = self else { return }
-            self.player.stopCurrentPlayingCell()
-            self.currentIndex = 0
-            self.pageNum += 1
-            self.requestData {noMore in }
+            if self.isDuanJuPlayer
+            {//短剧
+                if self.tableView.mj_footer != nil {
+                    self.tableView.mj_footer?.endRefreshing()
+                    self.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                }
+            }else{//剧集
+                self.player.stopCurrentPlayingCell()
+                self.pageNum += 1
+                self.requestData {noMore in }
+            }
         })
         //预加载下
         CNLiveQQEmotionManager.emotionsForQQ()
@@ -412,7 +446,22 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         if self.isDuanJuPlayer{
             self.requestAllHotListData { noMore in }
         }else{
-            self.requestData {noMore in }
+            self.realHotArr.removeAllObjects()
+            self.realHotAllFirstArr.removeAllObjects()
+            self.realHotAllTotalArr.removeAllObjects()
+            self.realHotAllTotalVideoUrlArr.removeAllObjects()
+            self.currentDuanJuIndex = 0
+            self.isHomePagePush = false
+            self.currentIndex = 0
+            self.currentDuanJuIndex = 0
+            if self.pickerView != nil {
+                self.pickerView.setupWithArray(dataArray: self.dataArray)
+            }
+            self.tableView.refreshControl?.endRefreshing()
+            self.tableView.reloadData()
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                self.player.scrollView?.setContentOffset(CGPoint(x: 0, y:CGFloat(self.currentIndex!)*KSreenHeight), animated: true)//校正偏移量
+            }
         }
     }
@@ -439,6 +488,8 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         self.realHotAllTotalArr.removeAllObjects()
         self.dataArray.removeAllObjects()
         self.dataURLArray.removeAllObjects()
+        self.tempDataArray.removeAllObjects()
+        self.tempDataURLArray.removeAllObjects()
         showLoading(message: "")
         let tempRealHotArr = Array(self.realHotArr)
@@ -522,8 +573,10 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             //等全部数据弄好了再设置
             self.dataArray.addObjects(from: self.realHotAllFirstArr as! [CNLiveAlbumListModel])
-            
             self.dataURLArray.addObjects(from: self.realHotAllFirstVideoUrlArr as! [String])
+            //
+            self.tempDataArray.addObjects(from: self.realHotAllTotalArr[self.currentDuanJuIndex] as! [CNLiveAlbumListModel])
+            self.tempDataURLArray.addObjects(from: self.realHotAllTotalVideoUrlArr[self.currentDuanJuIndex] as! [String])
             if self.tableView.mj_footer != nil {
                 self.tableView.mj_footer?.endRefreshing()
             }
@@ -534,6 +587,9 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             self.tableView.refreshControl?.endRefreshing()
             self.tableView.reloadData()
+            if self.tableView.mj_footer == nil  {
+                self.tableView.mj_footer = self.footerRefreshView
+            }
             self.playTheIndex(index: self.currentDuanJuIndex)
         }
@@ -552,10 +608,35 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
 //                        self.tableView.setContentOffset(CGPoint.zero, animated: false)
 //                    }
                 }
-                let listArray = (result as! [Any]).first as! [CNLiveAlbumListModel]
-                self.dataArray.addObjects(from: listArray)
-                let urlArray = (result as! [Any]).last as! [String]
-                self.dataURLArray.addObjects(from: urlArray)
+                var listArray = [CNLiveAlbumListModel]()
+                var urlArray = [String]()
+                if self.isTempDuanJuPlayer{
+                    //是短剧,点击了集数列表
+                    if self.isDuanJuPlayer{
+                        //没点集数,还是短剧
+                        print("1")
+                    }else{
+                        //点击了集数,切换剧集
+                        listArray = (result as! [Any]).first as! [CNLiveAlbumListModel]
+                        self.tempDataArray.addObjects(from: listArray)
+                        urlArray = (result as! [Any]).last as! [String]
+                        self.tempDataURLArray.addObjects(from: urlArray)
+                        self.dataArray.removeAllObjects()
+                        self.dataArray.addObjects(from: self.tempDataArray as! [Any])
+                        self.dataURLArray.removeAllObjects()
+                        self.dataURLArray.addObjects(from: self.tempDataURLArray as! [Any])
+                    }
+                }else{
+                    //剧集
+                    listArray = (result as! [Any]).first as! [CNLiveAlbumListModel]
+                    self.tempDataArray.addObjects(from: listArray)
+                    urlArray = (result as! [Any]).last as! [String]
+                    self.tempDataURLArray.addObjects(from: urlArray)
+                    self.dataArray.removeAllObjects()
+                    self.dataArray.addObjects(from: self.tempDataArray as! [Any])
+                    self.dataURLArray.removeAllObjects()
+                    self.dataURLArray.addObjects(from: self.tempDataURLArray as! [Any])
+                }
                 if self.tableView.mj_footer != nil {
                     self.tableView.mj_footer?.endRefreshing()
                 }
@@ -581,14 +662,23 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
                     }
                 }
-                let model = listArray.first?.albumMsgModel
-                let toIndex = (model?.episodeLast ?? 1)-1 <= 0 ? 0 : (model?.episodeLast ?? 1)-1
-                var page = (self.roundUpToNearestTen(toIndex))/10
-                if page == 0 {
-                    page = 1
+                if self.isTempDuanJuPlayer == true && self.isDuanJuPlayer == false{
+                    //从短剧变为剧集
+//                    self.playTheIndex(index: self.currentIndex)
+                }else{//剧集
+                    if self.slideModel == nil && self.currentIndex == 0{//非实时热榜进入,找上一次播放集数
+                        let model = listArray.first?.albumMsgModel
+                        let toIndex = (model?.episodeLast ?? 1)-1 <= 0 ? 0 : (model?.episodeLast ?? 1)-1
+                        var page = (self.roundUpToNearestTen(toIndex))/10
+                        if page == 0 {
+                            page = 1
+                        }
+                        self.pageNum = page
+                        self.playTheIndex(index: toIndex)
+                    }else{
+                        print("加载更多列表")
+                    }
                 }
-                self.pageNum = page
-                self.playTheIndex(index: toIndex)
             } else {
                 if self.tableView.mj_footer != nil {
                     self.tableView.mj_footer?.endRefreshing()
@@ -608,6 +698,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         tableView.scrollToRow(at: indexPath, at: .none, animated: false)
         DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
             self.player.scrollView?.setContentOffset(CGPoint(x: 0, y:CGFloat(index)*KSreenHeight), animated: true)//校正偏移量
+            self.playVideo(at: IndexPath(row: index, section: 0))
         }
         // 使用zf_filterShouldPlayCellWhileScrolled过滤播放
@@ -667,24 +758,44 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         if self.isDuanJuPlayer{
             self.currentDuanJuIndex = indexPath.row
-            let arr1 = self.realHotAllTotalArr[self.currentDuanJuIndex] as! Array<Any>
-            let arr = NSMutableArray()
-            arr1.forEach { obj in
-                let duanjuMdl = obj as! CNLiveAlbumListModel
-                arr.add(duanjuMdl)
-            }
-            if self.pickerView != nil {
-                self.pickerView.setupWithArray(dataArray: arr)
+            if self.currentDuanJuIndex < self.realHotAllTotalArr.count{
+                let arr1 = self.realHotAllTotalArr[self.currentDuanJuIndex] as! Array<Any>
+                let arr = NSMutableArray()
+                arr1.forEach { obj in
+                    let duanjuMdl = obj as! CNLiveAlbumListModel
+                    arr.add(duanjuMdl)
+                }
+                if self.pickerView != nil {
+                    self.pickerView.setupWithArray(dataArray: arr)
+                }
             }
         }else{
             if self.pickerView != nil {
                 self.pickerView.setupWithArray(dataArray: self.dataArray)
             }
         }
-        let data: CNLiveAlbumListModel = dataArray[indexPath.row] as! CNLiveAlbumListModel
-        self.player.playTheIndexPath(indexPath, assetURL: URL(string: data.videoUrl)!)
-        controlView.resetControlView()
-        controlView.showCoverView(withUrl: data.poster)
+        if self.isPausePlayer == true{
+//            self.playerManager.pause()
+            print("111")
+        }else{
+            var index = 0
+            if self.isHomePagePush == true{
+                //是主页push
+                self.isHomePagePush = false
+                index = self.currentIndex
+            }else{
+                //不是主页push
+                self.currentIndex = indexPath.row
+                index = self.currentIndex
+                
+            }
+            let idxPath = IndexPath(row: index, section: indexPath.section)
+            if let data: CNLiveAlbumListModel = dataArray[index] as? CNLiveAlbumListModel{
+                self.player.playTheIndexPath(idxPath, assetURL: URL(string: data.videoUrl)!)
+                controlView.resetControlView()
+                controlView.showCoverView(withUrl: data.poster)
+            }
+        }
     }
     //10倍数向上取整
     func roundUpToNearestTen(_ number: Int) -> Int {
@@ -761,12 +872,17 @@ extension CNLiveShortVideoViewController {
         }
     }
     func listActionMethod(viewcell: CNLiveShortVideoListTableViewCell, button: UIButton) {
-        var arr = NSMutableArray()
+        let arr = NSMutableArray()
         var pageNum:NSInteger = 1
         if self.isDuanJuPlayer{
             let listArr =   self.realHotAllTotalArr[self.currentDuanJuIndex] as! [CNLiveAlbumListModel]
             arr.addObjects(from: listArr)
             pageNum = 1
+            self.aid = listArr.first?.albumMsgModel?.albumId
+            self.tempDataArray.removeAllObjects()
+            self.tempDataArray.addObjects(from: self.realHotAllTotalArr[self.currentDuanJuIndex] as! [CNLiveAlbumListModel])
+            self.tempDataURLArray.removeAllObjects()
+            self.tempDataURLArray.addObjects(from: self.realHotAllTotalVideoUrlArr[self.currentDuanJuIndex] as! [String])
         }else{
             arr.addObjects(from: self.dataArray as! [Any])
             pageNum = self.pageNum
@@ -774,36 +890,42 @@ extension CNLiveShortVideoViewController {
         self.isTempDuanJuPlayer = self.isDuanJuPlayer
         self.isDuanJuPlayer = false
+        self.isPausePlayer = true
+        
         pickerView = CNLiveShortVideoContentListView.showVideoContentListView(aid: viewcell.homeModel.albumMsgModel!.albumId,pageNum: pageNum,title: viewcell.homeModel.albumMsgModel!.albumName,dataArray: arr, episodeNow: viewcell.homeModel.albumMsgModel!.episodeNow, result: {[weak self] listModel in
             guard let self = self else { return }
             if listModel is String{
                 //点击了x
                 self.isDuanJuPlayer = self.isTempDuanJuPlayer
+                self.isPausePlayer = false
             }else{
-                //点击了cell
+                // MARK: - 点击了剧集列表cell
                 //切换为剧集播放器
+                self.isPausePlayer = false
                 self.isDuanJuPlayer = false
                 self.isTempDuanJuPlayer = false
                 //更改数据源
                 self.dataArray.removeAllObjects()
                 self.dataURLArray.removeAllObjects()
-                let arr = self.realHotAllTotalArr[self.currentDuanJuIndex] as! [CNLiveAlbumListModel]
-                self.dataArray.addObjects(from: arr)
-                let urlArr = self.realHotAllTotalVideoUrlArr [self.currentDuanJuIndex] as! [String]
-                self.dataURLArray.addObjects(from: urlArr)
+                
+                self.dataArray.addObjects(from: self.tempDataArray as! [CNLiveAlbumListModel])
+
+                self.dataURLArray.addObjects(from: self.tempDataURLArray as! [String])
+                
                 self.tableView.reloadData()
                 let index = self.dataArray.index(of: listModel) as NSInteger
+                self.currentIndex = index
                 self.playTheIndex(index: index)
-                
             }
         }, reload: {[weak self] page in
             guard let self = self else { return }
             self.player.stopCurrentPlayingCell()
-            self.currentIndex = 0
+            if page == 1{
+                self.currentIndex = 0
+            }
             self.pageNum = page
-            
             self.requestData { noMore in
                 self.pickerView.tableView.mj_footer?.endRefreshing()
                 if noMore {