diff --git a/NJKScrollFullScreen/UIViewController+NJKFullScreenSupport.m b/NJKScrollFullScreen/UIViewController+NJKFullScreenSupport.m index f59691c..1816e52 100644 --- a/NJKScrollFullScreen/UIViewController+NJKFullScreenSupport.m +++ b/NJKScrollFullScreen/UIViewController+NJKFullScreenSupport.m @@ -24,8 +24,7 @@ @implementation UIViewController (NJKFullScreenSupport) - (void)showNavigationBar:(BOOL)animated { - CGSize statuBarFrameSize = [UIApplication sharedApplication].statusBarFrame.size; - CGFloat statusBarHeight = UIInterfaceOrientationIsPortrait(self.interfaceOrientation) ? statuBarFrameSize.height : statuBarFrameSize.width; + CGFloat statusBarHeight = [self statusBarHeight]; UIWindow *appKeyWindow = [UIApplication sharedApplication].keyWindow; UIView *appBaseView = appKeyWindow.rootViewController.view; @@ -38,8 +37,7 @@ - (void)showNavigationBar:(BOOL)animated - (void)hideNavigationBar:(BOOL)animated { - CGSize statuBarFrameSize = [UIApplication sharedApplication].statusBarFrame.size; - CGFloat statusBarHeight = UIInterfaceOrientationIsPortrait(self.interfaceOrientation) ? statuBarFrameSize.height : statuBarFrameSize.width; + CGFloat statusBarHeight = [self statusBarHeight]; UIWindow *appKeyWindow = [UIApplication sharedApplication].keyWindow; UIView *appBaseView = appKeyWindow.rootViewController.view; @@ -62,8 +60,7 @@ - (void)moveNavigtionBar:(CGFloat)deltaY animated:(BOOL)animated - (void)setNavigationBarOriginY:(CGFloat)y animated:(BOOL)animated { - CGSize statuBarFrameSize = [UIApplication sharedApplication].statusBarFrame.size; - CGFloat statusBarHeight = UIInterfaceOrientationIsPortrait(self.interfaceOrientation) ? statuBarFrameSize.height : statuBarFrameSize.width; + CGFloat statusBarHeight = [self statusBarHeight]; UIWindow *appKeyWindow = [UIApplication sharedApplication].keyWindow; UIView *appBaseView = appKeyWindow.rootViewController.view; @@ -97,6 +94,14 @@ - (void)setNavigationBarOriginY:(CGFloat)y animated:(BOOL)animated }]; } +- (CGFloat)statusBarHeight { + CGSize statuBarFrameSize = [UIApplication sharedApplication].statusBarFrame.size; + if (NJK_IS_RUNNING_IOS8) { + return statuBarFrameSize.height; + } + return UIInterfaceOrientationIsPortrait(self.interfaceOrientation) ? statuBarFrameSize.height : statuBarFrameSize.width; +} + #pragma mark - #pragma mark manage ToolBar