Commit d6932980120276630b697aeeaf462ffd12a8f3f5
1 parent
eb5247c4
webview禁止缩放
Showing
6 changed files
with
8 additions
and
9 deletions
CNLiveScioLive/Pages/Home/新闻详情/Controller/VideoDetailViewController.m
| @@ -574,7 +574,7 @@ static NSString *newsLeftPicTableViewCell = @"CNLiveNewsLeftPicTableViewCell"; | @@ -574,7 +574,7 @@ static NSString *newsLeftPicTableViewCell = @"CNLiveNewsLeftPicTableViewCell"; | ||
| 574 | #pragma mark - Lazy Laoding | 574 | #pragma mark - Lazy Laoding |
| 575 | - (WKWebView *)webView { | 575 | - (WKWebView *)webView { |
| 576 | if (!_webView) { | 576 | if (!_webView) { |
| 577 | - NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);"; | 577 | + NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width, user-scalable=no'); document.getElementsByTagName('head')[0].appendChild(meta);"; |
| 578 | 578 | ||
| 579 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; | 579 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; |
| 580 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; | 580 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; |
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
| @@ -292,7 +292,7 @@ | @@ -292,7 +292,7 @@ | ||
| 292 | self.view.backgroundColor = [UIColor whiteColor]; | 292 | self.view.backgroundColor = [UIColor whiteColor]; |
| 293 | [self setUpNavigationBar]; | 293 | [self setUpNavigationBar]; |
| 294 | 294 | ||
| 295 | - NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);"; | 295 | + NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width, user-scalable=no'); document.getElementsByTagName('head')[0].appendChild(meta);"; |
| 296 | 296 | ||
| 297 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; | 297 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; |
| 298 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; | 298 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; |
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
| @@ -202,7 +202,7 @@ | @@ -202,7 +202,7 @@ | ||
| 202 | heightArr = [NSMutableArray arrayWithArray:@[@"0",@"0",@"0"]]; | 202 | heightArr = [NSMutableArray arrayWithArray:@[@"0",@"0",@"0"]]; |
| 203 | fontArray = @[@"16",@"20",@"24"]; | 203 | fontArray = @[@"16",@"20",@"24"]; |
| 204 | 204 | ||
| 205 | - NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);"; | 205 | + NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width, user-scalable=no'); document.getElementsByTagName('head')[0].appendChild(meta);"; |
| 206 | 206 | ||
| 207 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; | 207 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; |
| 208 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; | 208 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; |
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
| @@ -132,7 +132,7 @@ | @@ -132,7 +132,7 @@ | ||
| 132 | // NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlHeader,htmlFooter]; | 132 | // NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlHeader,htmlFooter]; |
| 133 | // [relatedWebView loadHTMLString:strHtml baseURL:nil]; | 133 | // [relatedWebView loadHTMLString:strHtml baseURL:nil]; |
| 134 | 134 | ||
| 135 | - NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);"; | 135 | + NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width, user-scalable=no'); document.getElementsByTagName('head')[0].appendChild(meta);"; |
| 136 | 136 | ||
| 137 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; | 137 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; |
| 138 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; | 138 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; |
| @@ -392,7 +392,7 @@ | @@ -392,7 +392,7 @@ | ||
| 392 | 392 | ||
| 393 | [backgroundView setContentSize:CGSizeMake(MainScreenWidth, height + descriptionHeight + 960)]; | 393 | [backgroundView setContentSize:CGSizeMake(MainScreenWidth, height + descriptionHeight + 960)]; |
| 394 | 394 | ||
| 395 | - NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);"; | 395 | + NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width, user-scalable=no'); document.getElementsByTagName('head')[0].appendChild(meta);"; |
| 396 | 396 | ||
| 397 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; | 397 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; |
| 398 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; | 398 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; |
| @@ -402,7 +402,6 @@ | @@ -402,7 +402,6 @@ | ||
| 402 | config.userContentController = wkUController; | 402 | config.userContentController = wkUController; |
| 403 | _webView = [[WKWebView alloc] initWithFrame:CGRectZero configuration:config]; | 403 | _webView = [[WKWebView alloc] initWithFrame:CGRectZero configuration:config]; |
| 404 | _webView.scrollView.backgroundColor = [UIColor clearColor]; | 404 | _webView.scrollView.backgroundColor = [UIColor clearColor]; |
| 405 | -// _webView.dataDetectorTypes = UIDataDetectorTypeNone; | ||
| 406 | _webView.backgroundColor = [UIColor clearColor]; | 405 | _webView.backgroundColor = [UIColor clearColor]; |
| 407 | _webView.scrollView.bounces = NO; | 406 | _webView.scrollView.bounces = NO; |
| 408 | _webView.navigationDelegate = self; | 407 | _webView.navigationDelegate = self; |
CNLiveScioLive/Pages/Live/Controller/TopNoticeViewController.m
| @@ -105,7 +105,7 @@ | @@ -105,7 +105,7 @@ | ||
| 105 | self.navigationItem.title = CustomStr(@"Announcements"); | 105 | self.navigationItem.title = CustomStr(@"Announcements"); |
| 106 | } | 106 | } |
| 107 | - (void)setUpUI{ | 107 | - (void)setUpUI{ |
| 108 | - NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);"; | 108 | + NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width, user-scalable=no'); document.getElementsByTagName('head')[0].appendChild(meta);"; |
| 109 | 109 | ||
| 110 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; | 110 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; |
| 111 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; | 111 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; |
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
| @@ -223,7 +223,7 @@ | @@ -223,7 +223,7 @@ | ||
| 223 | backgroundView.bounces = NO; | 223 | backgroundView.bounces = NO; |
| 224 | [self.view addSubview:backgroundView]; | 224 | [self.view addSubview:backgroundView]; |
| 225 | 225 | ||
| 226 | - NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);"; | 226 | + NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width, user-scalable=no'); document.getElementsByTagName('head')[0].appendChild(meta);"; |
| 227 | 227 | ||
| 228 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; | 228 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; |
| 229 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; | 229 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; |
| @@ -446,7 +446,7 @@ | @@ -446,7 +446,7 @@ | ||
| 446 | 446 | ||
| 447 | [backgroundView setContentSize:CGSizeMake(MainScreenWidth, 40 + descriptionHeight)]; | 447 | [backgroundView setContentSize:CGSizeMake(MainScreenWidth, 40 + descriptionHeight)]; |
| 448 | 448 | ||
| 449 | - NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);"; | 449 | + NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width, user-scalable=no'); document.getElementsByTagName('head')[0].appendChild(meta);"; |
| 450 | 450 | ||
| 451 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; | 451 | WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; |
| 452 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; | 452 | WKUserContentController *wkUController = [[WKUserContentController alloc] init]; |