no message

zhangxiaowen
1 parent 866f3c84
Showing 14 changed files with 4 additions and 697 deletions
CNLiveBalanceModule/Classes/Detail/CNLiveBalanceDetailController.m
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordDetailHeaderView.m
Example/CNLiveBalanceModule.xcodeproj/project.pbxproj
Example/CNLiveBalanceModule/CNLIVEAppDelegate.m
Example/CNLiveBalanceModule/CNLIVEViewController.h
Example/CNLiveBalanceModule/CNLIVEViewController.m
Example/CNLiveBalanceModule/CNLiveBaseViewController.h
Example/CNLiveBalanceModule/CNLiveBaseViewController.m
Example/CNLiveBalanceModule/CNLiveBaseWebViewController.h
Example/CNLiveBalanceModule/CNLiveBaseWebViewController.m
Example/CNLiveBalanceModule/CNLiveInteractionWebController.h
Example/CNLiveBalanceModule/CNLiveInteractionWebController.m
Example/CNLiveBalanceModule/CNLiveWebView.h
Example/CNLiveBalanceModule/CNLiveWebView.m
@@ -99,7 +99,6 @@ static const CGFloat height = 44;
     }
     return _navigationBar;
 }
-
 - (UIView *)tline {
     if (!_tline) {
         _tline = [[UIView alloc] initWithFrame:CGRectMake(0, NavigationContentTop, self.view.bounds.size.width, 0.5)];
@@ -126,7 +125,6 @@ static const CGFloat height = 44;
     }
     return _titleCategoryView;
 }
-
 - (UIView *)bline {
     if (!_bline) {
         _bline = [[UIView alloc] initWithFrame:CGRectMake(0, _titleCategoryView.bottom, self.view.bounds.size.width, 0.5)];
@@ -134,7 +132,6 @@ static const CGFloat height = 44;
     }
     return _bline;
 }
-
 - (JXCategoryListContainerView *)listContainerView {
     if (_listContainerView == nil) {
         _listContainerView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self];
@@ -142,7 +139,6 @@ static const CGFloat height = 44;
     }
     return _listContainerView;
 }
-
 - (NSArray *)titles{
     if (!_titles) {
         _titles = [NSArray arrayWithObjects:@"全部", @"收入", @"支出", nil];
@@ -76,7 +76,7 @@ static const NSInteger height = 40;
             self.shopIcon.image =  [self getImageWithImageName:@"trading_record_union_pay" bundleName:@"CNLiveBalanceModule" targetClass:[self class]];
             self.shopName.text = @"银行卡";
         } else {
-            self.shopIcon.image = [UIImage imageNamed:@""];
+            self.shopIcon.image = nil;
             self.shopName.text = @"未知";
         }
     } else if ([model.sourceType containsString:@"order"] || [model.sourceType containsString:@"payment"]) {
@@ -9,11 +9,7 @@
 /* Begin PBXBuildFile section */
 		008EDC6D9F59708FC31D66E2 /* Pods_CNLiveBalanceModule_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF1592377FBDD3732275DFDB /* Pods_CNLiveBalanceModule_Example.framework */; };
 		08827AFE23A8B4AC00EBF18F /* UIViewController+NavigationBarHidden.m in Sources */ = {isa = PBXBuildFile; fileRef = 08827AFD23A8B4AC00EBF18F /* UIViewController+NavigationBarHidden.m */; };
-		08ADA66223A381E100072772 /* CNLiveBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08ADA66123A381E100072772 /* CNLiveBaseViewController.m */; };
-		08CA954D23A4609F001B1A99 /* CNLiveWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 08CA954B23A4609F001B1A99 /* CNLiveWebView.m */; };
 		08CA955023A47090001B1A99 /* CNLiveBaseNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08CA954F23A47090001B1A99 /* CNLiveBaseNavigationController.m */; };
-		08CA955923A4B492001B1A99 /* CNLiveBaseWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08CA955723A4B492001B1A99 /* CNLiveBaseWebViewController.m */; };
-		08CA955C23A4B552001B1A99 /* CNLiveInteractionWebController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08CA955A23A4B552001B1A99 /* CNLiveInteractionWebController.m */; };
 		6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
 		6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
 		6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
