取消跳转到指定集数的动画

“张旭”
1 parent 664d0a90
Showing 1 changed file with 16 additions and 18 deletions
metaCode/Classes/Main/VideoPage/Controller/CNLiveShortVideoViewController.swift
@@ -227,11 +227,6 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         }
  
         super.init(nibName:nil, bundle:nil)
-        var page = (self.roundUpToNearestTen(currentIndex))/10
-        if page == 0 {
-            page = 1
-        }
-        self.pageNum = page
         self.slideModel = slideModel
     }
  
@@ -249,7 +244,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
  
         }else{
             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                self.player.scrollView?.setContentOffset(CGPoint(x: 0, y:CGFloat(self.currentIndex!)*KSreenHeight), animated: true)//校正偏移量
+                self.player.scrollView?.setContentOffset(CGPoint(x: 0, y:CGFloat(self.currentIndex!)*KSreenHeight), animated: false)//校正偏移量
             }
         }
     }
@@ -309,18 +304,21 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         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)
+            
             let index = self.dataURLArray.index(of: assetURL.absoluteString)
-            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()
+            if index < 10000{//防止出现取不到值,为int最大值情况
+                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{
+                    
                 }
-            }else{
-                
             }
         }
         // 更新另一个控制层的时间
@@ -353,7 +351,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             }
  
             let indexPath = IndexPath(row: self.currentIndex, section: 0)
-            self.player.scrollView?.setContentOffset(CGPoint(x: 0, y:CGFloat(self.currentIndex)*KSreenHeight), animated: true)//校正偏移量
+            self.player.scrollView?.setContentOffset(CGPoint(x: 0, y:CGFloat(self.currentIndex)*KSreenHeight), animated: false)//校正偏移量
             self.playVideo(at: indexPath as IndexPath)
             //开始播放调用recordApi/end
             let data: CNLiveAlbumListModel = dataArray[indexPath.row] as! CNLiveAlbumListModel
@@ -461,7 +459,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             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)//校正偏移量
+                self.player.scrollView?.setContentOffset(CGPoint(x: 0, y:CGFloat(self.currentIndex!)*KSreenHeight), animated: false)//校正偏移量
             }
         }
     }
@@ -693,7 +691,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
         let indexPath = IndexPath(row: index, section: 0)
         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.player.scrollView?.setContentOffset(CGPoint(x: 0, y:CGFloat(index)*KSreenHeight), animated: false)//校正偏移量
             self.playVideo(at: IndexPath(row: index, section: 0))
         }