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

张旭
2 parents af9ea1a3 4d6ac41d
Showing 5 changed files with 61 additions and 18 deletions
CNLiveScioLive/Pages/Base/CNLiveWebViewController.h
CNLiveScioLive/Pages/Base/CNLiveWebViewController.m
CNLiveScioLive/Pages/Home/搜索/Controller/CNLiveSearchViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
Podfile
@@ -11,5 +11,6 @@
 @interface CNLiveWebViewController : CNLiveBaseViewController
 @property (nonatomic, copy) NSString *url;
 @property (nonatomic, copy) NSString *navTitle;
+@property (nonatomic,assign) BOOL isFromLH;
 @end
@@ -8,9 +8,11 @@
 #import "CNLiveWebViewController.h"
 #import <WebKit/WebKit.h>
+#import <QMUIKit/QMUIKit.h>
 @interface CNLiveWebViewController ()<WKScriptMessageHandler,WKNavigationDelegate,WKUIDelegate>
 @property(nonatomic,strong) WKWebView *webView;
+@property(nonatomic,strong) QMUIMarqueeLabel *titleLable;
 @end
@@ -20,6 +22,11 @@
     [self cleanCacheAndCookie];
 }
+-(void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    [[_webView configuration].userContentController removeScriptMessageHandlerForName:@"goback"];
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self setUpNavigationBar];
@@ -44,10 +51,23 @@
     [headerButton addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];
     self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:headerButton];
+    if (_isFromLH) {
+        UIButton *shareButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 20, 20)];
+        shareButton.layer.cornerRadius = 2.0;
+        shareButton.layer.masksToBounds = true;
+        [shareButton setImage:[UIImage imageNamed:@"cnlive_live_share"] forState:UIControlStateNormal];
+        [shareButton addTarget:self action:@selector(shareBtnTap) forControlEvents:UIControlEventTouchUpInside];
+        self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:shareButton];
+        self.navigationItem.titleView = self.titleLable;
+    }
     self.navigationItem.title = self.navTitle;
 }
-
+#pragma mark - Action
+- (void) shareBtnTap{
+    NSString *title = [NSString stringWithFormat:@"%@",self.titleLable.text];
+    [[TemplateShareManager manager] shareImage:@"" title:title text:@"" url:_url controller:self];
+}
 #pragma mark - WKNavigationDelegate
 // 页面开始加载时调用
 - (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation{
@@ -61,6 +81,12 @@
 // 页面加载完成之后调用
 - (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation{
     [MBProgressHUD hideHUDForView:self.view animated:YES];
+    if (!self.isFromLH) {
+        return;
+    }
+    [self.webView evaluateJavaScript:@"document.title" completionHandler:^(id object, NSError * error) {
+        self->_titleLable.text = object;
+    }];
 }
 // 页面加载失败时调用
@@ -119,10 +145,6 @@
     }
 }
-- (void)dealloc {
-    [[_webView configuration].userContentController removeScriptMessageHandlerForName:@"goback"];
-    
-}
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -139,6 +161,15 @@
 */
 #pragma mark - 懒加载
+- (QMUIMarqueeLabel *)titleLable
+{
+    if (!_titleLable) {
+        _titleLable = [[QMUIMarqueeLabel alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH - 80, 44)];
+        _titleLable.textColor = [UIColor whiteColor];
+        _titleLable.textAlignment = NSTextAlignmentCenter;
+    }
+    return _titleLable;
+}
 - (WKWebView *)webView {
     if (!_webView) {
@@ -869,10 +869,11 @@
                 [self.navigationController pushViewController:vc animated:YES];
             } else if ([@"LK" isEqualToString:_dic[@"type"]]) {
-                OldArticleDetailViewController *vc = [[OldArticleDetailViewController alloc] initWithDictionary:_dic];
-                vc.title = _dic[@"cmsColumnName"];
-                vc.hidesBottomBarWhenPushed = YES;
-                [self.navigationController pushViewController:vc animated:YES];
+                CNLiveWebViewController *webVC = [CNLiveWebViewController new];
+                webVC.url = [NSString stringWithFormat:@"%@",_dic[@"pageUrl"]];
+                webVC.isFromLH = YES;
+                webVC.hidesBottomBarWhenPushed = YES;
+                [self.navigationController pushViewController:webVC animated:YES];
             }
@@ -8,6 +8,7 @@
 #import "OldArticleDetailViewController.h"
 #import "OldVideoDetailViewController.h"
+#import "CNLiveWebViewController.h"
 #import "VideoTableViewCell.h"
 #import "ArticleTableViewCell.h"
@@ -44,6 +45,7 @@
     }
     return self;
 }
+
 - (NSString *)setHTMLString:(NSString *)content author:(NSString *)author {
     NSString* htmlcontent = [[NSString alloc] initWithFormat:
                             @"<!doctype html>\n"
@@ -456,16 +458,22 @@
         } else if (isHttp || isHttps || isMailto) {
             [[UIApplication sharedApplication] openURL:webView.URL];
             decisionHandler(WKNavigationActionPolicyCancel);
-        }
-    } else {
-        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;
         }
     }
     decisionHandler(WKNavigationActionPolicyAllow);
 }
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler
+{
+    NSString *webUrl = [NSString stringWithFormat:@"%@",webView.URL];
+    if (![webUrl isEqualToString:htmlUrl]) {
+        decisionHandler(WKNavigationResponsePolicyCancel);
+        CNLiveWebViewController *webVC = [CNLiveWebViewController new];
+        webVC.url = [NSString stringWithFormat:@"%@",webView.URL];
+        webVC.isFromLH = YES;
+        [self.navigationController pushViewController:webVC animated:YES];
+    }
+}
 - (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(null_unspecified WKNavigation *)navigation {
     [AlertViewTool showHUDView];
 }
@@ -475,6 +483,7 @@
 - (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation*)navigation {
     [AlertViewTool hideHUDView];
+
     _imageArray = [_webView getImgs];
     NSMutableArray *array = [NSMutableArray array];
     for (NSString *string in _imageArray) {
@@ -503,10 +512,10 @@
     [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->heightArr[0] = [NSString stringWithFormat:@"%f", graphicLiveHeight];
+        self->_webView.height = graphicLiveHeight+30;
         [self.tableView reloadData];
-        if (!hasLoad) {
+        if (!self->hasLoad) {
             [self loadProgramRelativeData];
         }
     }];
@@ -28,6 +28,7 @@ target &#39;CNLiveScioLive&#39; do
     pod 'FMDB'
     pod 'AvoidCrash', '~> 2.5.2'
     pod 'BaiduMobStatCodeless'
+    pod 'QMUIKit'
     #基础请求组件库
     pod 'CNLiveRequestBastKit'