完善横竖屏点播页限制录屏逻辑

push点播页时增加loading ,防止多次点击深色模式--点播页详情展开黑色问题 ,tabbar边缘黑色问题

完善横竖屏点播页限制录屏逻辑
push点播页时增加loading ,防止多次点击深色模式--点播页详情展开黑色问题 ,tabbar边缘黑色问题
“张旭”
1 parent 925cdc0d
Showing 11 changed files with 142 additions and 30 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
metaCode/Classes/Config/CNLiveConfigMacro.swift
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
metaCode/Classes/Main/HuBiLieHomePage/Util/CNLiveDownSlideTool.swift
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Home/CNLiveHomeADCell.swift
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Home/CNLiveHomeOneBigTwoSmallCell.swift
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Home/CNLiveHomeTwoDuanjuCell.swift
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Home/CNLiveHomeYingshiBannerCell.swift
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Lanmu/CNLiveHomeLanmuThreeImgCell.swift
metaCode/Classes/Other/AppDelegate.swift
@@ -2956,7 +2956,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.6.25.04.24.19;
+				CURRENT_PROJECT_VERSION = 1.1.7.25.04.25.16;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -3029,7 +3029,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.6;
+				MARKETING_VERSION = 1.1.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -3212,7 +3212,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.6.25.04.24.19;
+				CURRENT_PROJECT_VERSION = 1.1.7.25.04.25.16;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -3284,7 +3284,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.6;
+				MARKETING_VERSION = 1.1.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -81,8 +81,8 @@ class CNLiveBaseTabBarViewController: UITabBarController
         if #available(iOS 13.0, *) {
             let appearance: UITabBarAppearance = UITabBarAppearance.init()
             appearance.configureWithTransparentBackground()
-            appearance.backgroundColor = UIColor.clear
-            appearance.backgroundImage = UIImage(named: "tabbar_backgroup")
+            appearance.backgroundColor = UIColor.white
+//            appearance.backgroundImage = UIImage(named: "tabbar_backgroup")
             if #available(iOS 15.0, *) {
                 tabBar.scrollEdgeAppearance = appearance
             } else {
@@ -91,8 +91,8 @@ class CNLiveBaseTabBarViewController: UITabBarController
             }
         } else {
-            tabBar.backgroundColor = .clear
-            tabBar.backgroundImage = UIImage(named: "tabbar_backgroup")
+            tabBar.backgroundColor = .white
+//            tabBar.backgroundImage = UIImage(named: "tabbar_backgroup")
         }
     }
@@ -28,6 +28,7 @@ let keyWindow = UIApplication.shared.keyWindow
 let appDelegate = UIApplication.shared.delegate
 let userDefaults = UserDefaults.standard
 let notificationCenter = NotificationCenter.default
+let metaAppDelegate = UIApplication.shared.delegate as! AppDelegate
 // MARK: - 打印输出
@@ -168,10 +168,12 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
+        self.handleScreenCaptureChange()
         navigationController?.interactivePopGestureRecognizer?.isEnabled = false
     }
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
+        print("1111111viewDidDisappear:\(metaAppDelegate.isCaptured)")
         self.player.currentPlayerManager.pause()
         // 恢复手势识别
 //        self.navigationController?.interactivePopGestureRecognizer?.isEnabled = true
@@ -263,44 +265,112 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
     }
     @objc func appDidEnterBackground() {
-        self.player.currentPlayerManager.pause()
+        self.pausePlayerIfNeed()
     }
     @objc  func appDidEnterPlayGround() {
+        self.playPlayerIfNeed()
+    }
+    func pausePlayerIfNeed(){
+        //如果录屏中 或后台 暂停
+        self.player.currentPlayerManager.pause()
+    }
+    func playPlayerIfNeed(){
+        //如果没录屏 且 当前不是需要付费内容 可以播放
         if !self.currentPlayIsNeedPay{
             self.player.currentPlayerManager.play()
         }
     }
+    
     // 响应录屏状态变化
