no message

iOS-Xiaowen
1 parent 5a5164da
Showing 10 changed files with 396 additions and 131 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/Pages/Home/新闻详情/Controller/VideoDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.h
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.h
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
CNLiveScioLive/Pages/Live/View/CNLiveIndicatorTableViewCell.m
CNLiveScioLive/Pages/SDK/Html5Utils/Html5Utils.h
CNLiveScioLive/Pages/SDK/Html5Utils/WKWebView+JavaScript.h
CNLiveScioLive/Pages/SDK/Html5Utils/WKWebView+JavaScript.m
@@ -700,6 +700,7 @@
 		08C090BF215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C090BE215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m */; };
 		08C090C0215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C090BE215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m */; };
 		08C090C1215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C090BE215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m */; };
+		08E7998F24B2F52C00F15587 /* WKWebView+JavaScript.m in Sources */ = {isa = PBXBuildFile; fileRef = 08E7998E24B2F52C00F15587 /* WKWebView+JavaScript.m */; };
 		08FB8769215DD1C200DA5423 /* VoiceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08FB8767215DD1C200DA5423 /* VoiceViewController.m */; };
 		08FB876A215DD1C200DA5423 /* VoiceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08FB8767215DD1C200DA5423 /* VoiceViewController.m */; };
 		08FB876B215DD1C200DA5423 /* VoiceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08FB8767215DD1C200DA5423 /* VoiceViewController.m */; };
