Merge branch 'dev' of https://git.yishihui.com/iOS/MusicVideoPlus into dev

MusicVideoPlus/MusicVideoPlus/Classes/Modules/Home/Controllers/MVHomeController.swift

@@ -192,11 +192,18 @@ class MVHomeController: MVBaseController {
 
             // 播放完成 自动播放下一个
             if status == .PQVIDEO_PLAY_STATUS_END {
-//                PQSingletoVideoPlayer.shared.playVideoData!.playProgress = 0
-//                if((self?.lastBnnerSelectIndex.row ?? 0) < (self?.mAllVideos.count ?? 0)){
-//                    self?.lastBnnerSelectIndex = IndexPath.init(row: (self?.lastBnnerSelectIndex.row ?? 0) + 1, section: 0)
-//                    self?.playVideo(page: (self?.lastBnnerSelectIndex ?? IndexPath(row: 0, section: 0)).row)
-//                }else{BFLog(message: "已经是最后一个视频。")}
+                PQSingletoVideoPlayer.shared.playVideoData!.playProgress = 0
+                if((self?.lastBnnerSelectIndex.row ?? 0) < (self?.mAllVideos.count ?? 0)){
+                    self?.lastBnnerSelectIndex = IndexPath.init(row: (self?.lastBnnerSelectIndex.row ?? 0) + 1, section: 0)
+                    self?.playVideo(page: (self?.lastBnnerSelectIndex ?? IndexPath(row: 0, section: 0)).row)
+                    
+                    
+                    //视频列表跳转
+                    self?.viewListView.currentIndex = (self?.lastBnnerSelectIndex ?? IndexPath(row: 0, section: 0)).row
+                    self?.viewListView.scrollToItem(at: (self?.lastBnnerSelectIndex ?? IndexPath(row: 0, section: 0)).row, animated: false)
+
+
+                }else{BFLog(message: "已经是最后一个视频。")}
             }
         }
         // 添加协议
@@ -391,7 +398,7 @@ extension MVHomeController {
                     items.categoryName == videoInfo.categoryName
                 })
 
-                BFLog(message: "播放的视频分类为:\(String(describing: self.mVideos[hotVideoIndex ?? 0].categoryName)) page is :\(page)")
+                BFLog(message: "播放的视频分类为:\(String(describing: self.mVideos[hotVideoIndex ?? 0].categoryName)) hotVideoIndex :\(String(describing: hotVideoIndex)) page is \(page)")
                 // 设置选中状态
                 for hot in self.mVideos {
                     hot.isSelected = false
@@ -400,7 +407,7 @@ extension MVHomeController {
 
                 self.categoryCollectionView.reloadData()
                 self.categoryCollectionView.scrollToItem(at: IndexPath(row: hotVideoIndex ?? 0, section: 0), at: .centeredHorizontally, animated: true)
-
+                
                 self.lastBnnerSelectIndex = IndexPath(row: page, section: 0)
 
             } else {