@@ -45,16 +41,8 @@
 /* Begin PBXFileReference section */
 		08827AFC23A8B4AC00EBF18F /* UIViewController+NavigationBarHidden.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+NavigationBarHidden.h"; sourceTree = "<group>"; };
 		08827AFD23A8B4AC00EBF18F /* UIViewController+NavigationBarHidden.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+NavigationBarHidden.m"; sourceTree = "<group>"; };
-		08ADA66023A381E100072772 /* CNLiveBaseViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveBaseViewController.h; sourceTree = "<group>"; };
-		08ADA66123A381E100072772 /* CNLiveBaseViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveBaseViewController.m; sourceTree = "<group>"; };
-		08CA954B23A4609F001B1A99 /* CNLiveWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveWebView.m; sourceTree = "<group>"; };
-		08CA954C23A4609F001B1A99 /* CNLiveWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveWebView.h; sourceTree = "<group>"; };
 		08CA954E23A47090001B1A99 /* CNLiveBaseNavigationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveBaseNavigationController.h; sourceTree = "<group>"; };
 		08CA954F23A47090001B1A99 /* CNLiveBaseNavigationController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveBaseNavigationController.m; sourceTree = "<group>"; };
-		08CA955723A4B492001B1A99 /* CNLiveBaseWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveBaseWebViewController.m; sourceTree = "<group>"; };
-		08CA955823A4B492001B1A99 /* CNLiveBaseWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveBaseWebViewController.h; sourceTree = "<group>"; };
-		08CA955A23A4B552001B1A99 /* CNLiveInteractionWebController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveInteractionWebController.m; sourceTree = "<group>"; };
-		08CA955B23A4B552001B1A99 /* CNLiveInteractionWebController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveInteractionWebController.h; sourceTree = "<group>"; };
 		0D75FC30984EA4E2CA7EBB7D /* Pods-CNLiveBalanceModule_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveBalanceModule_Example.debug.xcconfig"; path = "Target Support Files/Pods-CNLiveBalanceModule_Example/Pods-CNLiveBalanceModule_Example.debug.xcconfig"; sourceTree = "<group>"; };
 		17A0C3C4449A3213C9347BB9 /* Pods-CNLiveBalanceModule_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveBalanceModule_Tests.release.xcconfig"; path = "Target Support Files/Pods-CNLiveBalanceModule_Tests/Pods-CNLiveBalanceModule_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		2D5F9D4C44F18F703DCFAC06 /* Pods-CNLiveBalanceModule_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CNLiveBalanceModule_Example.release.xcconfig"; path = "Target Support Files/Pods-CNLiveBalanceModule_Example/Pods-CNLiveBalanceModule_Example.release.xcconfig"; sourceTree = "<group>"; };
@@ -166,18 +154,10 @@
 				873B8AEA1B1F5CCA007FD442 /* Main.storyboard */,
 				6003F5A5195388D20070C39A /* CNLIVEViewController.h */,
 				6003F5A6195388D20070C39A /* CNLIVEViewController.m */,
-				08ADA66023A381E100072772 /* CNLiveBaseViewController.h */,
-				08ADA66123A381E100072772 /* CNLiveBaseViewController.m */,
 				08827AFC23A8B4AC00EBF18F /* UIViewController+NavigationBarHidden.h */,
 				08827AFD23A8B4AC00EBF18F /* UIViewController+NavigationBarHidden.m */,
 				08CA954E23A47090001B1A99 /* CNLiveBaseNavigationController.h */,
 				08CA954F23A47090001B1A99 /* CNLiveBaseNavigationController.m */,
-				08CA954C23A4609F001B1A99 /* CNLiveWebView.h */,
-				08CA954B23A4609F001B1A99 /* CNLiveWebView.m */,
-				08CA955823A4B492001B1A99 /* CNLiveBaseWebViewController.h */,
-				08CA955723A4B492001B1A99 /* CNLiveBaseWebViewController.m */,
-				08CA955B23A4B552001B1A99 /* CNLiveInteractionWebController.h */,
-				08CA955A23A4B552001B1A99 /* CNLiveInteractionWebController.m */,
 				71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */,
 				6003F5A8195388D20070C39A /* Images.xcassets */,
 				6003F594195388D20070C39A /* Supporting Files */,
