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

张旭
2 parents 100faf35 5baabc11
Showing 7 changed files with 70 additions and 47 deletions
CNLiveScioLive/Pages/Base/CNLiveBaseNavigationController.m
CNLiveScioLive/Pages/Base/CNLiveBaseViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/BaseViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.h
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
CNLiveScioLive/Pages/SDK/XLSlideMenu/XLSlideMenu.m
@@ -79,4 +79,9 @@
 }
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    UIViewController *vc = self.topViewController;
+    return [vc preferredStatusBarStyle];
+}
+
 @end
@@ -186,4 +186,9 @@
     return UIInterfaceOrientationMaskPortrait;
 }
+
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return UIStatusBarStyleDefault;
+}
+
 @end
@@ -25,4 +25,8 @@
     return UIInterfaceOrientationMaskPortrait;
 }
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return UIStatusBarStyleLightContent;
+}
+
 @end
@@ -22,6 +22,6 @@
 @property (strong, nonatomic) NSArray *newsArray;
 @property (strong, nonatomic) WKWebView *webView;
 @property (strong, nonatomic) UITableView *tableView;
-@property (strong, nonatomic) UIScrollView *scrollView;
 -(id)initWithDictionary:(NSDictionary*)dictionary;
+
 @end
@@ -44,7 +44,7 @@
     }
     return self;
 }
-- (NSString *)setHTMLString:(NSString *)content {
+- (NSString *)setHTMLString:(NSString *)content author:(NSString *)author {
     NSString* htmlcontent = [[NSString alloc] initWithFormat:
                             @"<!doctype html>\n"
                             "<html>\n"
@@ -65,7 +65,7 @@
                             "</script>\n"
                             "<div id=\"webview_content\"><p><font style=\"font-size:20px;\"><strong>%@</strong></font><p>%@</p><font color=\"#184085\">%@</font></p><div><font style=\"font-size:%@px;\">%@</font></div></div>"
                             "</body>"
-                            "</html>",[_dictionary objectForKey:@"title"],[_dictionary objectForKey:@"createDate"],@"来源 : 国新网",fontArray[fontIndex],content];
+                             "</html>",[_dictionary objectForKey:@"title"],[_dictionary objectForKey:@"createDate"],[NSString stringWithFormat:@"来源:%@",author?author:@"国新网"],fontArray[fontIndex],content];
 //    NSString * htmlcontent = [NSString stringWithFormat:@"<div id=\"webview_content_wrapper\">%@<font style=\"font-size:%@px;\">%@</font></div>",htmlHeader,fontArray[fontIndex],content];
     NSLog(@"htmlcontent = %@",htmlcontent);
     return htmlcontent;
@@ -87,7 +87,7 @@
               NSDictionary *dic = [NSDictionary dictionaryWithDictionary:responseObject];
 //              NSLog(@"%@",dic);
               if ([dic[@"errorCode"] isEqualToString:@"0"]) {
-                 [_webView loadHTMLString:[self setHTMLString:dic[@"content"]] baseURL:nil];
+                 [_webView loadHTMLString:[self setHTMLString:dic[@"content"] author:dic[@"author"]] baseURL:nil];
                   isFail = 0;
                   _refresh.hidden = YES;
@@ -122,6 +122,7 @@
        parameters:parameters headers:nil 
          progress:^(NSProgress * _Nonnull uploadProgress) {}
           success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+        self.tableView.hidden = NO;
               // 请求成功，解析数据
               NSDictionary *_dic = [NSDictionary dictionaryWithDictionary:responseObject];
               NSLog(@"%@",_dic);
@@ -130,9 +131,6 @@
                   NSArray *array = _dic[@"programs"];
                   if (0 != [array count]) {
                       self->_newsArray = [NSArray arrayWithArray:array];
-                      [self.tableView setFrame:CGRectMake(0, [self->heightArr[self->fontIndex] floatValue], MainScreenWidth, 36 + 86 * self->_newsArray.count)];
-                      [self.scrollView setContentSize:CGSizeMake(MainScreenWidth, [self->heightArr[self->fontIndex] floatValue] + self.tableView.frame.size.height)];
-                      self.tableView.hidden = NO;
                       [self.tableView reloadData];
                   }
               } else {
@@ -221,6 +219,16 @@
     [self.view addSubview:shareButton];
     [shareButton setTag:30000];
 }
+- (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];
+        view.frame = CGRectMake(0, 0, MainScreenWidth, _webView.height);
+        [self.tableView reloadData];
+    }];
+}
 - (void)shareButtonTaped:(id)sender {
     UIButton *btn = (UIButton *)sender;
     if (10000 == btn.tag) {
@@ -231,13 +239,19 @@
         }
         if (0 == fontIndex) {
             NSLog(@"0");
-            [_webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '100%'" completionHandler:nil];
+            [_webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '100%'" completionHandler:^(id _Nullable res, NSError * _Nullable error) {
+                [self getWebViewHeight];
+            }];
         } else if (1 == fontIndex) {
             NSLog(@"1");
-            [_webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '120%'" completionHandler:nil];
+            [_webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '120%'" completionHandler:^(id _Nullable res, NSError * _Nullable error) {
+                [self getWebViewHeight];
+            }];
         } else if (2 == fontIndex) {
             NSLog(@"2");
-            [_webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '140%'" completionHandler:nil];
+            [_webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '140%'" completionHandler:^(id _Nullable res, NSError * _Nullable error) {
+                [self getWebViewHeight];
+            }];
         }
     } else if (20000 == btn.tag) {
         TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
@@ -272,15 +286,6 @@
     self.view.backgroundColor = [UIColor whiteColor];
     [self setUpNavigationBar];
-
-    if (iPhoneX) {
-        self.scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 88 - 44 - 34)];
-    } else {
-        self.scrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 64 - 44)];
-    }
-    
-    self.scrollView.backgroundColor = [UIColor whiteColor];
-    [self.view addSubview:self.scrollView];
     NSString *jScript = @"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);";