@@ -1193,6 +1194,8 @@
 		08C090B421510E4B00E23D16 /* CNLiveTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveTableViewCell.m; sourceTree = "<group>"; };
 		08C090BD215116CB00E23D16 /* CNLiveIndicatorTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveIndicatorTableViewCell.h; sourceTree = "<group>"; };
 		08C090BE215116CB00E23D16 /* CNLiveIndicatorTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveIndicatorTableViewCell.m; sourceTree = "<group>"; };
+		08E7998D24B2F52C00F15587 /* WKWebView+JavaScript.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WKWebView+JavaScript.h"; sourceTree = "<group>"; };
+		08E7998E24B2F52C00F15587 /* WKWebView+JavaScript.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "WKWebView+JavaScript.m"; sourceTree = "<group>"; };
 		08FB8767215DD1C200DA5423 /* VoiceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VoiceViewController.m; sourceTree = "<group>"; };
 		08FB8768215DD1C200DA5423 /* VoiceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VoiceViewController.h; sourceTree = "<group>"; };
 		08FB876C215DD3C400DA5423 /* NewVoiceTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewVoiceTableViewCell.m; sourceTree = "<group>"; };
@@ -1340,13 +1343,15 @@
 		0838485A215CAB1C00186618 /* Html5Utils */ = {
 			isa = PBXGroup;
 			children = (
+				0838485E215CAB1C00186618 /* Html5Utils.h */,
+				0838485F215CAB1C00186618 /* UIColor+Change.h */,
 				0838485B215CAB1C00186618 /* UIColor+Change.m */,
 				0838485C215CAB1C00186618 /* YWWebScrollView.h */,
+				08384861215CAB1C00186618 /* YWWebScrollView.m */,
 				0838485D215CAB1C00186618 /* UIWebView+JavaScript.h */,
-				0838485E215CAB1C00186618 /* Html5Utils.h */,
-				0838485F215CAB1C00186618 /* UIColor+Change.h */,
 				08384860215CAB1C00186618 /* UIWebView+JavaScript.m */,
-				08384861215CAB1C00186618 /* YWWebScrollView.m */,
+				08E7998D24B2F52C00F15587 /* WKWebView+JavaScript.h */,
+				08E7998E24B2F52C00F15587 /* WKWebView+JavaScript.m */,
 			);
 			path = Html5Utils;
 			sourceTree = "<group>";
@@ -3090,6 +3095,7 @@
 				08585CF3215B3AA900FC2CA2 /* NoticeTableViewCell.m in Sources */,
 				085D86292159C72F0037D480 /* ZXVideoPlayerBatteryView.m in Sources */,
 				08384862215CAB1C00186618 /* UIColor+Change.m in Sources */,
+				08E7998F24B2F52C00F15587 /* WKWebView+JavaScript.m in Sources */,
 				08C08FF2214FA24F00E23D16 /* CNLiveBaseNavigationController.m in Sources */,
 				08C09017215088B800E23D16 /* CNMyViewController.m in Sources */,
 				084ACE0721547C0C0089E035 /* CNLiveCertificatesViewController.m in Sources */,
@@ -10,8 +10,9 @@
 #import "CNHomeModel.h"
 #import "CNLiveNewsLeftPicTableViewCell.h"
 #import "CNLiveNewsDetailsView.h"
+#import <WebKit/WebKit.h>
-@interface VideoDetailViewController ()<UIWebViewDelegate,UITableViewDelegate,UITableViewDataSource>{
+@interface VideoDetailViewController ()<WKUIDelegate,WKNavigationDelegate,UITableViewDelegate,UITableViewDataSource>{
     UIScrollView *_backgroundView;
     NSURL *_movieUrl;
     NSString *_url;
@@ -26,7 +27,7 @@
 @property (copy, nonatomic) NSString *authorName;
 @property (strong, nonatomic) NSMutableArray *data;
-@property (strong, nonatomic) UIWebView *webView;
+@property (strong, nonatomic) WKWebView *webView;
 @property (nonatomic, assign) NSInteger pageNo;
 @property (nonatomic, assign) BOOL isRefreshing;
@@ -206,13 +207,13 @@ static NSString *newsLeftPicTableViewCell = @&quot;CNLiveNewsLeftPicTableViewCell&quot;;
                 }
                 if (0 == weakSelf.fontIndex) {
                     NSLog(@"0");
-                    [weakSelf.webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '100%'"];
+                    [weakSelf.webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '100%'" completionHandler:nil];
                 } else if (1 == weakSelf.fontIndex) {
                     NSLog(@"1");
-                    [weakSelf.webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '120%'"];
+                    [weakSelf.webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '120%'" completionHandler:nil];
                 } else if (2 == weakSelf.fontIndex) {
                     NSLog(@"2");
-                    [weakSelf.webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '140%'"];
+                    [weakSelf.webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '140%'" completionHandler:nil];
                 }
             }
                 break;
@@ -408,16 +409,48 @@ static NSString *newsLeftPicTableViewCell = @&quot;CNLiveNewsLeftPicTableViewCell&quot;;
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
-#pragma mark - UIWebViewDelegate
-- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType{
-    NSURL *requestURL =[request URL];
-    if (([[requestURL scheme] isEqualToString: @"http"] || [[requestURL scheme] isEqualToString:@"https"] || [[requestURL scheme] isEqualToString: @"mailto" ]) && (navigationType == UIWebViewNavigationTypeLinkClicked)) {
-        [[UIApplication sharedApplication] openURL:[request URL]];
-        return NO;
+#pragma mark - WebViewDelegate
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
+    NSURL *requestURL = webView.URL;
+    if (([[requestURL scheme] isEqualToString: @"http"] || [[requestURL scheme] isEqualToString:@"https"] || [[requestURL scheme] isEqualToString: @"mailto" ]) && (navigationAction.navigationType == WKNavigationTypeLinkActivated)) {
+        [[UIApplication sharedApplication] openURL:requestURL];
+        decisionHandler(WKNavigationActionPolicyCancel);
     }
-    return YES;
-}
-- (void)webViewDidFinishLoad:(UIWebView *)webView{
+    decisionHandler(WKNavigationActionPolicyAllow);
+}
+//- (void)webViewDidFinishLoad:(UIWebView *)webView{
+//    CGFloat width = MainScreenWidth - 20;
+//    NSString *string = [NSString stringWithFormat:
+//                        @"var script = document.createElement('script');"
+//                        "script.type = 'text/javascript';"
+//                        "script.text = \"function ResizeImages() { "
+//                        "var myimg,oldwidth;"
+//                        "var maxwidth=%f;" //缩放系数
+//                        "for(i=0;i <document.images.length;i++){"
+//                        "myimg = document.images[i];"
+//                        "if(myimg.width > maxwidth){"
+//                        "oldwidth = myimg.width;"
+//                        "myimg.width = maxwidth;"
+//                        "myimg.height = myimg.height * (maxwidth/oldwidth);"
+//                        "}"
+//                        "}"
+//                        "}\";"
+//                        "document.getElementsByTagName('head')[0].appendChild(script);",width];
+//    [webView stringByEvaluatingJavaScriptFromString:string];
+//    [webView stringByEvaluatingJavaScriptFromString:@"ResizeImages();"];
+//    CGRect frame = _webView.frame;
+//    frame.size.width = MainScreenWidth;
+//    frame.size.height = 1;
+//    _webView.frame = frame;
+//    CGFloat graphicLiveHeight = _webView.scrollView.contentSize.height;
+//    frame.size.height = _webView.scrollView.contentSize.height;
+//    _webView.frame = frame;
+//    if (0 == [_heightArr[_fontIndex] floatValue]) {
+//        [_heightArr replaceObjectAtIndex:_fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
+//    }
+//    [self loadRelatedInformation];
+//}
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation*)navigation {
     CGFloat width = MainScreenWidth - 20;
     NSString *string = [NSString stringWithFormat:
                         @"var script = document.createElement('script');"
@@ -435,18 +468,22 @@ static NSString *newsLeftPicTableViewCell = @&quot;CNLiveNewsLeftPicTableViewCell&quot;;
                         "}"
                         "}\";"
                         "document.getElementsByTagName('head')[0].appendChild(script);",width];
-    [webView stringByEvaluatingJavaScriptFromString:string];
-    [webView stringByEvaluatingJavaScriptFromString:@"ResizeImages();"];
-    CGRect frame = _webView.frame;
-    frame.size.width = MainScreenWidth;
-    frame.size.height = 1;
-    _webView.frame = frame;
-    CGFloat graphicLiveHeight = _webView.scrollView.contentSize.height;
-    frame.size.height = _webView.scrollView.contentSize.height;
-    _webView.frame = frame;
-    if (0 == [_heightArr[_fontIndex] floatValue]) {
-        [_heightArr replaceObjectAtIndex:_fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
-    }
+    [webView evaluateJavaScript:@"ResizeImages();" completionHandler:nil];
+    [webView evaluateJavaScript:string completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+        NSLog(@"value: %@ error: %@", response, error);
+        dispatch_async(dispatch_get_main_queue(), ^{
+            CGRect frame = self->_webView.frame;
+            frame.size.width = MainScreenWidth;
+            frame.size.height = 1;
+            self->_webView.frame = frame;
+            CGFloat graphicLiveHeight = self->_webView.scrollView.contentSize.height;
+            frame.size.height = self->_webView.scrollView.contentSize.height;
+            self->_webView.frame = frame;
+            if (0 == [self->_heightArr[self->_fontIndex] floatValue]) {
+                [self->_heightArr replaceObjectAtIndex:self->_fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
+            }
+        });
+    }];
     [self loadRelatedInformation];
 }
@@ -535,14 +572,23 @@ static NSString *newsLeftPicTableViewCell = @&quot;CNLiveNewsLeftPicTableViewCell&quot;;
     [self.navigationController popToRootViewControllerAnimated:YES];
 }
 #pragma mark - Lazy Laoding
-- (UIWebView *)webView {
+- (WKWebView *)webView {
     if (!_webView) {
-        _webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, 0)];
+        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 *wkWebConfig = [[WKWebViewConfiguration alloc] init];
+        wkWebConfig.userContentController = wkUController;
+        _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, 0) configuration:wkWebConfig];
         _webView.scrollView.backgroundColor = [UIColor clearColor];
-        _webView.dataDetectorTypes = UIDataDetectorTypeNone;
+//        _webView.dataDetectorTypes = UIDataDetectorTypeNone;
         _webView.backgroundColor = [UIColor clearColor];
         _webView.scrollView.bounces = NO;
-        _webView.delegate = self;
+        _webView.navigationDelegate = self;
+        _webView.UIDelegate = self;
         _webView.backgroundColor = [UIColor whiteColor];
         _webView.opaque = NO;
         _webView.scrollView.scrollEnabled = NO;
@@ -7,7 +7,9 @@
 //
 #import "CNLiveBaseViewController.h"
-@interface OldArticleDetailViewController : CNLiveBaseViewController<UIScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,UIWebViewDelegate>{
+#import <WebKit/WebKit.h>
+
+@interface OldArticleDetailViewController : CNLiveBaseViewController<UIScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,WKNavigationDelegate, WKUIDelegate>{
     NSArray *_newsArray;
     NSDictionary *_dicArticle;
     NSDictionary *_dictionary;
@@ -18,7 +20,7 @@
 }
 @property (strong, nonatomic) UILabel *errorLabe;
 @property (strong, nonatomic) NSArray *newsArray;
-@property (strong, nonatomic) UIWebView *webView;
+@property (strong, nonatomic) WKWebView *webView;
 @property (strong, nonatomic) UITableView *tableView;
 @property (strong, nonatomic) UIScrollView *scrollView;
 -(id)initWithDictionary:(NSDictionary*)dictionary;
@@ -11,14 +11,10 @@
 #import "VideoTableViewCell.h"
 #import "ArticleTableViewCell.h"
-#import "NJKWebViewProgress.h"
-#import "NJKWebViewProgressView.h"
 #import "YWWebScrollView.h"
 #import "Html5Utils.h"
-@interface OldArticleDetailViewController ()<NJKWebViewProgressDelegate,UIGestureRecognizerDelegate>{
-    NJKWebViewProgressView *_progressView;
-    NJKWebViewProgress *_progressProxy;
+@interface OldArticleDetailViewController ()<UIGestureRecognizerDelegate>{
     NSMutableArray *_imageArray;
     NSInteger typeFlag;
     NSString *htmlString;
@@ -190,13 +186,13 @@
         }
         if (0 == fontIndex) {
             NSLog(@"0");
-            [_webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '100%'"];
+            [_webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '100%'" completionHandler:nil];
         } else if (1 == fontIndex) {
             NSLog(@"1");
-            [_webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '120%'"];
+            [_webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '120%'" completionHandler:nil];
         } else if (2 == fontIndex) {
             NSLog(@"2");
-            [_webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '140%'"];
+            [_webView evaluateJavaScript:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '140%'" completionHandler:nil];
         }
     } else if (20000 == btn.tag) {
         TableData *notice = [[TableData alloc] initWithJSONDictionary:_dictionary];
@@ -255,26 +251,37 @@
     //    [self.scrollView setFooter:footer];
     [self.view addSubview:self.scrollView];
-    _progressProxy = [[NJKWebViewProgress alloc] init];
-    _progressProxy.webViewProxyDelegate = self;
-    _progressProxy.progressDelegate = self;
+//    _progressProxy = [[NJKWebViewProgress alloc] init];
+//    _progressProxy.webViewProxyDelegate = self;
+//    _progressProxy.progressDelegate = self;
-    CGFloat progressBarHeight = 2.f;
-    CGRect navigationBarBounds = self.navigationController.navigationBar.bounds;
-    CGRect barFrame = CGRectMake(0, navigationBarBounds.size.height, navigationBarBounds.size.width, progressBarHeight);
-    _progressView = [[NJKWebViewProgressView alloc] initWithFrame:barFrame];
-    _progressView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
+//    CGFloat progressBarHeight = 2.f;
+//    CGRect navigationBarBounds = self.navigationController.navigationBar.bounds;
+//    CGRect barFrame = CGRectMake(0, navigationBarBounds.size.height, navigationBarBounds.size.width, progressBarHeight);
+//    _progressView = [[NJKWebViewProgressView alloc] initWithFrame:barFrame];
+//    _progressView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
+    
+    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 *wkWebConfig = [[WKWebViewConfiguration alloc] init];
+    wkWebConfig.userContentController = wkUController;
     if (iPhoneX) {
-        _webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 88 - 44 - 34)];
+        _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 88 - 44 - 34) configuration:wkWebConfig];
     } else {
-        _webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 64 - 44)];
+        _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, MainScreenHeight - 64 - 44) configuration:wkWebConfig];
     }
     _webView.scrollView.backgroundColor = [UIColor whiteColor];
-    _webView.dataDetectorTypes = UIDataDetectorTypeNone;
+//    _webView.dataDetectorTypes = UIDataDetectorTypeNone;
     _webView.backgroundColor = [UIColor whiteColor];
-    _webView.delegate = _progressProxy;
-    _webView.scalesPageToFit = YES;
+    _webView.navigationDelegate = self;
+    _webView.UIDelegate = self;
+//    _webView.delegate = _progressProxy;
+//    _webView.scalesPageToFit = YES;
     _webView.opaque = NO;
     [self.scrollView addSubview:_webView];
@@ -310,7 +317,6 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    [self.navigationController.navigationBar addSubview:_progressView];
     NSError *error = nil;
     [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryAmbient error: &error];
@@ -360,48 +366,20 @@
     }
 }
--(void)viewWillDisappear:(BOOL)animated {
+- (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
-    [_progressView removeFromSuperview];
 }
 #pragma mark - WebView加载H5页面区域
-
--(void)webViewProgress:(NJKWebViewProgress *)webViewProgress updateProgress:(float)progress {
-    [_progressView setProgress:progress animated:YES];
-    NSLog(@"%f",progress);
-    if (progress >= 1.0) {
-        CGRect frame = _webView.frame;
-        frame.size.width = MainScreenWidth;
-        frame.size.height = 1;
-        _webView.frame = frame;
-        CGFloat graphicLiveHeight = _webView.scrollView.contentSize.height;
-        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])];
-        if (!hasLoad) {
-            [self loadProgramRelativeData];
-        }
-    }
-}
-
-- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType {
-    
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
     if (_imageArray.count) {
-        NSURL *requestURL = [request URL];
+        NSURL *requestURL = webView.URL;
         BOOL isImg = [@"img" isEqualToString:[requestURL scheme]];
         BOOL isHttp = [[requestURL scheme] isEqualToString: @"http"];
         BOOL isHttps = [[requestURL scheme] isEqualToString: @"https"];
         BOOL isMailto = [[requestURL scheme] isEqualToString: @"mailto"];
-        
         if (isImg) {
-            NSString *requesturl = [[NSString stringWithFormat:@"%@",request.URL] substringFromIndex:4];
+            NSString *requesturl = [[NSString stringWithFormat:@"%@",webView.URL] substringFromIndex:4];
             for (NSInteger indes = 0; indes < _imageArray.count; indes++) {
                 NSString *url = [NSString stringWithFormat:@"%@",_imageArray[indes]];
                 if ([url isEqualToString:requesturl]) {
@@ -409,24 +387,21 @@
                     break;
                 }
             }
-            return NO;
         } else if (isHttp || isHttps || isMailto) {
-            [[UIApplication sharedApplication] openURL:[request URL]];
-            return NO;
+            [[UIApplication sharedApplication] openURL:webView.URL];
+            decisionHandler(WKNavigationActionPolicyCancel);
         }
     } else {
-        NSURL *requestURL =[request URL];
-        if (([[requestURL scheme] isEqualToString: @"http"] || [[requestURL scheme] isEqualToString:@"https"] || [[requestURL scheme] isEqualToString: @"mailto" ]) && (navigationType == UIWebViewNavigationTypeLinkClicked)) {
-            [[UIApplication sharedApplication] openURL:[request URL]];
-            return NO;
+        NSURL *requestURL = webView.URL;
+        if (([[requestURL scheme] isEqualToString: @"http"] || [[requestURL scheme] isEqualToString:@"https"] || [[requestURL scheme] isEqualToString: @"mailto" ]) && (navigationAction.navigationType == WKNavigationTypeLinkActivated)) {
+            [[UIApplication sharedApplication] openURL:webView.URL];
+            decisionHandler(WKNavigationActionPolicyCancel);
         }
     }
-    return YES;
+    decisionHandler(WKNavigationActionPolicyAllow);
 }
-- (void)webViewDidStartLoad:(UIWebView *)webView{
-    NSLog(@"did start");
-}
-- (void)webViewDidFinishLoad:(UIWebView *)webView{
+    
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation*)navigation {
     _imageArray = [_webView getImgs];
     NSMutableArray *array = [NSMutableArray array];
     for (NSString *string in _imageArray) {
@@ -438,20 +413,38 @@
     [webView addClickEventOnImg];//有的图片没有点击事件
     //使页面中图片width=100%
-    [self.webView stringByEvaluatingJavaScriptFromString:
+    [self.webView evaluateJavaScript:
      @"var script = document.createElement('script');"
      "script.type = 'text/javascript';"
      "script.text = \"var imgs = document.getElementById('article_content').getElementsByTagName('img')\";"
      "for(var i=0; i<imgs.length; i++){"
      "imgs[i].style.width = '100%';"
      "}"
-     "document.getElementsByTagName('body')[0].appendChild(script);"];
+     "document.getElementsByTagName('body')[0].appendChild(script);" completionHandler:nil];
     //通过css隐藏h5页面中头部和底部的logo
     NSString *cssString = @".container { display:none !important; }";
     NSString *javascriptString = @"var style = document.createElement('style'); style.innerHTML = '%@'; document.head.appendChild(style)";
     NSString *javascriptWithCSSString = [NSString stringWithFormat:javascriptString, cssString];
-    [webView stringByEvaluatingJavaScriptFromString:javascriptWithCSSString];
+    [webView evaluateJavaScript:javascriptWithCSSString completionHandler:nil];
+    
+    CGRect frame = _webView.frame;
+    frame.size.width = MainScreenWidth;
+    frame.size.height = 1;
+    _webView.frame = frame;
+    CGFloat graphicLiveHeight = _webView.scrollView.contentSize.height;
+    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])];
+    if (!hasLoad) {
+        [self loadProgramRelativeData];
+    }
 }
 -(void)pushPicController:(NSString *)url withPoint:(NSInteger)CurrentIndex {
@@ -10,15 +10,16 @@
 #import "CNLiveMyCollectionViewController.h"
 #import "CNLivePlayerController.h"
 #import "BaseViewController.h"
+#import <WebKit/WebKit.h>
-@interface OldVideoDetailViewController : BaseViewController<UITableViewDelegate,UITableViewDataSource,UIWebViewDelegate>{
+@interface OldVideoDetailViewController : BaseViewController<UITableViewDelegate,UITableViewDataSource,WKUIDelegate,WKNavigationDelegate>{
     UIScrollView *backgroundView;
     UIImageView *imageView;
     UIButton *playBtn;
     NSURL *movieUrl;
     NSString *url;
     UIImage *bgImg;
-    UIWebView *_webView;
+    WKWebView *_webView;
     NSArray *_newsArray;
     CGFloat videoHeight;
     NSDictionary *_dictionary;
@@ -201,13 +201,24 @@
     fontIndex = (int)[[NSUserDefaults standardUserDefaults] integerForKey:@"FontSize"];
     heightArr = [NSMutableArray arrayWithArray:@[@"0",@"0",@"0"]];
     fontArray = @[@"16",@"20",@"24"];
+
+    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 *wkWebConfig = [[WKWebViewConfiguration alloc] init];
+    wkWebConfig.userContentController = wkUController;
-    _webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, 0)];
+    _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, 0) configuration:wkWebConfig];
     _webView.scrollView.backgroundColor = [UIColor clearColor];
