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

MusicVideoPlus.xcodeproj/project.pbxproj

@@ -470,9 +470,7 @@
 				418532292665342100DCA2C1 /* Frameworks */,
 				4185322A2665342100DCA2C1 /* Resources */,
 				3115904EEDD5A7932018A62B /* [CP] Embed Pods Frameworks */,
- 
 				F8C0D8A7D78D2E760511A0B1 /* [CP] Copy Pods Resources */,
- 
 			);
 			buildRules = (
 			);
@@ -569,9 +567,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MusicVideoPlus/Pods-MusicVideoPlus-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
- 
 		F8C0D8A7D78D2E760511A0B1 /* [CP] Copy Pods Resources */ = {
- 
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -752,7 +748,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = MusicVideoPlus/MusicVideoPlus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 40;
 				DEVELOPMENT_TEAM = UH52C8A7SN;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = MusicVideoPlus/Info.plist;
@@ -761,9 +757,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
- 
 				MARKETING_VERSION = 1.1.0;
- 
 				PRODUCT_BUNDLE_IDENTIFIER = com.piaoquan.shanyin;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "MusicVideoPlus/MusicVideoPlus-Bridging-Header.h";
@@ -781,7 +775,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = MusicVideoPlus/MusicVideoPlus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 40;
 				DEVELOPMENT_TEAM = UH52C8A7SN;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = MusicVideoPlus/Info.plist;
@@ -790,9 +784,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
- 
 				MARKETING_VERSION = 1.1.0;
- 
 				PRODUCT_BUNDLE_IDENTIFIER = com.piaoquan.shanyin;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "MusicVideoPlus/MusicVideoPlus-Bridging-Header.h";

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

@@ -354,8 +354,9 @@ class MVHomeController: MVBaseController {
             isJumpToLogin = true
             addNotification(self, selector: #selector(loginSuccesss), name: cLoginSuccesssNotiKey, object: nil)
             let vc = MVLoginController()
-            vc.modalPresentationStyle = .fullScreen
-            present(vc, animated: true, completion: nil)
+            let navigationController: UINavigationController = UINavigationController(rootViewController: vc)
+            navigationController.modalPresentationStyle = .fullScreen
+            present(navigationController, animated: true, completion: nil)
             return
         }
 
@@ -405,7 +406,7 @@ class MVHomeController: MVBaseController {
 
         case 3:
             let nav = UINavigationController(rootViewController: PQStuckPointMaterialController())
-            nav.modalPresentationStyle = .overFullScreen
+            nav.modalPresentationStyle = .fullScreen
             present(nav, animated: true, completion: nil)
             // 关闭视频播放
             controlPlayrPasueOrResume(isPause: true)
@@ -430,7 +431,7 @@ class MVHomeController: MVBaseController {
 
     // 卡点模块消失
     @objc func stuckPointDismiss() {
-        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 1) { [weak self] in
+        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.01) { [weak self] in
             self?.controlPlayrPasueOrResume(isPause: false)
         }
     }
@@ -485,8 +486,9 @@ extension MVHomeController {
                    
 
                     PQSingletoVideoPlayer.shared.configPlyer(videoData: videoInfo, controllerView: cell!.converView)
-                       
-                    PQSingletoVideoPlayer.shared.startPlayr()
+                
+                    
+                    self.controlPlayrPasueOrResume(isPause: false)
            
 
                 } else {
@@ -510,7 +512,7 @@ extension MVHomeController {
                 rootViewController = (rootViewController as? UINavigationController)?.visibleViewController
             }
             BFLog(message: "rootViewController is \(rootViewController)")
-            if rootViewController is MVHomeController && cell != nil && cell?.videoData != nil{
+            if  cell != nil && cell?.videoData != nil{
                 cell?.pauseView.isHidden = true
                 PQSingletoVideoPlayer.shared.configPlyer(videoData: (cell?.videoData)!, controllerView: cell!.converView)
                 PQSingletoVideoPlayer.shared.startPlayr()

MusicVideoPlus/Classes/Modules/Setting/Controllers/MVSettingController.swift

@@ -17,7 +17,7 @@ class MVSettingController: MVBaseController{
         let infoDictionary = Bundle.main.infoDictionary
          
         let majorVersion :String = infoDictionary! ["CFBundleShortVersionString"] as! String//主程序版本号
-        tipsA.text = "APP版本号V\(majorVersion)"
+        tipsA.text = "APP版本号\nV\(majorVersion)"
         tipsA.lineBreakMode = .byWordWrapping
         tipsA.textAlignment = .center
         tipsA.numberOfLines = 0
@@ -97,7 +97,7 @@ class MVSettingController: MVBaseController{
     func addLayout() {
         
         tipsA.snp.remakeConstraints { make in
-            make.width.equalTo(146)
+            make.width.equalTo(182)
             make.height.equalTo(160)
             make.centerX.equalToSuperview()
             make.top.equalToSuperview().offset(313)