横屏状态滑动返回取消

yanglingyu
1 parent 99a8b6b2
Showing 3 changed files with 22 additions and 44 deletions
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
@@ -283,23 +283,15 @@
         [bgView removeFromSuperview];
         [self.liveController configPlayerWithFrame:frame isLiving:NO];
         [self.liveController showInView:self.view];
-        // 点播
-//        self.liveController = [[CNLivePlayerController alloc] initVodPlayWithVId:_dictionary[@"uuid"] authSuccess:^{
-//            [self.liveController reload:[NSURL URLWithString:self->url]];
-//            NSError *error = nil;
-//            [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error: &error];
-//            [[AVAudioSession sharedInstance] setActive:YES error:nil];
-//
-//            [bgView removeFromSuperview];
-//            [self.liveController configPlayerWithFrame:frame isLiving:NO];
-//            [self.liveController showInView:self.view];
-//        } authFailed:^(NSDictionary *errorInfo) {
-//            NSLog(@"初始化点播播放器失败%@", errorInfo);
-//        }];
         self.liveController.delegate = self;
-
+        MJWeakSelf
+        self.liveController.videoPlayerWillChangeToFullScreenModeBlock = ^{
+            weakSelf.navigationController.interactivePopGestureRecognizer.enabled = NO;
+        };
+        self.liveController.videoPlayerWillChangeToOriginalScreenModeBlock = ^{
+            weakSelf.navigationController.interactivePopGestureRecognizer.enabled = YES;
+        };
         [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"ZXVideoPlayer_DidLockScreen"];
-        __weak typeof(self) weakSelf = self;
         self.liveController.videoPlayerGoBackBlock = ^{
             __strong typeof(self) strongSelf = weakSelf;
             [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"ZXVideoPlayer_DidLockScreen"];
@@ -302,6 +302,13 @@
             [strongSelf Pop:nil];
         };
     }
+    MJWeakSelf
+    self.liveController.videoPlayerWillChangeToFullScreenModeBlock = ^{
+        weakSelf.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    };
+    self.liveController.videoPlayerWillChangeToOriginalScreenModeBlock = ^{
+        weakSelf.navigationController.interactivePopGestureRecognizer.enabled = YES;
+    };
     ZXVideo *video = [[ZXVideo alloc] init];
     video.title = _dictionary[@"title"];
     self.liveController.video = video;
@@ -535,10 +542,7 @@
 }
  
 - (BOOL)shouldAutorotate {
-    if (!isPlay) {
-        return [[[NSUserDefaults standardUserDefaults] objectForKey:@"GraphicLive_DidLockScreen"] boolValue];
-    }
-    return ![[[NSUserDefaults standardUserDefaults] objectForKey:@"ZXVideoPlayer_DidLockScreen"] boolValue];
+    return isPlay;
 }
  
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
@@ -273,7 +273,6 @@
         [self loadMovieView];
     } else {
         [self addCNLivePlayerWithURL:movieUrl];
-//        [self addVideoPlayerWithURL:movieUrl];
     }
  
     fontIndex = (int)[[NSUserDefaults standardUserDefaults] integerForKey:@"FontSize"];
@@ -304,30 +303,6 @@
     [self.view addSubview:backButton];
 }
  
-- (void)addVideoPlayerWithURL:(NSURL *)videoUrl{
-    if (!self.videoController) {
-        CGRect frame = CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight);
-        self.videoController = [[ZXVideoPlayerController alloc] initWithFrame:frame];
-        __weak typeof(self) weakSelf = self;
-        self.videoController.videoPlayerShare = ^{
-            __strong typeof(self) strongSelf = weakSelf;
-            [strongSelf shareButtonTaped:strongSelf->_shareButton];
-        };
-        self.videoController.videoPlayerGoBackBlock = ^{
-            __strong typeof(self) strongSelf = weakSelf;
-            [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"ZXVideoPlayer_DidLockScreen"];
-            strongSelf.videoController = nil;
-            [strongSelf Pop:nil];
-        };
-        self.liveController.delegate = self;
-        [self.videoController showInView:self.view];
-    }
-    ZXVideo *video = [[ZXVideo alloc] init];
-    video.playUrl = url;
-    video.title = _dictionary[@"title"];
-    self.videoController.video = video;
-}
-
 // CNLivePlayer
 - (void)addCNLivePlayerWithURL:(NSURL *)videoUrl {
     if (!self.liveController) {
@@ -356,6 +331,13 @@
         self.liveController.delegate = self;
  
     }
+    MJWeakSelf
+    self.liveController.videoPlayerWillChangeToFullScreenModeBlock = ^{
+        weakSelf.navigationController.interactivePopGestureRecognizer.enabled = NO;
+    };
+    self.liveController.videoPlayerWillChangeToOriginalScreenModeBlock = ^{
+        weakSelf.navigationController.interactivePopGestureRecognizer.enabled = YES;
+    };
     ZXVideo *video = [[ZXVideo alloc] init];
     video.title = _dictionary[@"title"];
     self.liveController.video = video;