@@ -291,30 +296,29 @@
     WKWebViewConfiguration *wkWebConfig = [[WKWebViewConfiguration alloc] init];
     wkWebConfig.userContentController = wkUController;
-    if (iPhoneX) {
-        _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 88 - 44 - 34) configuration:wkWebConfig];
-    } else {
-        _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 64 - 44) configuration:wkWebConfig];
-    }
+    _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, 1) configuration:wkWebConfig];
     _webView.scrollView.backgroundColor = [UIColor whiteColor];
     _webView.scrollView.showsVerticalScrollIndicator = NO;
     _webView.backgroundColor = [UIColor whiteColor];
     _webView.navigationDelegate = self;
     _webView.UIDelegate = self;
-    [self.scrollView addSubview:_webView];
-    
-    self.tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
+    _webView.scrollView.scrollEnabled = NO;
+    _webView.opaque = NO;
+    if (iPhoneX) {
+        self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 88 - 44 - 34) style:UITableViewStyleGrouped];
+
+    } else {
+        self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 64 - 44) style:UITableViewStyleGrouped];
+    }
     self.tableView.backgroundColor = [UIColor whiteColor];
-    self.tableView.backgroundView = nil;
-    self.tableView.scrollEnabled = NO;
     self.tableView.dataSource = self;
     self.tableView.delegate = self;
-    [self.scrollView addSubview:self.tableView];
+    [self.view addSubview:self.tableView];
+
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.showsVerticalScrollIndicator = NO;
-    if ([self.tableView respondsToSelector:@selector(setSeparatorInset:)]) {
-        [self.tableView setSeparatorInset:UIEdgeInsetsZero];
-    }
+    
+    self.tableView.tableHeaderView = _webView;
     self.tableView.hidden = YES;
@@ -322,7 +326,7 @@
     self.errorLabe.backgroundColor = [UIColor clearColor];
     self.errorLabe.textColor = HEXCOLOR(0x333333);
     self.errorLabe.font = [UIFont systemFontOfSize:15];
-    [self.scrollView addSubview:self.errorLabe];
+    [self.view addSubview:self.errorLabe];
     self.errorLabe.text = @"没有数据";
     self.errorLabe.hidden = YES;
@@ -478,17 +482,10 @@
     NSString *javascriptWithCSSString = [NSString stringWithFormat:javascriptString, cssString];
     [webView evaluateJavaScript:javascriptWithCSSString completionHandler:nil];
-    [webView evaluateJavaScript:@"document.body.scrollHeight" completionHandler:^(id _Nullable result,NSError * _Nullable error){
+    [webView evaluateJavaScript:@"document.body.scrollHeight" completionHandler:^(id _Nullable result, NSError * _Nullable error){
         CGFloat graphicLiveHeight = [result floatValue];
-        CGRect frame = _webView.frame;
-        frame.size.height = _webView.scrollView.contentSize.height;
-        _webView.frame = frame;
-        if (0 == [heightArr[fontIndex] floatValue]) {
-            [heightArr replaceObjectAtIndex:fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
-        }
-        [self.scrollView.mj_header endRefreshing];
-        [_webView setFrame:CGRectMake(0, 0, MainScreenWidth, [heightArr[fontIndex] floatValue])];
-        [self.scrollView setContentSize:CGSizeMake(MainScreenWidth, [heightArr[fontIndex] floatValue])];
+        _webView.height = graphicLiveHeight+30;
+        [self.tableView reloadData];
         if (!hasLoad) {
             [self loadProgramRelativeData];
         }
@@ -592,18 +589,23 @@
 -(void)viewDidLayoutSubviews{
     if ([self.tableView respondsToSelector:@selector(setSeparatorInset:)])
         [self.tableView setSeparatorInset:UIEdgeInsetsMake(0,0,0,0)];
-    
+
     if ([self.tableView respondsToSelector:@selector(setLayoutMargins:)])
         [self.tableView setLayoutMargins:UIEdgeInsetsMake(0,0,0,0)];
 }
 -(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath{
     if ([cell respondsToSelector:@selector(setSeparatorInset:)])
         [cell setSeparatorInset:UIEdgeInsetsZero];
-    
+
     if ([cell respondsToSelector:@selector(setLayoutMargins:)])
         [cell setLayoutMargins:UIEdgeInsetsZero];
 }
 - (void)didReceiveMemoryWarning{
     [super didReceiveMemoryWarning];
 }
+
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return UIStatusBarStyleLightContent;
+}
+
 @end
@@ -525,7 +525,8 @@
     frame.origin.y = y;
     frame.size.height = height;
     [relatedInformationView setFrame:frame];
-    
+    [backgroundView setContentSize:CGSizeMake(MainScreenWidth, relatedInformationView.bottom)];
+
 }
 - (void)showGraphicLive:(id)sender {
     isShow = !isShow;
@@ -325,4 +325,10 @@ static CGFloat MinActionSpeed = 500;
     [super didReceiveMemoryWarning];
 }
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    UITabBarController *tabbar = (UITabBarController *)self.rootViewController;
+    UIViewController *vc = tabbar.selectedViewController;
+    return [vc preferredStatusBarStyle];
+}
+
 @end