no message

zhangxiaowen
1 parent ea648526
Showing 8 changed files with 95 additions and 340 deletions
CNLiveUserAgreementManager.podspec
CNLiveUserAgreementManager/Classes/CNLiveUserAgreementController.h
CNLiveUserAgreementManager/Classes/CNLiveUserAgreementController.m
CNLiveUserAgreementManager/Classes/CNLiveUserAgreementManager.m
CNLiveUserAgreementManager/Classes/CNLiveUserAgreementWebController.h
CNLiveUserAgreementManager/Classes/CNLiveUserAgreementWebController.m
Example/CNLiveUserAgreementManager.xcodeproj/project.pbxproj
Example/CNLiveUserAgreementManager/CNLiveViewController.m
@@ -45,7 +45,10 @@ TODO: 网家家-用户协议管理类.
   # 数据请求
   s.dependency 'CNLiveRequestBastKit'
-  #类别
+  # 类别
   s.dependency 'CNLiveCategory'
+  
+  # 基类
+  s.dependency 'CNLiveBaseClass'
 end
+//
+//  CNLiveUserAgreementController.h
+//  CNLiveUserAgreementManager
+//
+//  Created by 153993236@qq.com on 04/13/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveInteractionWebController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveUserAgreementController : CNLiveInteractionWebController
+
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveUserAgreementController.h
+//  CNLiveUserAgreementManager
+//
+//  Created by 153993236@qq.com on 04/13/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveUserAgreementController.h"
+#import "WKWebViewJavascriptBridge.h"
+#import "CNLiveWebView.h"
+
+@interface CNLiveUserAgreementController ()
+
+@end
+
+@implementation CNLiveUserAgreementController
+
+#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 {
+    
+}
+
+@end
@@ -8,7 +8,7 @@
 #import "CNLiveUserAgreementManager.h"
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
 #import "CNLiveEnvironment.h"
-#import "CNLiveUserAgreementWebController.h"
+#import "CNLiveUserAgreementController.h"
 @interface CNLiveUserAgreementManager()
@@ -343,7 +343,7 @@ static CNLiveUserAgreementManager *_instance = nil;
     //跟控制器是Navigation
     if ([root isKindOfClass:[UINavigationController class]]){
         UINavigationController *nav = (UINavigationController *)root;
-        CNLiveUserAgreementWebController *vc = [[CNLiveUserAgreementWebController alloc] initWithUrl:url name:name showCloseBtn:isShow];
+        CNLiveUserAgreementController *vc = [[CNLiveUserAgreementController alloc] initWithUrl:url title:name closeHidden:isShow];
         [nav pushViewController:vc animated:YES];
     }
@@ -353,15 +353,15 @@ static CNLiveUserAgreementManager *_instance = nil;
         UIViewController *selected = tab.selectedViewController;
         if ([selected isKindOfClass:[UINavigationController class]]){
             UINavigationController *nav = (UINavigationController *)selected;
-            CNLiveUserAgreementWebController *vc = [[CNLiveUserAgreementWebController alloc] initWithUrl:url name:name showCloseBtn:isShow];
+            CNLiveUserAgreementController *vc = [[CNLiveUserAgreementController alloc] initWithUrl:url title:name closeHidden:isShow];
             [nav pushViewController:vc animated:YES];
         }else{
-            CNLiveUserAgreementWebController *vc = [[CNLiveUserAgreementWebController alloc] initWithUrl:url name:name showCloseBtn:isShow];
+            CNLiveUserAgreementController *vc = [[CNLiveUserAgreementController alloc] initWithUrl:url title:name closeHidden:isShow];
             [root presentViewController:vc animated:YES completion:nil];
         }
     }else{
-        CNLiveUserAgreementWebController *vc = [[CNLiveUserAgreementWebController alloc] initWithUrl:url name:name showCloseBtn:isShow];
+        CNLiveUserAgreementController *vc = [[CNLiveUserAgreementController alloc] initWithUrl:url title:name closeHidden:isShow];
         [root presentViewController:vc animated:YES completion:nil];
     }
