From 6f67da9d7c31a0e3573226c44389a15e4eec9233 Mon Sep 17 00:00:00 2001 From: zher52 Date: Thu, 24 Sep 2020 13:09:22 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=A4=84=E7=90=86ios=20webview=E9=AB=98?= =?UTF-8?q?=E5=BA=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ios/CDVWKInAppBrowser.m | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ios/CDVWKInAppBrowser.m b/src/ios/CDVWKInAppBrowser.m index 835c621..a93dffb 100644 --- a/src/ios/CDVWKInAppBrowser.m +++ b/src/ios/CDVWKInAppBrowser.m @@ -84,7 +84,6 @@ static CDVWKInAppBrowser* instance = nil; NSLog(@"IAB.close() called but it was already closed."); return; } - // Things are cleaned up in browserExit. [self.inAppBrowserViewController close]; } @@ -268,7 +267,6 @@ static CDVWKInAppBrowser* instance = nil; _beforeload = @"yes"; } _waitForBeforeload = ![_beforeload isEqualToString:@""]; - [self.inAppBrowserViewController navigateTo:url]; if (!browserOptions.hidden) { [self show:nil withNoAnimate:browserOptions.hidden]; @@ -1169,7 +1167,7 @@ BOOL isExiting = FALSE; [self.webView goForward]; } -- (void)viewWillAppear:(BOOL)animated +- (void)viewWillAppear:(BOOL)animated { // if (IsAtLeastiOSVersion(@"7.0") && !viewRenderedAtLeastOnce) { // viewRenderedAtLeastOnce = TRUE; @@ -1210,7 +1208,10 @@ BOOL isExiting = FALSE; // NSLog(@"_browserOptions::%d||%d||%d",_browserOptions.statusbar,_browserOptions.titlebar,[[UIApplication sharedApplication] statusBarFrame].size.height + [[UIApplication sharedApplication] statusBarFrame].origin.y); self.view.frame = CGRectMake(0,(_browserOptions.titlebar || _browserOptions.statusbar) ? [[UIApplication sharedApplication] statusBarFrame].size.height + [[UIApplication sharedApplication] statusBarFrame].origin.y - : 0,self.view.frame.size.width,self.view.frame.size.height); + : 0,self.view.frame.size.width,[UIScreen mainScreen].bounds.size.height + -(_browserOptions.titlebar ? 44 : 0) + -((_browserOptions.titlebar || _browserOptions.statusbar) + ? [[UIApplication sharedApplication] statusBarFrame].size.height + [[UIApplication sharedApplication] statusBarFrame].origin.y: 0)); if(_browserOptions.titlebar){ [self.titlebar setFrame:CGRectMake(self.toolbar.frame.origin.x, 0, self.view.frame.size.width, 44)]; [self.titleBackButton setFrame:CGRectMake(self.view.safeAreaInsets.left, 0, 44, 44)];