记录上次播放的是哪集直接播放

“张旭”
1 parent 36115f60
Showing 2 changed files with 23 additions and 16 deletions
metaCode/Classes/Main/VideoPage/Controller/CNLiveShortVideoViewController.swift
metaCode/Classes/Other/AppDelegate.swift
@@ -116,8 +116,11 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         self.isSelectable = false
         self.currentIndex = currentIndex
         super.init(nibName:nil, bundle:nil)
-        let page = self.roundUpToNearestTen(currentIndex)
-        self.pageNum = page/10
+        var page = (self.roundUpToNearestTen(currentIndex))/10
+        if page == 0 {
+            page = 1
+        }
+        self.pageNum = page
     }
@@ -131,6 +134,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         self.player.currentPlayerManager.play()
+        self.player.scrollView?.setContentOffset(CGPoint(x: 0, y:CGFloat(self.currentIndex!)*KSreenHeight), animated: true)//校正偏移量
     }
     override func viewWillDisappear(_ animated: Bool) {
@@ -161,6 +165,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         player.allowOrentitaionRotation = false
         player.isWWANAutoPlay = true
         player.playerDisapperaPercent = 1.0
+        player.scrollView?.isPagingEnabled = true
         player.playerReadyToPlay = {[weak self] asset, assetURL in
             guard let self = self else { return }
             self.controlView.videoPlayer((self.player)!, currentTime: self.player.currentTime, totalTime: self.player.totalTime)
@@ -239,15 +244,15 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
     }
     func requestData(resultBlock: @escaping (_ noMore: Bool) -> Void) {
-        CNLiveShortVideoViewModel.requstWithShortVideo(aid: self.aid, page: self.pageNum) { [weak self] result, respStatue in
+        CNLiveShortVideoViewModel.requstWithShortVideo(aid: self.aid, page: self.pageNum, pageSize: "10") { [weak self] result, respStatue in
             guard let self = self else { return }
             if respStatue == .success {
                 if self.pageNum == 1 {
                     self.dataArray.removeAllObjects()
                     self.dataURLArray.removeAllObjects()
-                    if self.currentIndex == 0 {
-                        self.tableView.setContentOffset(CGPoint.zero, animated: false)
-                    }
+//                    if self.currentIndex == 0 {
+//                        self.tableView.setContentOffset(CGPoint.zero, animated: false)
+//                    }
                 }
                 let listArray = (result as! [Any]).first as! [CNLiveAlbumListModel]
                 self.dataArray.addObjects(from: listArray)
@@ -261,11 +266,9 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
                 }
                 self.tableView.refreshControl?.endRefreshing()
                 self.tableView.reloadData()
-                if self.pageNum == 1 {
-                    DispatchQueue.main.async {
-                        self.tableView.contentOffset = CGPoint.zero
-                    }
-                }
+//                if self.pageNum == 1 {
+//                    self.tableView.contentOffset = CGPoint.zero
+//                }
                 let hasNextPage = (result as! [Any])[1] as! Bool
                 if listArray.count == 0 && urlArray.count == 0 {
                     if !hasNextPage {
@@ -279,11 +282,15 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
                         self.tableView.mj_footer = footerRefreshView
                     }
                 }
-                if self.pageNum == 1 {
-                    self.playTheIndex(index: self.currentIndex)
-                } else {
-                    self.playTheIndex(index: (self.pageNum - 1)*10)
+                
+                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 {
                 if self.tableView.mj_footer != nil {
                     self.tableView.mj_footer?.endRefreshing()
@@ -18,7 +18,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+    func application(_ appUITableViewRowDatalication: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         //tencentAppId  wxAppId