-//
-//  CNLiveUserAgreementWebController.h
-//  CNLiveUserAgreementManager
-//
-//  Created by 153993236@qq.com on 04/13/2019.
-//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface CNLiveUserAgreementWebController : UIViewController
-
-/**
- *  对象方法 初始化方法
- *  @param url url
- *  @param name 标题
- *  注意:默认没有关闭按钮
- */
-- (instancetype)initWithUrl:(NSString *)url name:(nullable NSString *)name;
-
-
-/**
- *  对象方法 初始化方法
- *  @param url url
- *  @param name 标题
- *  @param isShow 是否显示关闭按钮
- */
-- (instancetype)initWithUrl:(NSString *)url name:(nullable NSString *)name showCloseBtn:(BOOL)isShow;
-
-@end
-
-NS_ASSUME_NONNULL_END
-//
-// CNLiveUserAgreementWebController.h
-//  CNLiveUserAgreementManager
-//
-//  Created by 153993236@qq.com on 04/13/2019.
-//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
-//
-
-#import "CNLiveUserAgreementWebController.h"
-#import <WebKit/WebKit.h>
-// 环境库
-#import "CNLiveEnvironment.h"
-#import "CNLiveCategory.h"
-
-#import <CNLiveRequestBastKit/CNLiveNetworking.h>
-
-@interface CNLiveUserAgreementWebController ()<WKUIDelegate, WKNavigationDelegate>
-@property (nonatomic, copy) NSString *url;
-@property (nonatomic, copy) NSString *name;
-@property (nonatomic, assign) BOOL isShow;
-
-@property (nonatomic, strong) WKWebView *webView;
-@property (nonatomic, strong) UIProgressView *processView;
-@property (nonatomic, weak) UILabel *titleLabel;
-
-@property (nonatomic, strong) NSMutableArray *photos;// 上传图片
-
-@end
-
-@implementation CNLiveUserAgreementWebController
-static const NSInteger margin = 15;
-
-#pragma mark - 初始化方法
-- (instancetype)initWithUrl:(NSString *)url name:(nullable NSString *)name{
-    return [self initWithUrl:url name:name showCloseBtn:NO];
-}
-
-- (instancetype)initWithUrl:(NSString *)url name:(nullable NSString *)name showCloseBtn:(BOOL)isShow {
-    self = [super init];
-    if (self) {
-        self.url = url;
-        self.name = name;
-        self.isShow = isShow;
-    }
-    return self;
-}
-
-- (void)setName:(NSString *)name{
-    _name = name;
-    _titleLabel.text = name;
-}
-
-#pragma mark - 加载数据
-- (void)loadUrl {
-    NSMutableURLRequest *theRequest = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:self.url] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:15.0];
-    [self.webView loadRequest:theRequest];
-}
-
-#pragma mark - 生命周期
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    self.navigationController.navigationBarHidden = YES;
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
-    self.navigationController.navigationBarHidden = NO;
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    self.view.backgroundColor = [UIColor whiteColor];
-    if (@available(iOS 11, *)) {
-        self.webView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentAutomatic;
-    }
-    else {
-        self.automaticallyAdjustsScrollViewInsets = NO;
-    }
-    [self setupNavigationBar];
-    [self createSubViews];
-    [self loadUrl];
-    
-}
-
-- (void)dealloc {
-    if(TestEnvironment){
-        NSLog(@"CNUserLiveAgreementWebController dealloc");
-    }
-    [self.webView stopLoading];
-    [self.webView removeObserver:self forKeyPath:@"estimatedProgress"];
-    if (!self.name) {
-        [self.webView removeObserver:self forKeyPath:@"title"];
-    }
-    self.webView.UIDelegate = nil;
-    self.webView.navigationDelegate = nil;
-    self.webView = nil;
-    [self clearWKCache];
-    
-}
-
-#pragma mark - 创建导航条
-- (void)setupNavigationBar {
-    UIView *navView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, 44+[UIApplication sharedApplication].statusBarFrame.size.height)];
-    navView.backgroundColor = [UIColor clearColor];
-    [self.view bringSubviewToFront:navView];
-    [self.view addSubview:navView];
-    
-    UIButton *leftBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    leftBtn.adjustsImageWhenHighlighted = NO;
-    leftBtn.frame = CGRectMake(margin, [UIApplication sharedApplication].statusBarFrame.size.height, 44, 44);
-    UIImage *leftImage = [self getImageWithImageName:@"web_black_back" bundleName:@"CNLiveUserAgreementManager" targetClass:[CNLiveUserAgreementWebController class]];
-    [leftBtn setImage:[leftImage imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
-    [leftBtn addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];
-    [leftBtn setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
-    [navView addSubview:leftBtn];
-    
-    UIButton *closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    closeBtn.adjustsImageWhenHighlighted = NO;
-    closeBtn.frame = CGRectMake(44+margin, [UIApplication sharedApplication].statusBarFrame.size.height, 44, 44);
-    UIImage *closeImage = [self getImageWithImageName:@"web_black_close" bundleName:@"CNLiveUserAgreementManager" targetClass:[CNLiveUserAgreementWebController class]];
-    [closeBtn setImage:[closeImage imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
-    [closeBtn addTarget:self action:@selector(closeClick) forControlEvents:UIControlEventTouchUpInside];
-    [closeBtn setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
-    closeBtn.hidden = !self.isShow;
-    [navView addSubview:closeBtn];
-    
-    UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(([[UIScreen mainScreen] bounds].size.width - 200)/2.0, [UIApplication sharedApplication].statusBarFrame.size.height, 200, 44)];
-    titleLabel.font = [UIFont boldSystemFontOfSize:17];
-    titleLabel.textColor = [UIColor blackColor];
-    titleLabel.text = self.name;
-    titleLabel.textAlignment = NSTextAlignmentCenter;
-    [navView addSubview:titleLabel];
-    _titleLabel = titleLabel;
-    
-}
-
-- (void)createSubViews {
-    [self.view addSubview:self.webView];
-    [self.view addSubview:self.processView];
-    
-    [self.webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];
-    if (!self.name) {
-        [self.webView addObserver:self forKeyPath:@"title" options:NSKeyValueObservingOptionNew context:NULL];
-    }
-    
-}
-
-
-#pragma mark - WKNavigationDelegate
-// 在发送请求之前，决定是否跳转
-- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler{
-    //允许跳转
-    decisionHandler(WKNavigationActionPolicyAllow);
-    
-}
-
-// 页面开始加载时调用
-- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation{
-    
-}
-
-// 在收到响应后，决定是否跳转
-- (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler{
-    //允许跳转
-    decisionHandler(WKNavigationResponsePolicyAllow);
-    //不允许跳转
-    //decisionHandler(WKNavigationResponsePolicyCancel);
-}
-
-// 当内容开始返回时调用
-- (void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation{
-
-}
-
-// 页面加载完成之后调用
-- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation{
-    
-}
-
-// 页面加载失败时调用
-- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(null_unspecified WKNavigation *)navigation withError:(nonnull NSError *)error{
-    NSLog(@"打印这个error%@",error);
-    
-}
-
-// 接收到服务器跳转请求之后调用(重定向)
-- (void)webView:(WKWebView *)webView didReceiveServerRedirectForProvisionalNavigation:(WKNavigation *)navigation{
-    
-}
-
-#pragma mark - 响应方法
-//回退goBack
-- (void)goBack {
-    if ([self.webView canGoBack]) {
-        [self.webView goBack];
-    }
-    else {
-        [self closeClick];
-    }
-}
-
-//关闭pop
-- (void)closeClick {
-    if (self.presentingViewController != nil) {
-        [self dismissViewControllerAnimated:YES completion:nil];
-        
-    }
-    else {
-        [self.navigationController popViewControllerAnimated:YES];
-    }
-}
-
-#pragma mark - KVO
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
-    if ([keyPath isEqualToString:@"estimatedProgress"]) {
-        if (object == self.webView) {
-            [self.processView setAlpha:1.0f];
-            [self.processView setProgress:self.webView.estimatedProgress animated:YES];
-    
-            if(self.webView.estimatedProgress >= 1.0f) {
-                
-                [UIView animateWithDuration:0.3 delay:0.5 options:UIViewAnimationOptionCurveEaseOut animations:^{
-                    [self.processView setAlpha:0.0f];
-                    
-                } completion:^(BOOL finished) {
-                    [self.processView setProgress:0.0f animated:NO];
-                    
-                }];
-                
-            }
-            
-        }
-        else {
-            [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
-        }
-        
-    }
-    else if ([keyPath isEqualToString:@"title"]){
-        if (object == self.webView) {
-            if (self.webView.title.length != 0) {
-                self.name = self.webView.title;
-
-            }
-        }
-        else {
-            [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
-        }
-    }
-    else {
-        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
-        
-    }
-}
-#pragma mark - 懒加载
-- (WKWebView *)webView{
-    if(!_webView){
-        WKWebViewConfiguration * configuration = [[WKWebViewConfiguration alloc] init];
-        configuration.allowsInlineMediaPlayback = YES;
-        WKPreferences *preferences = [WKPreferences new];
-        preferences.javaScriptCanOpenWindowsAutomatically = YES;
-        configuration.preferences = preferences;
-        _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, [UIApplication sharedApplication].statusBarFrame.size.height+44, [[UIScreen mainScreen] bounds].size.width, [[UIScreen mainScreen] bounds].size.height-([UIApplication sharedApplication].statusBarFrame.size.height+44)) configuration:configuration];
-        _webView.UIDelegate = self;
-        _webView.navigationDelegate = self;
-        _webView.contentMode = UIViewContentModeScaleAspectFit;
-        _webView.scrollView.showsHorizontalScrollIndicator = NO;
-        _webView.scrollView.showsVerticalScrollIndicator = NO;
-        _webView.allowsBackForwardNavigationGestures = YES;
-        _webView.allowsLinkPreview = NO;
-        
-    }
-    return _webView;
-}
-
-- (UIProgressView *)processView{
-    if(!_processView){
-        _processView = [[UIProgressView alloc] initWithFrame:CGRectMake(0, ([UIApplication sharedApplication].statusBarFrame.size.height+44)+0.5, [[UIScreen mainScreen] bounds].size.width, 1)];
-        _processView.progressTintColor = [UIColor colorWithRed:19/255.0 green:204/255.0 blue:12/255.0 alpha:1.0];
-        _processView.trackTintColor = [UIColor whiteColor];
-    }
-    return _processView;
-}
-
-#pragma mark - 私有方法
-// 清除缓存
-- (void)clearWKCache {
-    NSArray *types = @[WKWebsiteDataTypeDiskCache,WKWebsiteDataTypeOfflineWebApplicationCache,WKWebsiteDataTypeMemoryCache,WKWebsiteDataTypeIndexedDBDatabases,WKWebsiteDataTypeWebSQLDatabases];
-    NSSet *websiteDataTypes = [NSSet setWithArray:types];
-    NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
-    [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:websiteDataTypes modifiedSince:dateFrom completionHandler:^{
-        if(TestEnvironment){
-            NSLog(@"CNLiveUserAgreementWebController 缓存清理完毕");
-        }
-    }];
-    
-}
-
-@end
@@ -350,18 +350,30 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveUserAgreementManager_Example/Pods-CNLiveUserAgreementManager_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBaseClass/CNLiveBaseClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",
+				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
+				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
+				"${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseClass.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserAgreementManager.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -10,7 +10,7 @@
 #import "CNLiveEnvironment.h"
 #import "CNLiveUserAgreementManager.h"
-#import "CNLiveUserAgreementWebController.h"
+#import "CNLiveUserAgreementController.h"
 @interface CNLiveViewController ()
@@ -38,7 +38,7 @@
 //    [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementCancellation];
 //    [CNLiveUserAgreementManager jumpToAgreementH5WithString:@"yhxy"];
     [CNLiveUserAgreementManager getAgreementH5WithType:CNLiveUserAgreementCancellation success:^(NSString * _Nonnull h5, NSString * _Nonnull title, BOOL isShow) {
-        CNLiveUserAgreementWebController *vc = [[CNLiveUserAgreementWebController alloc] initWithUrl:h5 name:title showCloseBtn:NO];
+        CNLiveUserAgreementController *vc = [[CNLiveUserAgreementController alloc] initWithUrl:h5 title:title closeHidden:NO];
         [self.navigationController pushViewController:vc animated:YES];
     } failure:^(NSError * _Nonnull error) {