添加相关修改

liushiyu
1 parent 477c9de1
Showing 3 changed files with 81 additions and 47 deletions
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/VideoPage/Controller/CNLiveShortVideoViewController.swift
metaCode/Classes/Main/VideoPage/View/CNLiveShortVideoContentListView.swift
@@ -6,7 +6,7 @@
 //
  
 import Foundation
-
+import CNLiveShareToolKit
  
 class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource{
  
@@ -182,7 +182,8 @@ extension CNLiveMineViewController {
         if indexPath.section == 4 {
             if indexPath.row == 0 {
 //                self.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
-                StandSortManager.removeStandSort()
+//                StandSortManager.removeStandSort()
+//                CNLiveShareImageManager.pushWeChatMiniProgrem(withMiniAppId: "gh_234d4ed615a3", path: "page/login_hint/login_hint", extMsg: "", extDic: [:])
             }
             if indexPath.row == 1 {
                 self.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: true)
@@ -77,6 +77,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
     var pageNum: NSInteger! = 1
     var isSelectable: Bool! = false
     var currentIndex: NSInteger! = 0
+    var pickerView: CNLiveShortVideoContentListView!
     var footerRefreshView: CNLiveFooterRefresh!
 //    var playerManager = ZFIJKPlayerManager.init()
     var playerManager = ZFAVPlayerManager.init()
@@ -136,13 +137,14 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         view.addSubview(backBtn)
  
         if self.dataArray.count == 0 {
-            requestData {}
+            requestData {noMore in }
         }
  
         addRefreshView()
  
         player = ZFPlayerController(scrollView: tableView, playerManager: playerManager, containerViewTag: 100)
-//        player.disableGestureTypes = //[.pan, .pinch]
+        player.disableGestureTypes = [.pan, .pinch]
+        player.disablePanMovingDirection = .vertical
         player.controlView = controlView
         player.allowOrentitaionRotation = false
         player.isWWANAutoPlay = true
@@ -197,7 +199,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             self.player.stopCurrentPlayingCell()
             self.currentIndex = 0
             self.pageNum += 1
-            self.requestData {}
+            self.requestData {noMore in }
         })
         //预加载下
         CNLiveQQEmotionManager.emotionsForQQ()
@@ -205,7 +207,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
  
     @objc func headerRefresh() {
         self.pageNum = 1
-        self.requestData {}
+        self.requestData {noMore in }
     }
  
     @objc func removePlayerAction() {
@@ -224,7 +226,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         self.backBtn.frame = CGRectMake(15, KStatusBarHeight + 15, 45, 45)
     }
  
-    func requestData(resultBlock: @escaping () -> Void) {
+    func requestData(resultBlock: @escaping (_ noMore: Bool) -> Void) {
         CNLiveShortVideoViewModel.requstWithShortVideo(aid: self.aid, page: self.pageNum) { [weak self] result, respStatue in
             guard let self = self else { return }
             if respStatue == .success {
@@ -242,6 +244,9 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
                 if self.tableView.mj_footer != nil {
                     self.tableView.mj_footer?.endRefreshing()
                 }
+                if self.pickerView != nil {
+                    self.pickerView.setupWithArray(dataArray: self.dataArray)
+                }
                 self.tableView.refreshControl?.endRefreshing()
                 self.tableView.reloadData()
                 if self.pageNum == 1 {
@@ -254,8 +259,10 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
                     if !hasNextPage {
                         self.tableView.mj_footer?.endRefreshingWithNoMoreData()
                         self.tableView.reloadData()
+                        resultBlock(true)
                     }
                 } else {
+                    resultBlock(false)
                     if self.tableView.mj_footer == nil  {
                         self.tableView.mj_footer = footerRefreshView
                     }
@@ -380,10 +387,21 @@ extension CNLiveShortVideoViewController {
         }
     }
     func listActionMethod(viewcell: CNLiveShortVideoListTableViewCell, button: UIButton) {
-        CNLiveShortVideoContentListView.showVideoContentListView(aid: viewcell.homeModel.albumMsgModel!.albumId,title: viewcell.homeModel.albumMsgModel!.albumName,dataArray: dataArray, episodeNow: viewcell.homeModel.albumMsgModel!.episodeNow, result: {[weak self] listModel in
+        pickerView = CNLiveShortVideoContentListView.showVideoContentListView(aid: viewcell.homeModel.albumMsgModel!.albumId,pageNum: self.pageNum,title: viewcell.homeModel.albumMsgModel!.albumName,dataArray: dataArray, episodeNow: viewcell.homeModel.albumMsgModel!.episodeNow, result: {[weak self] listModel in
             guard let self = self else { return }
             let index = self.dataArray.index(of: listModel) as NSInteger
             self.playTheIndex(index: index)
+        }, reload: {[weak self] page in
+            guard let self = self else { return }
+            self.player.stopCurrentPlayingCell()
+            self.currentIndex = 0
+            self.pageNum = page
+            self.requestData { noMore in
+                self.pickerView.tableView.mj_footer?.endRefreshing()
+                if noMore {
+                    self.pickerView.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                }
+            }
         })
     }
     func payActionMethod(viewcell: CNLiveShortVideoListTableViewCell, button: UIButton) {
@@ -10,7 +10,7 @@ import MJRefresh
 import EmptyDataSet_Swift
  
 typealias CloseVideoListResultBlock = (_ listModel: Any) ->Void
-typealias ReloadVideoListResultBlock = (_ dataArray: NSMutableArray) ->Void
+typealias ReloadVideoListResultBlock = (_ page: NSInteger) ->Void
 class CNLiveShortVideoContentListView: UIView, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate {
  
     lazy var grayMaskView: UIView = {
@@ -133,45 +133,41 @@ class CNLiveShortVideoContentListView: UIView, UITableViewDelegate, UITableViewD
         self.tableView.mj_footer = footerRefreshView
     }
  
-    func setupWithDataSource(title: String,dataArray: NSMutableArray,episodeNow: String) {
-        dataSource = dataArray
-        if Int(episodeNow) == dataArray.count {
-            self.tableView.mj_footer?.endRefreshingWithNoMoreData()
-        } else {
-            self.pageNum = dataArray.count / 10
-        }
-        titleLabel.text = "\(title)·\(episodeNow)集"
-        self.tableView.reloadData()
-    }
+
  
     func requestData() {
-        CNLiveShortVideoViewModel.requstWithShortVideo(aid: self.aid, page: self.pageNum) { [weak self] result, respStatue in
-            guard let self = self else { return }
-            if respStatue == .success {
-                let listArray = (result as! [Any]).first as! [CNLiveAlbumListModel]
-                self.dataSource.addObjects(from: listArray)
-                if self.tableView.mj_footer != nil {
-                    self.tableView.mj_footer?.endRefreshing()
-                }
-                self.tableView.reloadData()
-                let hasNextPage = (result as! [Any])[1] as! Bool
-                if listArray.count == 0 {
-                    if !hasNextPage {
-                        self.tableView.mj_footer?.endRefreshingWithNoMoreData()
-                        self.tableView.reloadData()
-                    }
-                }
-            } else {
-                if self.tableView.mj_footer != nil {
-                    self.tableView.mj_footer?.endRefreshing()
-                }
-                self.tableView.contentOffset = CGPoint.zero
-                self.tableView.refreshControl?.endRefreshing()
-                if self.dataSource.count == 0 {
-                    self.tableView.reloadEmptyDataSet()
-                }
-            }
-        }
+        self.reloadBlock(self.pageNum)
+//        CNLiveShortVideoViewModel.requstWithShortVideo(aid: self.aid, page: self.pageNum) { [weak self] result, respStatue in
+//            guard let self = self else { return }
+//            if respStatue == .success {
+//                let listArray = (result as! [Any]).first as! [CNLiveAlbumListModel]
+//                self.dataSource.addObjects(from: listArray)
+//                let urlArray = (result as! [Any]).last as! [String]
+//                if listArray.count > 0 {
+//                    self.reloadBlock(NSMutableArray(array: listArray), NSMutableArray(array: urlArray), self.pageNum)
+//                }
+//                if self.tableView.mj_footer != nil {
+//                    self.tableView.mj_footer?.endRefreshing()
+//                }
+//                self.tableView.reloadData()
+//                let hasNextPage = (result as! [Any])[1] as! Bool
+//                if listArray.count == 0 {
+//                    if !hasNextPage {
+//                        self.tableView.mj_footer?.endRefreshingWithNoMoreData()
+//                        self.tableView.reloadData()
+//                    }
+//                }
+//            } else {
+//                if self.tableView.mj_footer != nil {
+//                    self.tableView.mj_footer?.endRefreshing()
+//                }
+//                self.tableView.contentOffset = CGPoint.zero
+//                self.tableView.refreshControl?.endRefreshing()
+//                if self.dataSource.count == 0 {
+//                    self.tableView.reloadEmptyDataSet()
+//                }
+//            }
+//        }
     }
  
     required init?(coder: NSCoder) {
@@ -186,11 +182,13 @@ class CNLiveShortVideoContentListView: UIView, UITableViewDelegate, UITableViewD
         removeFromSuperview()
     }
  
-    static public func showVideoContentListView(aid: String,title: String,dataArray: NSMutableArray,episodeNow: String ,result: @escaping CloseVideoListResultBlock) {
+    static public func showVideoContentListView(aid: String, pageNum: NSInteger,title: String,dataArray: NSMutableArray,episodeNow: String ,result: @escaping CloseVideoListResultBlock, reload: @escaping ReloadVideoListResultBlock) -> CNLiveShortVideoContentListView {
  
         let pickerView = CNLiveShortVideoContentListView.init(frame: CGRect.zero)
         pickerView.aid = aid
+        pickerView.pageNum = pageNum
         pickerView.resultBlock = result
+        pickerView.reloadBlock = reload
         pickerView.setupWithDataSource(title: title,dataArray: dataArray,episodeNow: episodeNow)
  
         let delegate = UIApplication.shared.delegate as! AppDelegate
@@ -203,6 +201,23 @@ class CNLiveShortVideoContentListView: UIView, UITableViewDelegate, UITableViewD
         UIView.animate(withDuration: 0.1) {
             pickerView.alpha = 1
         } completion: { _ in}
+        return pickerView
+    }
+    
+    func setupWithDataSource(title: String,dataArray: NSMutableArray,episodeNow: String) {
+        dataSource = dataArray
+        if Int(episodeNow) == dataArray.count {
+            self.tableView.mj_footer?.endRefreshingWithNoMoreData()
+        } else {
+            self.pageNum = dataArray.count / 10
+        }
+        titleLabel.text = "\(title)·\(episodeNow)集"
+        self.tableView.reloadData()
+    }
+    
+    public func setupWithArray(dataArray: NSMutableArray) {
+        dataSource = dataArray
+        self.tableView.reloadData()
     }
  
 }