no message

iOS-Xiaowen
1 parent 5fdc06be
Showing 2 changed files with 54 additions and 24 deletions
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/TopNoticeViewController.m
@@ -316,15 +316,17 @@
 // 页面加载完成之后调用
 - (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
 {
-    CGRect frame = relatedWebView.frame;
-    frame.size.width = MainScreenWidth;
-    frame.size.height = 1;
-    relatedWebView.frame = frame;
-    [webView evaluateJavaScript:@"document.body.scrollHeight"completionHandler:^(id _Nullable result,NSError * _Nullable error){
-        NSLog(@"scrollHeight高度：%.2f",[result floatValue]);
-        descriptionHeight = [result floatValue];
-        [relatedWebView setFrame:CGRectMake(0, 0, MainScreenWidth, descriptionHeight)];
-    }];
+    if (webView == relatedWebView) {
+        CGRect frame = relatedWebView.frame;
+        frame.size.width = MainScreenWidth;
+        frame.size.height = 1;
+        relatedWebView.frame = frame;
+        [webView evaluateJavaScript:@"document.body.scrollHeight"completionHandler:^(id _Nullable result,NSError * _Nullable error){
+            NSLog(@"scrollHeight高度：%.2f",[result floatValue]);
+            descriptionHeight = [result floatValue];
+            [relatedWebView setFrame:CGRectMake(0, 0, MainScreenWidth, descriptionHeight)];
+        }];
+    }
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
         [self setUpUIWithTag:webView.tag Height:0];
@@ -353,8 +355,16 @@
         frame.size.width = MainScreenWidth;
         frame.size.height = 1;
         relatedWebView.frame = frame;
-        descriptionHeight = relatedWebView.scrollView.contentSize.height;
-        [relatedWebView setFrame:CGRectMake(0, 0, MainScreenWidth, descriptionHeight)];
+//        descriptionHeight = relatedWebView.scrollView.contentSize.height;
+        [relatedWebView evaluateJavaScript:@"document.body.scrollHeight"completionHandler:^(id _Nullable result,NSError * _Nullable error){
+            NSLog(@"scrollHeight高度：%.2f",[result floatValue]);
+            descriptionHeight = [result floatValue];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [relatedWebView setFrame:CGRectMake(0, 0, MainScreenWidth, descriptionHeight)];
+                
+            });
+        }];
+//        [relatedWebView setFrame:CGRectMake(0, 0, MainScreenWidth, descriptionHeight)];
         lineImage1 = [[UIImageView alloc] initWithFrame:CGRectMake(0, descriptionHeight, MainScreenWidth, 1)];
         lineImage1.backgroundColor = Color_Line;
         [backgroundView addSubview:lineImage1];
@@ -433,20 +443,32 @@
         frame.size.width = MainScreenWidth;
         frame.size.height = 1;
         _webView.frame = frame;
-        graphicLiveHeight = _webView.scrollView.contentSize.height;
+        [_webView evaluateJavaScript:@"document.body.scrollHeight"completionHandler:^(id _Nullable result,NSError * _Nullable error){
+            graphicLiveHeight = [result floatValue];
+            if (0 == [heightArr[fontIndex] floatValue]) {
+                [heightArr replaceObjectAtIndex:fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
+            }
+            
+            if (isShow) {
+                NSLog(@"fontIndex = %d",fontIndex);
+                [backgroundView setContentSize:CGSizeMake(MainScreenWidth, 40 + descriptionHeight + [heightArr[fontIndex] floatValue] + 221)];
+                [_webView setFrame:CGRectMake(0, 40 + descriptionHeight, MainScreenWidth, [heightArr[fontIndex] floatValue])];
+                [self showRelatedInformation:40 + descriptionHeight + [heightArr[fontIndex] floatValue]];
+            }
+        }];
         NSLog(@"%@",NSStringFromCGRect(_webView.frame));
         NSLog(@"%@",NSStringFromCGSize(_webView.scrollView.contentSize));
-        if (0 == [heightArr[fontIndex] floatValue]) {
-            [heightArr replaceObjectAtIndex:fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
-        }
-        
-        if (isShow) {
-            NSLog(@"fontIndex = %d",fontIndex);
-            [backgroundView setContentSize:CGSizeMake(MainScreenWidth, 40 + descriptionHeight + [heightArr[fontIndex] floatValue] + 221)];
-            [_webView setFrame:CGRectMake(0, 40 + descriptionHeight, MainScreenWidth, [heightArr[fontIndex] floatValue])];
-            [self showRelatedInformation:40 + descriptionHeight + [heightArr[fontIndex] floatValue]];
-        }
+//        if (0 == [heightArr[fontIndex] floatValue]) {
+//            [heightArr replaceObjectAtIndex:fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
+//        }
+//
+//        if (isShow) {
+//            NSLog(@"fontIndex = %d",fontIndex);
+//            [backgroundView setContentSize:CGSizeMake(MainScreenWidth, 40 + descriptionHeight + [heightArr[fontIndex] floatValue] + 221)];
+//            [_webView setFrame:CGRectMake(0, 40 + descriptionHeight, MainScreenWidth, [heightArr[fontIndex] floatValue])];
+//            [self showRelatedInformation:40 + descriptionHeight + [heightArr[fontIndex] floatValue]];
+//        }
     }
 }
@@ -105,10 +105,18 @@
     self.navigationItem.title = CustomStr(@"Announcements");
 }
 - (void)setUpUI{
+    NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);";
+
+    WKUserScript *wkUScript = [[WKUserScript alloc] initWithSource:jScript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES];
+    WKUserContentController *wkUController = [[WKUserContentController alloc] init];
+    [wkUController addUserScript:wkUScript];
+
+    WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc] init];
+    config.userContentController = wkUController;
     if (iPhoneX) {
-        _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 88 - 44 - 34)];
+        _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 88 - 44 - 34) configuration:config];
     } else {
-        _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 64 - 44)];
+        _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 64 - 44) configuration:config];
     }
     _webView.scrollView.backgroundColor = [UIColor whiteColor];
     _webView.backgroundColor = [UIColor whiteColor];