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

合并代码

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

@@ -181,7 +181,7 @@ class MVHomeController: MVBaseController {
         }
 
         // 播放器进度和状态回调
-        PQSingletoVideoPlayer.shared.progressBloc = { [weak self] loadProgress, playProgress, duration in
+        PQSingletoVideoPlayer.shared.progressBloc = { [weak self] _, playProgress, duration in
 
             BFLog(message: "duration \(duration) playProgress\(playProgress) \(duration) 进度\(playProgress / duration)")
             let cell: MVBannerCell? = self?.viewListView.collectionView.cellForItem(at: self?.lastBnnerSelectIndex ?? IndexPath()) as? MVBannerCell
@@ -192,17 +192,15 @@ 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)
+                if (self?.lastBnnerSelectIndex.row ?? 0) < (self?.mAllVideos.count ?? 0) {
+                    self?.lastBnnerSelectIndex = IndexPath(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: "已经是最后一个视频。")}
+                } else { BFLog(message: "已经是最后一个视频。") }
             }
         }
         // 添加协议
@@ -407,7 +405,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 {

MusicVideoPlus/MusicVideoPlus/Classes/Modules/Login/Controllers/MVLoginController.swift

@@ -254,8 +254,9 @@ extension MVLoginController: ASAuthorizationControllerDelegate, ASAuthorizationC
                     cShowHUB(superView: nil, msg: "登录失败，请重试~")
                 } else {
                     cShowHUB(superView: nil, msg: "登录成功")
-                    self?.dismiss(animated: true, completion: nil)
-                    postNotification(name: cLoginSuccesssNotiKey)
+                    self?.dismiss(animated: true, completion: {
+                        postNotification(name: cLoginSuccesssNotiKey)
+                    })
                 }
             }
         }

MusicVideoPlus/MusicVideoPlus/Classes/Modules/Login/Controllers/PQBandingPhoneController.swift

@@ -189,7 +189,7 @@ class PQBandingPhoneController: PQPhoneLoginController {
             saveUserDefaults(key: cUpdatePhone, value: self?.phoneTextField.text ?? "")
             BFLoginUserInfo.shared.phoneNumber = self?.phoneTextField.text ?? ""
             cShowHUB(superView: nil, msg: "手机号绑定成功")
-            self?.navigationController?.popToRootViewController(animated: true)
+            self?.navigationController?.viewControllers = [ (self?.navigationController?.viewControllers.first)!]
             postNotification(name: cBandingPhoneSuccessKey)
 //            if isSuccess {
 //                PQMineViewModel.updatePhone(phoneNumber: self?.phoneTextField.text ?? "") { isSuccess, msg in

MusicVideoPlus/MusicVideoPlus/Classes/Modules/Login/Controllers/PQPhoneLoginController.swift

@@ -150,8 +150,9 @@ class PQPhoneLoginController: MVBaseController {
                 cShowHUB(superView: (self?.view)!, msg: "登录失败，请重试~")
             } else {
                 cShowHUB(superView: nil, msg: "登录成功")
-                self?.dismiss(animated: true, completion: nil)
-                postNotification(name: cLoginSuccesssNotiKey)
+                self?.dismiss(animated: true, completion: {
+                    postNotification(name: cLoginSuccesssNotiKey)
+                })
             }
         }
     }

MusicVideoPlus/Podfile

@@ -7,7 +7,7 @@ target 'MusicVideoPlus' do
   pod "BFFramework" ,:git => 'https://git.yishihui.com/iOS/BFFramework.git'
   # 使用本地路径
   # pod 'BFFramework', :path => '/Users/ak/Desktop/BFFramework/'
-  pod 'BFFramework', :path => '/Users/sanw/Desktop/BytesFlow/Projects/BFFramework/'
+#  pod 'BFFramework', :path => '/Users/sanw/Desktop/BytesFlow/Projects/BFFramework/'
 
   pod 'JWTDecode','2.6.0' # Apple登陆校验库
   pod 'TYAttributedLabel','2.6.9' #  富文本