修改播放器全屏

luyinuo · Jul 12, 2020 · e4347df · e4347df
1 parent b63350b
commit e4347df
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 37 deletions.
diff --git a/ZFPlayer/Classes/Core/ZFPlayerController.m b/ZFPlayer/Classes/Core/ZFPlayerController.m
@@ -180,11 +180,6 @@ - (void)playerManagerCallbcak {
 
     self.currentPlayerManager.playerPlayStateChanged = ^(id  _Nonnull asset, ZFPlayerPlaybackState playState) {
         @strongify(self)
-        if (playState == ZFPlayerPlayStatePlayStopped) {
-            CGSize size = self.currentPlayerManager.view.frame.size;
-
-            self.orientationObserver.presentationSize = size;
-        }
         if (self.playerPlayStateChanged) self.playerPlayStateChanged(asset, playState);
         if ([self.controlView respondsToSelector:@selector(videoPlayer:playStateChanged:)]) {
             [self.controlView videoPlayer:self playStateChanged:playState];

diff --git a/ZFPlayer/Classes/Core/ZFPlayerPersentInteractiveTransition.m b/ZFPlayer/Classes/Core/ZFPlayerPersentInteractiveTransition.m
@@ -44,6 +44,7 @@ @interface ZFPlayerPersentInteractiveTransition () <UIGestureRecognizerDelegate>
 
 @implementation ZFPlayerPersentInteractiveTransition
 
+
 - (void)addPanGestureForViewController:(UIViewController *)viewController
                            contentView:(UIView *)contenView
                          containerView:(UIView *)containerView {

diff --git a/ZFPlayer/Classes/Core/ZFPlayerPresentTransition.m b/ZFPlayer/Classes/Core/ZFPlayerPresentTransition.m
@@ -32,6 +32,9 @@ @interface ZFPlayerPresentTransition ()
 @property (strong, nonatomic) ZFPlayerView *contentView;
 @property (assign, nonatomic) ZFPresentTransitionType type;
 @property (nonatomic, strong) UIView *containerView;
+@property (nonatomic, assign, getter=isTransiting) BOOL transiting;
+@property (nonatomic, assign, getter=isFullScreen) BOOL fullScreen;
+@property (nonatomic, assign, getter=isSizeChanged) BOOL sizeChanged;
 
 @end
 
@@ -67,6 +70,8 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
  *  实现present动画
  */
 - (void)presentAnimation:(id<UIViewControllerContextTransitioning>)transitionContext {
+    self.sizeChanged = NO;
+
     UIViewController *toVC = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
     UIViewController *fromVC = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
     if ([fromVC isKindOfClass:[UINavigationController class]]) {
@@ -95,18 +100,22 @@ - (void)presentAnimation:(id<UIViewControllerContextTransitioning>)transitionCon
     toVC.view.alpha = 1;
     [self.delagate zf_orientationWillChange:YES];
 
-    CGFloat videoWidth = self.fullScreenScaleSize.width;
-    CGFloat videoHeight = self.fullScreenScaleSize.height;
-    CGRect toRect = CGRectMake((ZFPlayerScreenWidth - videoWidth) / 2.0, (ZFPlayerScreenHeight - videoHeight) / 2.0, videoWidth, videoHeight);
-    NSLog(@"sssssss===origin=%@\n to =%@", NSStringFromCGRect(originRect),NSStringFromCGRect(toRect));
-//    [UIView animateWithDuration:[self transitionDuration:transitionContext] animations:^{
-    [UIView animateWithDuration:2 animations:^{
+    CGRect toRect = [self contentViewFullScreenRect];
+    self.transiting = YES;
+    self.fullScreen = NO;
+    [UIView animateWithDuration:[self transitionDuration:transitionContext] animations:^{
         self.contentView.frame = toRect;
         [self.contentView layoutIfNeeded];
         toVC.view.backgroundColor = [tempColor colorWithAlphaComponent:1.f];
     } completion:^(BOOL finished) {
+        self.transiting = NO;
+        self.fullScreen = YES;
         [transitionContext completeTransition:YES];
         [self.delagate zf_orientationDidChanged:YES];
+        if (self.sizeChanged) {
+            self.contentView.frame = [self contentViewFullScreenRect];
+            [self.contentView layoutIfNeeded];
+        }
     }];
 }
 
@@ -139,7 +148,8 @@ - (void)dismissAnimation:(id<UIViewControllerContextTransitioning>)transitionCon
     CGRect toRect = [self.containerView convertRect:self.containerView.bounds toView:toVC.view];
     [fromVC.view convertRect:self.contentView.bounds toView:self.containerView.window];
     [self.delagate zf_orientationWillChange:NO];
-
+    self.transiting = YES;
+    self.fullScreen = YES;
     [UIView animateWithDuration:[self transitionDuration:transitionContext] animations:^{
         fromVC.view.alpha = 0;
         self.contentView.frame = toRect;
@@ -149,7 +159,25 @@ - (void)dismissAnimation:(id<UIViewControllerContextTransitioning>)transitionCon
         self.contentView.frame = self.containerView.bounds;
         [transitionContext completeTransition:YES];
         [self.delagate zf_orientationDidChanged:NO];
+        self.transiting = NO;
+        self.fullScreen = NO;
     }];
 }
 
+- (void)setFullScreenScaleSize:(CGSize)fullScreenScaleSize {
+    _fullScreenScaleSize = fullScreenScaleSize;
+    if (!self.transiting && self.isFullScreen) {
+        self.contentView.frame = [self contentViewFullScreenRect];
+    } else if (self.transiting && !self.isFullScreen) {
+        self.sizeChanged = YES;
+    }
+}
+
+- (CGRect)contentViewFullScreenRect {
+    CGFloat videoWidth = self.fullScreenScaleSize.width;
+    CGFloat videoHeight = self.fullScreenScaleSize.height;
+    CGRect rect = CGRectMake((ZFPlayerScreenWidth - videoWidth) / 2.0, (ZFPlayerScreenHeight - videoHeight) / 2.0, videoWidth, videoHeight);
+    return rect;
+}
+
 @end
diff --git a/ZFPlayer/Classes/Core/ZFPlayerView.h b/ZFPlayer/Classes/Core/ZFPlayerView.h
@@ -34,8 +34,6 @@
 
 @property (nonatomic, assign) CGSize presentationSize;
 
-//@property (nonatomic, assign) CGSize fullScreenScaleSize;
-
 @property (nonatomic, assign) ZFPlayerScalingMode scalingMode;
 
 @property (nonatomic, assign) ZFPlayerLoadState loadState;

diff --git a/ZFPlayer/Classes/Core/ZFPlayerView.m b/ZFPlayer/Classes/Core/ZFPlayerView.m
@@ -98,23 +98,6 @@ - (CGSize)presentationSize {
     return _presentationSize;
 }
 
-//- (CGSize)fullScreenScaleSize {
-//    CGFloat videoWidth = self.presentationSize.width;
-//    CGFloat videoHeight = self.presentationSize.height;
-//    CGFloat screenScale = (CGFloat)(ZFPlayerScreenWidth/ZFPlayerScreenHeight);
-//    CGFloat videoScale = (CGFloat)(videoWidth/videoHeight);
-//    if (screenScale > videoScale) {
-//        CGFloat height = ZFPlayerScreenHeight;
-//        CGFloat width = (CGFloat)(height * videoScale);
-//        _fullScreenScaleSize = CGSizeMake(width, height);
-//    } else {
-//        CGFloat width = ZFPlayerScreenWidth;
-//        CGFloat height = (CGFloat)(width / videoScale);
-//        _fullScreenScaleSize = CGSizeMake(width, height);
-//    }
-//    return _fullScreenScaleSize;
-//}
-
 - (UIImageView *)coverImageView {
     if (!_coverImageView) {
         _coverImageView = [[UIImageView alloc] init];

diff --git a/ZFPlayer/Classes/Core/ZFPortraitViewController.m b/ZFPlayer/Classes/Core/ZFPortraitViewController.m
@@ -140,12 +140,6 @@ - (void)setEnablePortraitGesture:(BOOL)enablePortraitGesture {
 - (void)setPresentationSize:(CGSize)presentationSize {
     _presentationSize = presentationSize;
     self.transition.fullScreenScaleSize = self.fullScreenScaleSize;
-    if (self.isFullScreen) {
-        CGFloat videoWidth = self.fullScreenScaleSize.width;
-        CGFloat videoHeight = self.fullScreenScaleSize.height;
-        self.contentView.frame = CGRectMake(0, 0, videoWidth, videoHeight);
-        self.contentView.center = self.view.center;
-    }
 }
 
 - (CGSize)fullScreenScaleSize {