public/cordova-plugin-inappbrowser
public/cordova-plugin-inappbrowser
9
0
Fork 1
forked from github/cordova-plugin-inappbrowser
Code Pull Requests Activity

fix 处理ios webview高度问题

Browse Source
This commit is contained in:
zher52 2020-09-24 13:09:22 +08:00
parent b03fa7b78e
commit 6f67da9d7c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ios/CDVWKInAppBrowser.m
View File

@ -84,7 +84,6 @@ static CDVWKInAppBrowser* instance = nil;
NSLog(@"IAB.close() called but it was already closed."); NSLog(@"IAB.close() called but it was already closed.");
return; return;
} }
// Things are cleaned up in browserExit. // Things are cleaned up in browserExit.
[self.inAppBrowserViewController close]; [self.inAppBrowserViewController close];
} }
@ -268,7 +267,6 @@ static CDVWKInAppBrowser* instance = nil;
_beforeload = @"yes"; _beforeload = @"yes";
} }
_waitForBeforeload = ![_beforeload isEqualToString:@""]; _waitForBeforeload = ![_beforeload isEqualToString:@""];
[self.inAppBrowserViewController navigateTo:url]; [self.inAppBrowserViewController navigateTo:url];
if (!browserOptions.hidden) { if (!browserOptions.hidden) {
[self show:nil withNoAnimate:browserOptions.hidden]; [self show:nil withNoAnimate:browserOptions.hidden];
@ -1169,7 +1167,7 @@ BOOL isExiting = FALSE;
[self.webView goForward]; [self.webView goForward];
} }
- (void)viewWillAppear:(BOOL)animated - (void)viewWillAppear:(BOOL)animated
{ {
// if (IsAtLeastiOSVersion(@"7.0") && !viewRenderedAtLeastOnce) { // if (IsAtLeastiOSVersion(@"7.0") && !viewRenderedAtLeastOnce) {
// viewRenderedAtLeastOnce = TRUE; // 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); // 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) self.view.frame = CGRectMake(0,(_browserOptions.titlebar || _browserOptions.statusbar)
? [[UIApplication sharedApplication] statusBarFrame].size.height + [[UIApplication sharedApplication] statusBarFrame].origin.y ? [[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){ if(_browserOptions.titlebar){
[self.titlebar setFrame:CGRectMake(self.toolbar.frame.origin.x, 0, self.view.frame.size.width, 44)]; [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)]; [self.titleBackButton setFrame:CGRectMake(self.view.safeAreaInsets.left, 0, 44, 44)];