1.修改部分bug

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

@@ -24,9 +24,7 @@ class MVHomeController: MVBaseController {
         stuckPointBtn.adjustsImageWhenHighlighted = false
         stuckPointBtn.tag = 2000
         stuckPointBtn.backgroundColor = UIColor.hexColor(hexadecimal: "#3DC1C1")
-
         stuckPointBtn.addCorner(corner: 30)
-
         return stuckPointBtn
     }()
 
@@ -91,7 +89,9 @@ class MVHomeController: MVBaseController {
             let videoListModel = mAllVideos[lastBnnerSelectIndex.row]
             jumpToDetailVc(type: 2, videoData: videoListModel)
         } else {
-            jumpToDetailVc(type: 3)
+            DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.2) { [weak self] in
+                self?.jumpToDetailVc(type: 3)
+            }
         }
     }
 
@@ -102,13 +102,7 @@ class MVHomeController: MVBaseController {
 
     @objc func willEnterForeground() {
         BFLog(message: "进入到前台")
-        var rootViewController = UIApplication.shared.keyWindow?.rootViewController
-        if rootViewController is UINavigationController {
-            rootViewController = (rootViewController as? UINavigationController)?.visibleViewController
-        }
-        if rootViewController is MVHomeController {
-            controlPlayrPasueOrResume(isPause: false)
-        }
+        controlPlayrPasueOrResume(isPause: false)
     }
 
     override func viewWillAppear(_: Bool) {
@@ -309,11 +303,10 @@ class MVHomeController: MVBaseController {
         if BFLoginUserInfo.shared.phoneNumber.count <= 0 || BFLoginUserInfo.shared.phoneNumber == "<null>" {
             let remindView = PQBandingPhoneRemindView(frame: CGRect(x: 0, y: 0, width: cScreenWidth, height: cScreenHeigth))
             remindView.tag = cBandinPhoneTag
-            remindView.bandingPhoneRemindHandle = { [weak self] _ in
-//                if sender.tag == 2 {
-//                    addNotification(self!, selector: #selector(self?.loginSuccesss), name: cBandingPhoneSuccessKey, object: nil)
-//                    self?.navigationController?.pushViewController(PQBandingPhoneController(), animated: true)
-//                }
+            remindView.bandingPhoneRemindHandle = { [weak self] sender in
+                if sender.tag == 2 {
+                    self?.navigationController?.pushViewController(PQBandingPhoneController(), animated: true)
+                }
             }
             remindView.remindBlock = { [weak self] _, webUrl in
                 let detail = PQBaseWebViewController()
@@ -333,21 +326,20 @@ class MVHomeController: MVBaseController {
 
             PQStuckPointViewModel.stuckPointProjectMusicInfo(projectId: videoData?.reCreateVideoData?.projectId ?? "") { [weak self] musicData, _ in
                 if musicData != nil {
-                    // 关闭视频播放
-                    self?.controlPlayrPasueOrResume(isPause: true)
                     let vc = PQStuckPointMaterialController()
                     vc.reCreateMusicData = musicData
                     self?.navigationController?.pushViewController(vc, animated: true)
+                    // 关闭视频播放
+                    self?.controlPlayrPasueOrResume(isPause: true)
                 } else { BFLog(message: "musicData is ni") }
             }
 
         case 3:
-            // 关闭视频播放
-            controlPlayrPasueOrResume(isPause: true)
             let nav = UINavigationController(rootViewController: PQStuckPointMaterialController())
             nav.modalPresentationStyle = .overFullScreen
             present(nav, animated: true, completion: nil)
-
+            // 关闭视频播放
+            controlPlayrPasueOrResume(isPause: true)
         default:
             break
         }
@@ -366,7 +358,9 @@ class MVHomeController: MVBaseController {
 
     // 卡点模块消失
     @objc func stuckPointDismiss() {
-        controlPlayrPasueOrResume(isPause: false)
+        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.5) { [weak self] in
+            self?.controlPlayrPasueOrResume(isPause: false)
+        }
     }
 }
 
@@ -414,8 +408,14 @@ extension MVHomeController {
             cell?.pauseView.isHidden = false
             PQSingletoVideoPlayer.shared.pausePlayer()
         } else {
-            cell?.pauseView.isHidden = true
-            PQSingletoVideoPlayer.shared.resumePlayer()
+            var rootViewController = UIApplication.shared.keyWindow?.rootViewController
+            if rootViewController is UINavigationController {
+                rootViewController = (rootViewController as? UINavigationController)?.visibleViewController
+            }
+            if rootViewController is MVHomeController {
+                cell?.pauseView.isHidden = true
+                PQSingletoVideoPlayer.shared.resumePlayer()
+            }
         }
     }
 }

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

@@ -186,22 +186,26 @@ class PQBandingPhoneController: PQPhoneLoginController {
             return
         }
         PQMineViewModel.checkIndetifyCode(phoneNumber: phoneTextField.text ?? "", codeId: codeId ?? "", indetifyCode: passTextField.text ?? "") { [weak self] isSuccess, msg in
-
-            if isSuccess {
-                PQMineViewModel.updatePhone(phoneNumber: self?.phoneTextField.text ?? "") { isSuccess, msg in
-                    if isSuccess {
-                        saveUserDefaults(key: cUpdatePhone, value: self?.phoneTextField.text ?? "")
-                        BFLoginUserInfo.shared.phoneNumber = self?.phoneTextField.text ?? ""
-                        cShowHUB(superView: nil, msg: "手机号绑定成功")
-                        self?.navigationController?.popToRootViewController(animated: true)
-                        postNotification(name: cBandingPhoneSuccessKey)
-                    } else {
-                        cShowHUB(superView: nil, msg: msg)
-                    }
-                }
-            } else {
-                cShowHUB(superView: nil, msg: msg)
-            }
+            saveUserDefaults(key: cUpdatePhone, value: self?.phoneTextField.text ?? "")
+            BFLoginUserInfo.shared.phoneNumber = self?.phoneTextField.text ?? ""
+            cShowHUB(superView: nil, msg: "手机号绑定成功")
+            self?.navigationController?.popToRootViewController(animated: true)
+            postNotification(name: cBandingPhoneSuccessKey)
+//            if isSuccess {
+//                PQMineViewModel.updatePhone(phoneNumber: self?.phoneTextField.text ?? "") { isSuccess, msg in
+//                    if isSuccess {
+//                        saveUserDefaults(key: cUpdatePhone, value: self?.phoneTextField.text ?? "")
+//                        BFLoginUserInfo.shared.phoneNumber = self?.phoneTextField.text ?? ""
+//                        cShowHUB(superView: nil, msg: "手机号绑定成功")
+//                        self?.navigationController?.popToRootViewController(animated: true)
+//                        postNotification(name: cBandingPhoneSuccessKey)
+//                    } else {
+//                        cShowHUB(superView: nil, msg: msg)
+//                    }
+//                }
+//            } else {
+//                cShowHUB(superView: nil, msg: msg)
+//            }
         }
     }
 }