-    _webView.dataDetectorTypes = UIDataDetectorTypeNone;
+//    _webView.dataDetectorTypes = UIDataDetectorTypeNone;
     _webView.backgroundColor = [UIColor clearColor];
     _webView.scrollView.bounces = NO;
-    _webView.delegate = self;
+//    _webView.delegate = self;
+    _webView.navigationDelegate = self;
+    _webView.UIDelegate = self;
     _webView.opaque = NO;
     [backgroundView addSubview:_webView];
     [_webView loadHTMLString:[self setHTMLString] baseURL:nil];
@@ -366,15 +377,15 @@
     video.title = _dictionary[@"title"];
     self.videoController.video = video;
 }
-- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType{
-    NSURL *requestURL =[request URL];
-    if (([[requestURL scheme] isEqualToString: @"http"] || [[requestURL scheme] isEqualToString:@"https"] || [[requestURL scheme] isEqualToString: @"mailto" ]) && (navigationType == UIWebViewNavigationTypeLinkClicked)) {
-        [[UIApplication sharedApplication] openURL:[request URL]];
-        return NO;
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
+    NSURL *requestURL = webView.URL;
+    if (([[requestURL scheme] isEqualToString: @"http"] || [[requestURL scheme] isEqualToString:@"https"] || [[requestURL scheme] isEqualToString: @"mailto" ]) && (navigationAction.navigationType == WKNavigationTypeLinkActivated)) {
+        [[UIApplication sharedApplication] openURL:requestURL];
+        decisionHandler(WKNavigationActionPolicyCancel);
     }
-    return YES;
+    decisionHandler(WKNavigationActionPolicyAllow);
 }
-- (void)webViewDidFinishLoad:(UIWebView *)webView{
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation*)navigation {
     CGFloat width = MainScreenWidth - 20;
     NSString *string = [NSString stringWithFormat:
                         @"var script = document.createElement('script');"
@@ -392,18 +403,22 @@
                         "}"
                         "}\";"
                         "document.getElementsByTagName('head')[0].appendChild(script);",width];
-    [webView stringByEvaluatingJavaScriptFromString:string];
-    [webView stringByEvaluatingJavaScriptFromString:@"ResizeImages();"];
-    CGRect frame = _webView.frame;
-    frame.size.width = MainScreenWidth;
-    frame.size.height = 1;
-    _webView.frame = frame;
-    CGFloat graphicLiveHeight = _webView.scrollView.contentSize.height;
-    frame.size.height = _webView.scrollView.contentSize.height;
-    _webView.frame = frame;
-    if (0 == [heightArr[fontIndex] floatValue]) {
-        [heightArr replaceObjectAtIndex:fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
-    }
+    [webView evaluateJavaScript:@"ResizeImages();" completionHandler:nil];
+    [webView evaluateJavaScript:string completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+        NSLog(@"value: %@ error: %@", response, error);
+        dispatch_async(dispatch_get_main_queue(), ^{
+            CGRect frame = self->_webView.frame;
+            frame.size.width = MainScreenWidth;
+            frame.size.height = 1;
+            self->_webView.frame = frame;
+            CGFloat graphicLiveHeight = self->_webView.scrollView.contentSize.height;
+            frame.size.height = self->_webView.scrollView.contentSize.height;
+            self->_webView.frame = frame;
+            if (0 == [self->heightArr[self->fontIndex] floatValue]) {
+                [self->heightArr replaceObjectAtIndex:self->fontIndex withObject:[NSString stringWithFormat:@"%f",graphicLiveHeight]];
+            }
+        });
+    }];
     [self loadRelatedInformation];
 }
 - (void)loadRelatedInformation {
@@ -447,8 +462,6 @@
               [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"ServerBusy")];
           }];
 }
-- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error{
-}
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     return [_newsArray count];
 }
@@ -23,7 +23,7 @@
 {
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
-        self.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+//        self.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.numberOfLines = 2;
         _titleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
@@ -8,6 +8,8 @@
 #import <UIKit/UIKit.h>
 #import "UIWebView+JavaScript.h"
+#import "WKWebView+JavaScript.h"
+
 //! Project version number for Html5Utils.
 FOUNDATION_EXPORT double Html5UtilsVersionNumber;
+//
+//  WKWebView+JavaScript.h
+//  CNLiveScioLive
+//
+//  Created by CNLive-zxw on 2020/7/6.
+//  Copyright © 2020 CNLive. All rights reserved.
+//
+
+#import <WebKit/WebKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface WKWebView (JavaScript)
+///  获取某个标签的结点个数
+- (int)nodeCountOfTag:(NSString *)tag;
+
+///  获取当前页面URL
+- (NSString *)getCurrentURL;
+
+///  获取标题
+- (NSString *)getTitle;
+
+///  获取文章内容
+- (NSString *)getContent;
+
+///  获取图片
+- (NSMutableArray *)getImgs;
+
+///  获取当前页面所有链接
+- (NSArray *)getOnClicks;
+
+///  改变背景颜色
+- (void)setBackgroundColor:(UIColor *)color;
+
+///  为所有图片添加点击事件(网页中有些图片添加无效)
+- (void)addClickEventOnImg;
+
+///  改变指定标签的字体颜色
+- (void)setFontColor:(UIColor *)color withTag:(NSString *)tagName;
+
+///  改变指定标签的字体大小
+- (void)setFontSize:(int)size withTag:(NSString *)tagName;
+
+///  设置网页没有拷贝粘贴
+- (void)disableTouchCallout;
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  WKWebView+JavaScript.m
+//  CNLiveScioLive
+//
+//  Created by CNLive-zxw on 2020/7/6.
+//  Copyright © 2020 CNLive. All rights reserved.
+//
+
+#import "WKWebView+JavaScript.h"
+#import "UIColor+Change.h"
+#define HTML_STRING_NIL_TO_NONE_IF(x) [WKWebView STRING_NIL_TO_NONE:x]
+
+@implementation WKWebView (JavaScript)
+
++ (NSString *)STRING_NIL_TO_NONE:(NSString *)x {
+    if (x == nil || ([x isKindOfClass:[NSNull class]]) || ([x isKindOfClass:[NSString class]]&&x.length<=0) || [x isEqual:NULL]){
+        return @"";
+    } else {
+        return [NSString stringWithFormat:@"%@",x];
+    }
+}
+
+///  获取某个标签的结点个数
+- (int)nodeCountOfTag:(NSString *)tag {
+    __block int len = 0;
+    [self evaluateJavaScript:@"document.getElementsByTagName('%@').length" completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+        NSLog(@"value: %@ error: %@", response, error);
+        len = [response intValue];
+    }];
+    return len;
+
+//    NSString *jsString = [NSString stringWithFormat:@"document.getElementsByTagName('%@').length", tag];
+//
+//    int len = [[self evaluateJavaScript:jsString completionHandler:nil] intValue];
+//    return len;
+}
+
+///  获取当前页面URL
+- (NSString *)getCurrentURL {
+//    return HTML_STRING_NIL_TO_NONE_IF([self evaluateJavaScript:@"document.location.href" completionHandler:nil]);
+    __block NSString *result = @"";
+    [self evaluateJavaScript:@"document.location.href" completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+        NSLog(@"value: %@ error: %@", response, error);
+        result = HTML_STRING_NIL_TO_NONE_IF(response);
+    }];
+    return result;
+}
+
+///  获取标题
+- (NSString *)getTitle {
+    __block NSString *result = @"";
+    [self evaluateJavaScript:@"document.title" completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+        NSLog(@"value: %@ error: %@", response, error);
+        result = HTML_STRING_NIL_TO_NONE_IF(response);
+    }];
+    return result;
+//    return HTML_STRING_NIL_TO_NONE_IF([self evaluateJavaScript:@"document.title" completionHandler:nil]);
+}
+
+///  获取文章内容
+- (NSString *)getContent{
+    __block NSString *result = @"";
+    [self evaluateJavaScript:@"document.documentElement.innerText" completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+        NSLog(@"value: %@ error: %@", response, error);
+//        if (!result) {
+//            result = [self evaluateJavaScript:@"document.body.innerText" completionHandler:nil];
+//        }
+        result = HTML_STRING_NIL_TO_NONE_IF(result);
+    }];
+    return result;
+    
+//    NSString *result = [self evaluateJavaScript:@"document.documentElement.innerText" completionHandler:nil];
+//    if (!result) {
+//        result = [self evaluateJavaScript:@"document.body.innerText" completionHandler:nil];
+//    }
+//    result = HTML_STRING_NIL_TO_NONE_IF(result);
+//    return result;
+}
+
+///  获取所有图片链接
+- (NSMutableArray *)getImgs {
+    __block NSMutableArray *arrImgURL = [[NSMutableArray alloc] init];
+    int node = [self nodeCountOfTag:@"img"];
+    for (int i = 0; i < node; i++) {
+        NSString *jsString = [NSString stringWithFormat:@"document.getElementsByTagName('img')[%d].src", i];
+//        NSString *img = [self evaluateJavaScript:jsString completionHandler:nil];
+        [self evaluateJavaScript:jsString completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+            NSLog(@"value: %@ error: %@", response, error);
+            [arrImgURL addObject:response];
+        }];
+//        [arrImgURL addObject:img];
+    }
+    return arrImgURL;
+}
+
+///  获取当前页面所有点击链接
+- (NSArray *)getOnClicks {
+    __block NSMutableArray *arrOnClicks = [[NSMutableArray alloc] init];
+    int node = [self nodeCountOfTag:@"a"];
+    for (int i = 0; i < node; i++) {
+        NSString *jsString = [NSString stringWithFormat:@"document.getElementsByTagName('a')[%d].getAttribute('onclick')", i];
+//        NSString *clickString = [self evaluateJavaScript:jsString completionHandler:nil];
+        [self evaluateJavaScript:jsString completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+            NSLog(@"value: %@ error: %@", response, error);
+            [arrOnClicks addObject:response];
+        }];
+//        [arrOnClicks addObject:clickString];
+    }
+    return arrOnClicks;
+}
+
+///  改变背景颜色
+- (void)setBackgroundColor:(UIColor *)color {
+    NSString * jsString = [NSString stringWithFormat:@"document.body.style.backgroundColor = '%@'",[color webColorString]];
+    [self evaluateJavaScript:jsString completionHandler:nil];
+}
+
+///  为所有图片添加点击事件(网页中有些图片添加无效)
+- (void)addClickEventOnImg {
+    int node = [self nodeCountOfTag:@"img"];
+    for (int i = 0; i < node; i++) {
+        //利用重定向获取img.src，为区分，给url添加'img:'前缀
+        NSString *jsString = [NSString stringWithFormat:
+                              @"document.getElementsByTagName('img')[%d].onclick = \
+                              function() { document.location.href = 'img:' + this.src; }",i];
+        [self evaluateJavaScript:jsString completionHandler:nil];
+    }
+}
+
+///  改变指定标签的字体颜色
+- (void)setFontColor:(UIColor *)color withTag:(NSString *)tagName {
+    NSString *jsString = [NSString stringWithFormat:
+                          @"var nodes = document.getElementsByTagName('%@'); \
+                          for(var i=0;i<nodes.length;i++){\
+                          nodes[i].style.color = '%@';}", tagName, [color webColorString]];
+    [self evaluateJavaScript:jsString completionHandler:nil];
+}
+
+///  改变指定标签的字体大小
+- (void)setFontSize:(int)size withTag:(NSString *)tagName {
+    NSString *jsString = [NSString stringWithFormat:
+                          @"var nodes = document.getElementsByTagName('%@'); \
+                          for(var i=0;i<nodes.length;i++){\
+                          nodes[i].style.fontSize = '%dpx';}", tagName, size];
+    [self evaluateJavaScript:jsString completionHandler:nil];
+}
+
+///  设置网页没有拷贝粘贴
+- (void)disableTouchCallout {
+    [self evaluateJavaScript:@"document.documentElement.style.webkitUserSelect='none';" completionHandler:nil];
+    [self evaluateJavaScript:@"document.documentElement.style.webkitTouchCallout='none';" completionHandler:nil];
+}
+
+@end