+//    func playHandleScreenCaptureChange(isFullScreen:Bool) {
+//        if isFullScreen{
+//            if metaAppDelegate.isCaptured {
+//                hidePrivacyProtection()
+//                
+//                let blurView = UIVisualEffectView(effect: UIBlurEffect(style: .regular))
+//                blurView.frame = self.controlView.landScapeControlView.bounds
+//                blurView.tag = 10001
+//                self.controlView.landScapeControlView.addSubview(blurView)
+//                
+//                let vc = self.controlView.landScapeControlView.viewController
+//                if let preVC = vc?.presentedViewController as? UIAlertController {
+//                    vc?.dismiss(animated: false)
+//                }
+//                // 显示警告提示
+//                let alert = UIAlertController(
+//                    title: "录屏已开启",
+//                    message: "当前功能禁止屏幕录制",
+//                    preferredStyle: .alert
+//                )
+//                vc?.present(alert, animated: false)
+//            } else {
+//                hidePrivacyProtection()
+//            }
+//           
+//        }else{
+//            self.handleScreenCaptureChange()
+//        }
+//        
+//    }
     @objc private func handleScreenCaptureChange() {
-        if UIScreen.main.isCaptured {
+        if metaAppDelegate.isCaptured {
             showPrivacyProtection()
-            self.player.allowOrentitaionRotation = false
         } else {
             hidePrivacyProtection()
-            self.player.allowOrentitaionRotation = true
         }
     }
     // 显示保护层（模糊效果）
     private func showPrivacyProtection() {
-        let blurView = UIVisualEffectView(effect: UIBlurEffect(style: .regular))
-        blurView.frame = view.bounds
-        view.addSubview(blurView)
+        self.hidePrivacyProtection()
+        
+        if self.player.isFullScreen{
+            //全屏 横屏
+            let blurView = UIVisualEffectView(effect: UIBlurEffect(style: .regular))
+            blurView.frame = self.controlView.landScapeControlView.bounds
+            blurView.tag = 10001
+            self.controlView.landScapeControlView.addSubview(blurView)
+            
+            let vc = self.controlView.landScapeControlView.viewController
+            if let preVC = vc?.presentedViewController as? UIAlertController {
+                vc?.dismiss(animated: false)
+            }
+            // 显示警告提示
+            let alert = UIAlertController(
+                title: "录屏已开启",
+                message: "当前功能禁止屏幕录制",
+                preferredStyle: .alert
+            )
+            vc?.present(alert, animated: false)
+        }else{
+            //竖屏
+            let blurView = UIVisualEffectView(effect: UIBlurEffect(style: .regular))
+            blurView.frame = view.bounds
+            blurView.tag = 10001
+            view.addSubview(blurView)
+            
+            // 显示警告提示
+            let alert = UIAlertController(
+                title: "录屏已开启",
+                message: "当前功能禁止屏幕录制",
+                preferredStyle: .alert
+            )
+            present(alert, animated: false)
+        }
-        // 显示警告提示
-        let alert = UIAlertController(
-            title: "录屏已开启",
-            message: "当前功能禁止屏幕录制",
-            preferredStyle: .alert
-        )
-        present(alert, animated: true)
     }
     // 移除保护层
     private func hidePrivacyProtection() {
-        view.subviews
-            .filter { $0 is UIVisualEffectView }
-            .forEach { $0.removeFromSuperview() }
-        dismiss(animated: true) {}
+        view.viewWithTag(10001)?.removeFromSuperview()
+        self.controlView.landScapeControlView.viewWithTag(10001)?.removeFromSuperview()
+        if let preVC = self.presentedViewController as? UIAlertController {
+            self.dismiss(animated: false)
+        }
+        
+        let vc = self.controlView.landScapeControlView.viewController
+        if let preVC = vc?.presentedViewController as? UIAlertController {
+            vc?.dismiss(animated: false)
+        }
     }
@@ -414,7 +484,8 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
         self.player.orientationDidChanged = {[weak self] player,isFullScreen in
             guard let self = self else { return }
-            
+            self.handleScreenCaptureChange()
+//            self.playHandleScreenCaptureChange(isFullScreen: isFullScreen)
         }
         var endAssetURL:URL?
         /// 播放完成
@@ -1674,6 +1745,7 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
         let descLbl = UITextView()
         descLbl.font = Font_13
+        descLbl.backgroundColor = .white
         descLbl.textColor = HexColor("#999999")
         descLbl.text = vodMdl.desc
         descLbl.width = KSreenWidth-20
@@ -13,7 +13,7 @@ typealias downSlideVodResultBlock = (_ vodPlayModel:CNLiveVodPlayModel,_ content
 class CNLiveDownSlideTool:NSObject{
     class func pushWebVCWithContentsMdl(model:String,contentId:String,pid:String,shareUrl:String,thirdUrl:String,title:String,s_to:String,trailerId:String,controller:UIViewController?,slideModel:CNLiveDownSlideModel?){//contentMdl:CNLiveDownSlideContentsModel
-        
+        showLoading(message: "")
         if (model == kCNDownSlideContentsModelModel1) {
             let queryItem = URLQueryItem(name: "contentId", value: contentId)
@@ -28,6 +28,7 @@ class CNLiveDownSlideTool:NSObject{
             }else{
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             }
+            hiddenLoading()
         }else if (model == kCNDownSlideContentsModelModel2){
             let queryItem = URLQueryItem(name: "contentId", value: contentId)
@@ -44,6 +45,7 @@ class CNLiveDownSlideTool:NSObject{
             }else{
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             }
+            hiddenLoading()
         }else if (model == kCNDownSlideContentsModelModel3) || (model == kCNDownSlideContentsModelModel4){
             let webVC = CNWebViewController()
 //            webVC.url = URL(string: "http://wjjh5.cnlive.com/cnBlockMore.html?channelName=yjzg&pageId=&isShowTitle=true&blockType=28&contentType=13&title=%E5%9B%AD%E9%95%BF%E8%AF%BE%E7%A8%8B&pageName=&moreUrl=https%3A%2F%2Fcmsapi.cnlive.com%2FcontentApi%2FgetBlockContents%3FblockId%3D12165")//"https://managemall.cnlive.com/html/mall/1/#/pages/main/goodsList/goodsList?scene=app")
@@ -53,6 +55,7 @@ class CNLiveDownSlideTool:NSObject{
             }else{
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             }
+            hiddenLoading()
         }else if (model == kCNDownSlideContentsModelModelAlbum){
             let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
@@ -68,6 +71,7 @@ class CNLiveDownSlideTool:NSObject{
             }else{
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             }
+            hiddenLoading()
         }else if (model == kCNDownSlideContentsModelModelAlbum_video){
             let urlString = "http://wjjh5.cnlive.com/cnYjzgAlbumVideo.html"
             let queryItem = URLQueryItem(name: "aid", value: contentId)
@@ -85,6 +89,7 @@ class CNLiveDownSlideTool:NSObject{
             }else{
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             }
+            hiddenLoading()
         }else if (model == kCNDownSlideContentsModelModelAlbum_ugc){
             showLoading(message: "")
             self.pushShortVideoController(contentId: contentId, navigationVC: navigationViewController().visibleViewController?.navigationController, slideModel: slideModel)
@@ -103,6 +108,7 @@ class CNLiveDownSlideTool:NSObject{
             } else {
                 print("无法将字符串转换为数据")
             }
+            hiddenLoading()
         }else if (model == kCNDownSlideContentsModelModelProduct){
             //电商h5--跳转商品页
 //            let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(contentId)&uid=\(UserInfoManager.shared.userInfo.uid)"
@@ -115,6 +121,7 @@ class CNLiveDownSlideTool:NSObject{
             }else{
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             }
+            hiddenLoading()
         }else{
             return
@@ -124,6 +131,7 @@ class CNLiveDownSlideTool:NSObject{
     class func pushShortVideoController(contentId:String,navigationVC:UINavigationController?,slideModel:CNLiveDownSlideModel?){
         //请求getAlbumMsg获取上次播放集数
         //获取专辑详情(简介等)
+        showLoading(message: "")
         CNLiveHomePageViewModel.getAlbumMsg(aid: contentId) { result, status in
             hiddenLoading()
             if status == .success{
@@ -141,6 +149,7 @@ class CNLiveDownSlideTool:NSObject{
     class func pushShortVideoController(aid:String,page: NSInteger, currentIndex: NSInteger, dataArray: [CNLiveAlbumListModel],navigationVC:UINavigationController?){
         //请求getAlbumMsg获取上次播放集数
         //获取专辑详情(简介等)
+        showLoading(message: "")
         CNLiveHomePageViewModel.getAlbumMsg(aid: aid) { result, status in
             hiddenLoading()
             if status == .success{
@@ -160,7 +169,7 @@ class CNLiveDownSlideTool:NSObject{
     // MARK: - 跳转点播或者h5
     class func pushWebAndVodVCWithContentsMdl(model:String,contentId:String,pid:String,shareUrl:String,thirdUrl:String,title:String,s_to:String,trailerId:String,controller:UIViewController?,slideModel:CNLiveDownSlideModel?){//contentMdl:CNLiveDownSlideContentsModel
-        
+        showLoading(message: "")
         if (model == kCNDownSlideContentsModelModel1) {//点播-单集
             self.pushVodController(contentId: contentId, navigationVC: navigationViewController().visibleViewController?.navigationController, isAblumVideo: false)
@@ -174,6 +183,7 @@ class CNLiveDownSlideTool:NSObject{
             let regURL = urlComponents.url
             let webVC = CNWebViewController()
             webVC.url = regURL
+            hiddenLoading()
             if controller != nil{
                 controller!.navigationController?.pushViewController(webVC, animated: pushAnimated)
             }else{
@@ -188,6 +198,7 @@ class CNLiveDownSlideTool:NSObject{
             }else{
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             }
+            hiddenLoading()
         }else if (model == kCNDownSlideContentsModelModelAlbum_video){
             //点播-专辑
             self.pushVodController(albumId: contentId, navigationVC: navigationViewController().visibleViewController?.navigationController)
@@ -208,6 +219,7 @@ class CNLiveDownSlideTool:NSObject{
             }else{
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             }
+            hiddenLoading()
         }else if (model == kCNDownSlideContentsModelModelAlbum){
             let urlString = "http://wjjh5.cnlive.com/cnYjzgAlbumVideo.html"
             let queryItem = URLQueryItem(name: "aid", value: contentId)
@@ -225,10 +237,12 @@ class CNLiveDownSlideTool:NSObject{
             }else{
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             }
+            hiddenLoading()
         }else if (model == kCNDownSlideContentsModelModelAlbum_ugc){
             showLoading(message: "")
             self.pushShortVideoController(contentId: contentId, navigationVC: navigationViewController().visibleViewController?.navigationController, slideModel: slideModel)
         }else if model == kCNDownSlideContentsModelModelServing{
+            hiddenLoading()
             //跳转微信小程序
             if let data = s_to.data(using: .utf8) {
                 do {
@@ -180,6 +180,7 @@ class CNLiveHomeADCell: UITableViewCell ,FSPagerViewDataSource,FSPagerViewDelega
             return
         }
         if let bannerMdl = self.slideModel?.contents[index]{
+            
             CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: bannerMdl.model, contentId: bannerMdl.contentId, pid: bannerMdl.pid, shareUrl: bannerMdl.shareUrl, thirdUrl: bannerMdl.thirdUrl, title: bannerMdl.title, s_to: bannerMdl.s_to, trailerId: bannerMdl.trailerId, controller: navigationViewController().visibleViewController, slideModel: nil)
         }
 //        if bannerMdl?.model == "1" || bannerMdl?.model == "album_video"{
@@ -548,6 +548,7 @@ class CNLiveHomeOneBigTwoSmallCell:UITableViewCell{
         let imageView = ges.view as! UIImageView
         let i = imageView.tag-1000
         if let contentMdl = self.slideModel?.contents[i]{
+
             CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: contentMdl.model , contentId: contentMdl.contentId , pid: contentMdl.pid , shareUrl: contentMdl.shareUrl , thirdUrl: contentMdl.thirdUrl , title: contentMdl.title , s_to: contentMdl.s_to ,trailerId: contentMdl.trailerId , controller: nil, slideModel: nil)
         }
     }
@@ -560,6 +561,7 @@ class CNLiveHomeOneBigTwoSmallCell:UITableViewCell{
             currentViewController()?.navigationController?.pushViewController(vc, animated: true)
         }else if self.slideModel?.moreType == "3"{
             //webView moreurl
+            
             CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: "3", contentId: "", pid: "", shareUrl: "", thirdUrl: self.slideModel?.moreUrl ?? "", title: "", s_to: "", trailerId: "", controller: nil, slideModel: nil)
         }else{
@@ -568,6 +570,7 @@ class CNLiveHomeOneBigTwoSmallCell:UITableViewCell{
     // MARK: - 点击视频
     func iconImgViewAction(index:Int){
         if let bannerMdl = self.slideModel?.contents[index]{
+
             CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: bannerMdl.model, contentId: bannerMdl.contentId, pid: bannerMdl.pid, shareUrl: bannerMdl.shareUrl, thirdUrl: bannerMdl.thirdUrl, title: bannerMdl.title, s_to: bannerMdl.s_to, trailerId: bannerMdl.trailerId, controller: navigationViewController().visibleViewController, slideModel: nil)
         }
     }
@@ -190,6 +190,7 @@ class CNLiveHomeTwoDuanjuCell:UITableViewCell{
         let imageView = ges.view as! UIImageView
         let i = imageView.tag-1000
         if let contentMdl = self.slideModel?.contents[i]{
+            
             CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: contentMdl.model , contentId: contentMdl.contentId , pid: contentMdl.pid , shareUrl: contentMdl.shareUrl , thirdUrl: contentMdl.thirdUrl , title: contentMdl.title , s_to: contentMdl.s_to ,trailerId: contentMdl.trailerId , controller: nil, slideModel: nil)
         }
     }
@@ -108,6 +108,7 @@ class CNLiveHomeYingshiBannerCell: UITableViewCell ,FSPagerViewDataSource,FSPage
             return
         }
         if let bannerMdl = self.slideModel?.contents[index]{
+            
             CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: bannerMdl.model, contentId: bannerMdl.contentId, pid: bannerMdl.pid, shareUrl: bannerMdl.shareUrl, thirdUrl: bannerMdl.thirdUrl, title: bannerMdl.title, s_to: bannerMdl.s_to, trailerId: bannerMdl.trailerId, controller: navigationViewController().visibleViewController, slideModel: nil)
         }
 //        if bannerMdl?.model == "1" || bannerMdl?.model == "album_video"{
@@ -107,6 +107,7 @@ class CNLiveHomeLanmuThreeImgCell: UITableViewCell {
     }
     @objc func imgTapAction(ges: UITapGestureRecognizer){
+        showLoading(message: "")
         let imageView = ges.view as! UIImageView
         let i = imageView.tag
         if let contentMdl = self.slideModel?[i]{
@@ -19,6 +19,7 @@ import ZFPlayer
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
+    var isCaptured = false //是否录屏中
 //    var orientationLock = UIInterfaceOrientationMask.allButUpsideDown // 默认支持方向
 //    func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
@@ -27,6 +28,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ appUITableViewRowDatalication: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        //录屏状态实时检测‌ 监听
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(handleScreenCaptureChange),
+            name: UIScreen.capturedDidChangeNotification,
+            object: nil
+        )
+        
         JFHeroBrowserGlobalConfig.default.networkImageProvider = HeroNetworkImageProvider.shared
         // Override point for customization after application launch.
@@ -161,7 +170,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
-    
+    // MARK: - 响应录屏状态变化
+    @objc private func handleScreenCaptureChange() {
+        if UIScreen.main.isCaptured {
+            self.isCaptured = true
+        } else {
+            self.isCaptured = false
+        }
+        print("1111111appdelegateisCaptured:\(self.isCaptured) ")
+    }
+
     // MARK: - 键盘处理
     func AppDelegate_configIQKeyboardManager() {
         IQKeyboardManager.shared.enable = true