Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/ScioLive

张旭
2 parents 7a21740d 4ac03333
Showing 1 changed file with 14 additions and 4 deletions
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
@@ -221,11 +221,16 @@
 }
 - (void)getWebViewHeight{
     [_webView evaluateJavaScript:@"document.body.scrollHeight" completionHandler:^(id _Nullable result, NSError * _Nullable error){
-           CGFloat graphicLiveHeight = [result floatValue];
-           _webView.height = graphicLiveHeight+30;
-        UIView *view = self.tableView. tableHeaderView;
-        [view sizeToFit];
+        CGFloat graphicLiveHeight = [heightArr[fontIndex] floatValue];
+        if (graphicLiveHeight > 5.0) {
+        } else {
+            graphicLiveHeight = [result floatValue];
+            heightArr[fontIndex] = [NSString stringWithFormat:@"%f", graphicLiveHeight];
+        }
+        _webView.height = graphicLiveHeight+30;
+        UIView *view = self.tableView.tableHeaderView;
         view.frame = CGRectMake(0, 0, MainScreenWidth, _webView.height);
+        self.tableView.tableHeaderView = view;
         [self.tableView reloadData];
     }];
 }
@@ -296,7 +301,11 @@
     WKWebViewConfiguration *wkWebConfig = [[WKWebViewConfiguration alloc] init];
     wkWebConfig.userContentController = wkUController;
+    
     _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, 1) configuration:wkWebConfig];
+    CGRect frame = _webView.frame;
+    frame.size.height = 0;
+    _webView.frame = frame;
     _webView.scrollView.backgroundColor = [UIColor whiteColor];
     _webView.scrollView.showsVerticalScrollIndicator = NO;
     _webView.backgroundColor = [UIColor whiteColor];
@@ -484,6 +493,7 @@
     [webView evaluateJavaScript:@"document.body.scrollHeight" completionHandler:^(id _Nullable result, NSError * _Nullable error){
         CGFloat graphicLiveHeight = [result floatValue];
+        heightArr[0] = [NSString stringWithFormat:@"%f", graphicLiveHeight];
         _webView.height = graphicLiveHeight+30;
         [self.tableView reloadData];
         if (!hasLoad) {