@@ -458,15 +438,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				08ADA66223A381E100072772 /* CNLiveBaseViewController.m in Sources */,
-				08CA955923A4B492001B1A99 /* CNLiveBaseWebViewController.m in Sources */,
 				6003F59E195388D20070C39A /* CNLIVEAppDelegate.m in Sources */,
 				08827AFE23A8B4AC00EBF18F /* UIViewController+NavigationBarHidden.m in Sources */,
 				6003F5A7195388D20070C39A /* CNLIVEViewController.m in Sources */,
-				08CA955C23A4B552001B1A99 /* CNLiveInteractionWebController.m in Sources */,
 				6003F59A195388D20070C39A /* main.m in Sources */,
 				08CA955023A47090001B1A99 /* CNLiveBaseNavigationController.m in Sources */,
-				08CA954D23A4609F001B1A99 /* CNLiveWebView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -11,9 +11,6 @@
 #import "CNLiveEnvironment.h"
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
 #import "CNLiveBalanceController.h"
-#import "CNLiveBaseViewController.h"
-#import "CNLiveBaseWebViewController.h"
-#import "CNLiveInteractionWebController.h"
 #import "CNLIVEViewController.h"
 @implementation CNLIVEAppDelegate
@@ -67,7 +64,7 @@
     [[NSUserDefaults standardUserDefaults] setObject:@"RkFYeLkl/u5S7tW8UcOkT3rfLTP/Ua8NIkdEsKlcolvl/yxTMNbAYXmmJyhKGpkj" forKey:@"CNLiveAuthToken"];
 //    CNLiveBaseViewController *vc = [[CNLiveBaseViewController alloc] init];
-    CNLiveBalanceController *vc = [[CNLiveBalanceController alloc] initWithType:@"2" ID:CNUserShareModel.uid];
+    CNLiveBalanceController *vc = [[CNLiveBalanceController alloc] initWithType:@"1" ID:CNUserShareModel.uid];
 //    CNLIVEViewController *vc = [[CNLIVEViewController alloc] initWithUrl:@"http://www.baidu.com" title:@"asdasd" closeHidden:NO];
 //    CNLIVEViewController *vc = [[CNLIVEViewController alloc] initWithUrl:@"http://wjjh5test.cnlive.com/cnComplaint.html" title:@"" closeHidden:NO];
@@ -6,9 +6,9 @@
 //  Copyright (c) 2019 153993236@qq.com. All rights reserved.
 //
-#import "CNLiveInteractionWebController.h"
+#import <UIKit/UIKit.h>
-@interface CNLIVEViewController : CNLiveInteractionWebController
+@interface CNLIVEViewController : UIViewController
 @end
@@ -7,48 +7,12 @@
 //
 #import "CNLIVEViewController.h"
-#import "WKWebViewJavascriptBridge.h"
-#import "CNLiveWebView.h"
 @interface CNLIVEViewController ()
 @end
 @implementation CNLIVEViewController
-#pragma mark - 交互
-- (void)interaction {
-    [super interaction];
-    [self.bridge registerHandler:@"wjjHelpAndFeedbackImage" handler:^(id data, WVJBResponseCallback responseCallback) {
-        NSLog(@"ObjC Echo called with: %@", data);
-        responseCallback(data);
-    }];
-    id dataDic = @{
-                    //                   @"imagePath": imagePath,
-                    @"image" : @"asd"
-                    };
-     // 帮助与反馈->产品建议:App提交图片数据给h5展示
-     [self.bridge callHandler:@"wjjCommitImageToJS" data:dataDic responseCallback:^(id responseData) {
-         NSLog(@"ObjC received response: %@", responseData);
-     }];
-}
-
-#pragma mark - Setter方法
-- (void)setUrl:(NSString *)url{
-    if(!url||[url isEqualToString:@""]) return;
-    [super setUrl:[NSString stringWithFormat:@"%@?asd",url]];
-}
-
-#pragma mark - CNLiveWebViewDelegate
-- (void)webView:(CNLiveWebView *)webView didFinishLoadWithURL:(NSURL *)url {
-    NSLog(@"CNLIVEViewController - didFinishLoad");
-    if(self.title.length == 0){
-        self.title = webView.title;
-    }
-}
-
-- (void)webView:(CNLiveWebView *)webView didFailLoadWithError:(NSError *)error {
-    
-}
 - (void)didReceiveMemoryWarning
 {
-//
-//  CNLiveBaseViewController.h
-//  CNLiveBaseClass
-//
-//  Created by CNLive-zxw on 2019/12/13.
-//  Copyright © 2019 153993236@qq.com. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CNLiveBaseViewController : UIViewController
-// 是否隐藏导航栏
-@property (nonatomic, assign) BOOL navigationHidden;
-
-// 是否开启侧滑返回手势
-@property (nonatomic, assign) BOOL interactive;
-
-// 子类重写添加子视图方法
-- (void)createSubViews;
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  CNLiveBaseViewController.m
-//  CNLiveBaseClass
-//
-//  Created by CNLive-zxw on 2019/12/13.
-//  Copyright © 2019 153993236@qq.com. All rights reserved.
-//
-
-#import "CNLiveBaseViewController.h"
-#import "CNLiveNavigationBar.h"
-
-@interface CNLiveBaseViewController ()
-@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
-
-@end
-
-@implementation CNLiveBaseViewController
-#pragma mark - 生命周期
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    self.navigationController.navigationBarHidden = YES;
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
-    // 禁止页面左侧滑动返回，注意，如果仅仅需要禁止此单个页面返回，还需要在viewWillDisapper下开放侧滑权限
-    // 禁用返回手势
-    if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
-        self.navigationController.interactivePopGestureRecognizer.enabled = self.interactive;
-    }
-    
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-    self.view.backgroundColor = [UIColor whiteColor];
-    self.automaticallyAdjustsScrollViewInsets = NO;
-    [self createSubViews];
-}
-
-#pragma mark - UI
-- (void)createSubViews{
-    [self.view addSubview:self.navigationBar];
-}
-
-#pragma mark - Setter方法
-- (void)setTitle:(NSString *)title{
-    [super setTitle:title];
-    self.navigationBar.title.text = title;
-}
-
-- (void)setNavigationHidden:(BOOL)navigationHidden{
-    _navigationHidden = navigationHidden;
-    _navigationBar.hidden = navigationHidden;
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-#pragma mark - 响应方法
-- (void)goBack {
-    if (self.presentingViewController != nil) {
-        [self dismissViewControllerAnimated:YES completion:nil];
-    }
-    else {
-        [self.navigationController popViewControllerAnimated:YES];
-    }
-}
-
-#pragma mark - 懒加载
-- (CNLiveNavigationBar *)navigationBar {
-    if (!_navigationBar) {
-        _navigationBar = [CNLiveNavigationBar navigationBar];
-        _navigationBar.title.text = self.title;
-        __weak typeof(self) weakSelf = self;
-        _navigationBar.onClickLeftButton = ^{
-            __strong typeof(weakSelf) strongSelf = weakSelf;
-            if(!strongSelf) return ;
-            [strongSelf goBack];
-        };
-    }
-    return _navigationBar;
-}
-
-@end
-//
-//  CNLiveBaseWebViewController.h
-//  CNLiveBaseClass
-//
-//  Created by CNLive-zxw on 2019/12/7.
-//  Copyright © 2019 153993236@qq.com. All rights reserved.
-//
-
-/*
- * 没有交互的WebView
- */
-
-#import "CNLiveBaseViewController.h"
-
-NS_ASSUME_NONNULL_BEGIN
-@class CNLiveWebView;
-
-@interface CNLiveBaseWebViewController : CNLiveBaseViewController
-@property (nonatomic, strong) CNLiveWebView *webView;
-@property (nonatomic, copy) NSString *url;
-
-- (instancetype)initWithUrl:(NSString *)url;
-- (instancetype)initWithUrl:(NSString *)url title:(nullable NSString *)title;
-- (instancetype)initWithUrl:(NSString *)url title:(nullable NSString *)title closeHidden:(BOOL)closeHidden;
-
-- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  CNLiveBaseWebViewController.m
-//  CNLiveBaseClass
-//
-//  Created by CNLive-zxw on 2019/12/7.
-//  Copyright © 2019 153993236@qq.com. All rights reserved.
-//
-
-#import "CNLiveBaseWebViewController.h"
-#import <WebKit/WebKit.h>
-#import "QMUIKit.h"
-#import "CNLiveCategory.h"
-#import "CNLiveWebView.h"
-#import "CNLiveNavigationBar.h"
-
-@interface CNLiveBaseWebViewController ()<CNLiveWebViewDelegate>
-@property (nonatomic, strong) UIButton *closeBtn;
-@property (nonatomic, assign) BOOL closeHidden;
-
-@end
-
-@implementation CNLiveBaseWebViewController
-static const NSInteger margin = 10;
-
-#pragma mark - 初始化
-- (instancetype)initWithUrl:(NSString *)url{
-    return [self initWithUrl:url title:@"" closeHidden:YES];
-}
-- (instancetype)initWithUrl:(NSString *)url title:(nullable NSString *)title{
-    return [self initWithUrl:url title:title closeHidden:YES];
-}
-- (instancetype)initWithUrl:(NSString *)url title:(nullable NSString *)title closeHidden:(BOOL)closeHidden {
-    self = [super init];
-    if (self) {
-        self.url = url;
-        self.title = title;
-        self.closeHidden = closeHidden;
-    }
-    return self;
-}
-
-#pragma mark - Setter方法
-- (void)setUrl:(NSString *)url{
-    if(!url||[url isEqualToString:@""]) return;
-    _url = url;
-}
-
-- (NSString *)editHtml:(NSString *)url{
-    return [NSString stringWithFormat:@"<div style=\"font-size:45px\">%@</div>",url];
-}
-
-#pragma mark - 生命周期
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    if ([_url hasPrefix:@"http://"]||[_url hasPrefix:@"https://"]) {
-        NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:_url] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:10.0];
-        [self.webView loadRequest:request];
-        
-    } else {
-        [self.webView loadHTMLString:[self editHtml:_url]];
-    }
-}
-
-- (void)createSubViews {
-    [super createSubViews];
-    if(!self.closeHidden&&!self.navigationHidden){
-        [self.view addSubview:self.closeBtn];
-    }
-    [self.view addSubview:self.webView];
-}
-
-#pragma mark - CNLiveWebViewDelegate
-- (void)webView:(CNLiveWebView *)webView didFinishLoadWithURL:(NSURL *)url {
-    NSLog(@"CNLiveWebViewController - didFinishLoad");
-    if(self.title.length == 0){
-        self.title = webView.title;
-    }
-}
-
-- (void)webView:(CNLiveWebView *)webView didFailLoadWithError:(NSError *)error{
-
-}
-
-#pragma mark - 响应方法
-//回退goBack
-- (void)goBack {
-    if ([self.webView canGoBack]) {
-        [self.webView goBack];
-    }
-    else {
-        [self closeDidClicked];
-    }
-}
-
-//关闭pop
-- (void)closeDidClicked {
-    if (self.presentingViewController != nil) {
-        [self dismissViewControllerAnimated:YES completion:nil];
-    }
-    else {
-        [self.navigationController popViewControllerAnimated:YES];
-    }
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-#pragma mark - 懒加载
-- (UIButton *)closeBtn{
-    if(!_closeBtn){
-        _closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        _closeBtn.adjustsImageWhenHighlighted = NO;
-        _closeBtn.frame = CGRectMake(NavigationBarHeight+margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight);
-        UIImage *image = [self getImageWithImageName:@"cnlive_black_close" bundleName:@"CNLiveCustomControl" targetClass:[CNLiveNavigationBar class]];
-        [_closeBtn setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
-        [_closeBtn addTarget:self action:@selector(closeDidClicked) forControlEvents:UIControlEventTouchUpInside];
-        [_closeBtn setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
-        _closeBtn.hidden = self.closeHidden;
-    }
-    return _closeBtn;
-}
-
-- (CNLiveWebView *)webView{
-    if(!_webView){
-        _webView = [CNLiveWebView webViewWithFrame:CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop)];
-        _webView.delegate = self;
-    }
-    return _webView;
-}
-
-@end
-//
-//  CNLiveInteractionWebController.h
-//  CNLiveBaseClass
-//
-//  Created by CNLive-zxw on 2019/12/14.
-//  Copyright © 2019 153993236@qq.com. All rights reserved.
-//
-
-/*
- * 有交互的WebView
- */
-
-#import "CNLiveBaseWebViewController.h"
-
-NS_ASSUME_NONNULL_BEGIN
-@class WKWebViewJavascriptBridge;
-
-@interface CNLiveInteractionWebController : CNLiveBaseWebViewController
-@property (nonatomic, strong) WKWebViewJavascriptBridge *bridge;
-
-/*
- 注意:初始化方法
- - (instancetype)initWithUrl:(NSString *)url;
- - (instancetype)initWithUrl:(NSString *)url title:(nullable NSString *)title;
- - (instancetype)initWithUrl:(NSString *)url title:(nullable NSString *)title closeHidden:(BOOL)closeHidden;
- */
-
-
-/*
- * 子类重写添加交互方法
- */
-- (void)interaction;
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-//  CNLiveInteractionWebController.m
-//  CNLiveBaseClass
-//
-//  Created by CNLive-zxw on 2019/12/14.
-//  Copyright © 2019 153993236@qq.com. All rights reserved.
-//
-
-#import "CNLiveInteractionWebController.h"
-#import "WKWebViewJavascriptBridge.h"
-#import "CNLiveWebView.h"
-
-@interface CNLiveInteractionWebController ()
-
-@end
-
-@implementation CNLiveInteractionWebController
-
-- (void)createSubViews {
-    [super createSubViews];
-    [self interaction];
-}
-
-- (void)interaction {
-    [WKWebViewJavascriptBridge enableLogging];
-    self.bridge = [WKWebViewJavascriptBridge bridgeForWebView:self.webView.wkWebView];
-    [self.bridge setWebViewDelegate:self.webView];
-}
-
-#pragma mark - CNLiveWebViewDelegate
-- (void)webView:(CNLiveWebView *)webView didFinishLoadWithURL:(NSURL *)url {
-    NSLog(@"CNLiveWebInteractionController - didFinishLoad");
-    if(self.title.length == 0){
-        self.title = webView.title;
-    }
-
-}
-
-- (void)webView:(CNLiveWebView *)webView didFailLoadWithError:(NSError *)error{
-    
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end
-//
-//  CNLiveWebView.h
-//  CNLiveBaseClass
-//
-//  Created by CNLive-zxw on 2019/9/12.
-//  Copyright © 2019 153993236@qq.com. All rights reserved.
-//
-
-/*
- * 自定义WebView
- */
-
-#import <UIKit/UIKit.h>
-#import <WebKit/WebKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-@class CNLiveWebView;
-
-@protocol CNLiveWebViewDelegate <NSObject>
-@optional
-/** 页面开始加载时调用 */
-- (void)webViewDidStartLoad:(CNLiveWebView *)webView;
-/** 内容开始返回时调用 */
-- (void)webView:(CNLiveWebView *)webView didCommitWithURL:(NSURL *)url;
-/** 页面加载失败时调用 */
-- (void)webView:(CNLiveWebView *)webView didFinishLoadWithURL:(NSURL *)url;
-/** 页面加载完成之后调用 */
-- (void)webView:(CNLiveWebView *)webView didFailLoadWithError:(NSError *)error;
-
-@end
-
-@interface CNLiveWebView : UIView
-@property (nonatomic, strong) WKWebView *wkWebView;
-@property (nonatomic, strong) UIProgressView *progressView;
-
-/** CNLiveWebViewDelegate */
-@property (nonatomic, weak) id<CNLiveWebViewDelegate> delegate;
-/** 进度条颜色(默认蓝色) */
-@property (nonatomic, strong) UIColor *progressViewColor;
-/** 导航栏标题 */
-@property (nonatomic, copy) NSString *title;
-
-@property (nonatomic, readonly) BOOL canGoBack;
-/** 向后 */
-- (nullable WKNavigation *)goBack;
-
-@property (nonatomic, readonly) BOOL canGoForward;
-/** 向前 */
-- (nullable WKNavigation *)goForward;
-/** 刷新数据 */
-- (void)reloadData;
-
-/** 类方法创建 XWWebView */
-+ (instancetype)webViewWithFrame:(CGRect)frame;
-/** 加载 web */
-- (void)loadRequest:(NSURLRequest *)request;
-/** 加载 HTML */
-- (void)loadHTMLString:(NSString *)HTMLString;
-
-@end
-NS_ASSUME_NONNULL_END
-//
-//  CNLiveWebView.h
-//  CNLiveBaseClass
-//
-//  Created by CNLive-zxw on 2019/9/12.
-//  Copyright © 2019 153993236@qq.com. All rights reserved.
-//
-
-#import "CNLiveWebView.h"
-#import "QMUIKit.h"
-
-@interface CNLiveWebView () <WKNavigationDelegate, WKUIDelegate>
-
-@end
-
-@implementation CNLiveWebView
-static CGFloat const progressViewHeight = 1;
-
-#pragma mark - 初始化
-- (instancetype)initWithFrame:(CGRect)frame {
-    if (self = [super initWithFrame:frame]) {
-        if (@available(iOS 11, *)) {
-             self.wkWebView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentAutomatic;
-         }
-        [self addSubview:self.progressView];
-        [self addSubview:self.wkWebView];
-    }
-    return self;
-}
-
-+ (instancetype)webViewWithFrame:(CGRect)frame {
-    return [[self alloc] initWithFrame:frame];
-}
-
-// dealloc
-- (void)dealloc {
-    [_wkWebView stopLoading];
-    [_wkWebView removeObserver:self forKeyPath:NSStringFromSelector(@selector(estimatedProgress))];
-    _wkWebView.navigationDelegate = nil;
-    _wkWebView = nil;
-}
-
-#pragma mark - Setter方法
-- (void)setProgressViewColor:(UIColor *)progressViewColor {
-    _progressViewColor = progressViewColor;
-    if (progressViewColor) {
-        _progressView.tintColor = progressViewColor;
-    }
-}
-
-#pragma mark - Getter方法
-- (BOOL)canGoBack{
-    return self.wkWebView.goBack;
-}
-
-- (BOOL)canGoForward{
-    return self.wkWebView.canGoForward;
-}
-
-#pragma mark - 工具方法
-// 向后
-- (nullable WKNavigation *)goBack{
-    return [self.wkWebView goBack];
-}
-// 向前
-- (nullable WKNavigation *)goForward{
-    return [self.wkWebView goForward];
-}
-// 刷新数据
-- (void)reloadData {
-    [self.wkWebView reload];
-}
-// 加载 web
-- (void)loadRequest:(NSURLRequest *)request {
-    [self.wkWebView loadRequest:request];
-}
-// 加载 HTML
-- (void)loadHTMLString:(NSString *)HTMLString {
-    [self.wkWebView loadHTMLString:HTMLString baseURL:nil];
-}
-
-#pragma mark - KVO
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
-    if ([keyPath isEqualToString:NSStringFromSelector(@selector(estimatedProgress))] && object == self.wkWebView) {
-        self.progressView.alpha = 1.0;
-        BOOL animated = self.wkWebView.estimatedProgress > self.progressView.progress;
-        [self.progressView setProgress:self.wkWebView.estimatedProgress animated:animated];
-        if(self.wkWebView.estimatedProgress >= 0.97) {
-            [UIView animateWithDuration:0.1 delay:0.3 options:UIViewAnimationOptionCurveEaseOut animations:^{
-                self.progressView.alpha = 0.0;
-            } completion:^(BOOL finished) {
-                [self.progressView setProgress:0.0 animated:NO];
-            }];
-        }
-    } else {
-        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
-    }
-}
-
-#pragma mark - WKNavigationDelegate
-// 在发送请求之前，决定是否跳转
-- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler{
-    //允许跳转
-    decisionHandler(WKNavigationActionPolicyAllow);
-}
-// 在收到响应后，决定是否跳转
-- (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler{
-    //允许跳转
-    decisionHandler(WKNavigationResponsePolicyAllow);
-    //不允许跳转
-    //decisionHandler(WKNavigationResponsePolicyCancel);
-}
-// 页面开始加载时调用
-- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(webViewDidStartLoad:)]) {
-        [self.delegate webViewDidStartLoad:self];
-    }
-}
-// 当内容开始返回时调用
-- (void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(webView:didCommitWithURL:)]) {
-        [self.delegate webView:self didCommitWithURL:self.wkWebView.URL];
-    }
-}
-// 页面加载完成之后调用
-- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
-    if(!self.title){
-        self.title = self.wkWebView.title;
-    }
-    if (self.delegate && [self.delegate respondsToSelector:@selector(webView:didFinishLoadWithURL:)]) {
-        [self.delegate webView:self didFinishLoadWithURL:self.wkWebView.URL];
-    }
-    self.progressView.alpha = 0.0;
-}
-// 页面加载失败时调用
-- (void)webView:(WKWebView *)webView didFailNavigation:(WKNavigation *)navigation withError:(NSError *)error {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(webView:didFailLoadWithError:)]) {
-        [self.delegate webView:self didFailLoadWithError:error];
-    }
-    self.progressView.alpha = 0.0;
-}
-// 页面加载失败时调用
-- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(null_unspecified WKNavigation *)navigation withError:(nonnull NSError *)error{
-    if (self.delegate && [self.delegate respondsToSelector:@selector(webView:didFailLoadWithError:)]) {
-         [self.delegate webView:self didFailLoadWithError:error];
-     }
-     self.progressView.alpha = 0.0;
-}
-// 接收到服务器跳转请求之后调用(重定向)
-- (void)webView:(WKWebView *)webView didReceiveServerRedirectForProvisionalNavigation:(WKNavigation *)navigation{
-    
-}
-
-#pragma mark - 懒加载
-- (WKWebView *)wkWebView {
-    if (!_wkWebView) {
-        NSMutableString *javascript = [NSMutableString string];
-        [javascript appendString:@"document.documentElement.style.webkitTouchCallout='none';"];//禁止长按
-        [javascript appendString:@"document.documentElement.style.webkitUserSelect='none';"];//禁止选择
-        WKUserScript *noneSelectScript = [[WKUserScript alloc] initWithSource:javascript injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES];
-        WKWebViewConfiguration *configuration = [[WKWebViewConfiguration alloc] init];
-        configuration.allowsInlineMediaPlayback = YES;
-        WKPreferences *preferences = [WKPreferences new];
-        //很重要，如果没有设置这个则不会回调createWebViewWithConfiguration方法，也不会回应window.open()方法
-        preferences.javaScriptCanOpenWindowsAutomatically = YES;
-        configuration.preferences = preferences;
-        _wkWebView = [[WKWebView alloc] initWithFrame:CGRectMake(0, progressViewHeight, self.frame.size.width, self.frame.size.height-progressViewHeight) configuration:configuration];
-        [_wkWebView.configuration.userContentController addUserScript:noneSelectScript];
-        _wkWebView.allowsLinkPreview = NO;
-        _wkWebView.UIDelegate = self;
-        _wkWebView.navigationDelegate = self;
-        [_wkWebView addObserver:self forKeyPath:NSStringFromSelector(@selector(estimatedProgress)) options:0 context:nil];
-    }
-    return _wkWebView;
-}
-
-- (UIProgressView *)progressView {
-    if (!_progressView) {
-        _progressView = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleDefault];
-        _progressView.trackTintColor = [UIColor clearColor];
-        // 高度默认有导航栏且有穿透效果
-        _progressView.frame = CGRectMake(0, 0, self.frame.size.width, progressViewHeight);
-        // 设置进度条颜色
-        _progressView.tintColor = [UIColor colorWithRed:19/255.0 green:204/255.0 blue:12/255.0 alpha:1.0];
-        _progressView.progressTintColor = [UIColor colorWithRed:19/255.0 green:204/255.0 blue:12/255.0 alpha:1.0];
-    }
-    return _progressView;
-}
-
-@end