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

合并代码

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

@@ -77,9 +77,9 @@ class MVHomeController: MVBaseController {
     var mVideos: Array = Array<MVHotVideoModel>.init()
 
     var mAllVideos: Array = Array<PQVideoListModel>.init()
-    var lastBnnerSelectIndex: IndexPath = IndexPath.init(row: 0, section: 0)
-    //是否点击的再创作
-    var isCreateVideo:Bool = false
+    var lastBnnerSelectIndex: IndexPath = IndexPath(row: 0, section: 0)
+    // 是否点击的再创作
+    var isCreateVideo: Bool = false
     deinit {
         PQNotification.removeObserver(self)
     }
@@ -140,7 +140,7 @@ class MVHomeController: MVBaseController {
                 BFLog(message: " self?.mAllVideos count is \(String(describing: self?.mAllVideos.count))")
             }
             self?.viewListView.reloadData()
-            //自动播放第一个视频 确保 reloaddata 完成
+            // 自动播放第一个视频 确保 reloaddata 完成
             self?.playVideo(page: 0)
         }
     }
@@ -319,7 +319,7 @@ class MVHomeController: MVBaseController {
 
     // 再创作视频
     func createVideo(indexPath: IndexPath) {
-        if(enableLogin() && mAllVideos.count > indexPath.row){
+        if enableLogin() && mAllVideos.count > indexPath.row {
             PQStuckPointViewModel.stuckPointProjectMusicInfo(projectId: mAllVideos[indexPath.row].reCreateVideoData?.projectId ?? "") { musicData, _ in
                 if musicData != nil {
                     let vc = PQStuckPointMaterialController()
@@ -340,7 +340,6 @@ extension MVHomeController: MVBannerDataSource, MVBannerDelegate {
 
     func banner(_ banner: MVBanner, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell: MVBannerCell = banner.dequeueReusableCell(for: indexPath)
- 
         cell.videoData = mAllVideos[indexPath.row]
         cell.reCreateBtnClicHandle = { [weak self] _, _ in
             BFLog(message: "点击了创同款")
@@ -359,7 +358,7 @@ extension MVHomeController: MVBannerDataSource, MVBannerDelegate {
         controlPlayrPasueOrResume(isPause: PQSingletoVideoPlayer.shared.isPlaying)
     }
 
-    func playVideo(page: Int){
+    func playVideo(page: Int) {
         DispatchQueue.main.async {
             let cell: MVBannerCell? = self.viewListView.collectionView.cellForItem(at: IndexPath(row: page, section: 0)) as? MVBannerCell
             let showProtocal: String? = getUserDefaults(key: cShowProtocal) as? String
@@ -367,7 +366,7 @@ extension MVHomeController: MVBannerDataSource, MVBannerDelegate {
                 cell?.pauseView.isHidden = true
                 let videoInfo = self.mAllVideos[page]
                 videoInfo.playProgress = 0
-                PQSingletoVideoPlayer.shared.configPlyer(videoData:videoInfo, controllerView: cell!.converView)
+                PQSingletoVideoPlayer.shared.configPlyer(videoData: videoInfo, controllerView: cell!.converView)
 
                 let hotVideoIndex = self.mVideos.firstIndex(where: { (items) -> Bool in
                     items.categoryName == videoInfo.categoryName
@@ -389,7 +388,6 @@ extension MVHomeController: MVBannerDataSource, MVBannerDelegate {
                 BFLog(message: "播放不成功: cell:\(String(describing: cell)) mVideos:\(self.mVideos.count) showProtocal: is \(String(describing: showProtocal))")
             }
         }
-
     }
  
     //控制播放器的暂停或恢复
@@ -456,6 +454,5 @@ extension MVHomeController: UICollectionViewDelegate, UICollectionViewDataSource
         DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.1) {
             self.playVideo(page: videosCount)
         }
- 
     }
 }