no message

zhangxiaowen
1 parent c31a1d34
Showing 9 changed files with 419 additions and 46 deletions
CNLiveUserAgreementManager.podspec
CNLiveUserAgreementManager/Assets/CNLiveAgreementManager.bundle/web_black_back@2x.png
CNLiveUserAgreementManager/Assets/CNLiveAgreementManager.bundle/web_black_back@3x.png
CNLiveUserAgreementManager/Classes/CNUserAgreementManager.h → CNLiveUserAgreementManager/Classes/CNLiveAgreementManager.h
CNLiveUserAgreementManager/Classes/CNUserAgreementManager.m → CNLiveUserAgreementManager/Classes/CNLiveAgreementManager.m
CNLiveUserAgreementManager/Classes/CNLiveAgreementWebController.h
CNLiveUserAgreementManager/Classes/CNLiveAgreementWebController.m
Example/CNLiveUserAgreementManager/CNLiveUserAgreementManager-Info.plist
Example/CNLiveUserAgreementManager/CNLiveViewController.m
@@ -32,9 +32,9 @@ TODO: Add long description of the pod here.
  
   s.source_files = 'CNLiveUserAgreementManager/Classes/**/*'
  
-  # s.resource_bundles = {
-  #   'CNLiveUserAgreementManager' => ['CNLiveUserAgreementManager/Assets/*.png']
-  # }
+  s.resource_bundles = {
+    'CNLiveAgreementManager' => ['CNLiveUserAgreementManager/Assets/CNLiveAgreementManager.bundle']
+  }
  
   s.public_header_files = 'CNLiveUserAgreementManager/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
 //
-//  CNUserAgreementManager.h
+//  CNLiveAgreementManager.h
 //  Test
 //
 //  Created by CNLive-zxw on 2019/4/13.
@@ -28,13 +28,40 @@ typedef enum {
  
 } CNGetAgreementH5Type;
  
-typedef void(^SuccessBlock)(NSString *h5,NSString *title);
+typedef void(^SuccessBlock)(NSString *h5, NSString *title);
 typedef void(^FailureBlock)(NSError *error);
  
-@interface CNUserAgreementManager : NSObject
+@interface CNLiveAgreementManager : NSObject
+
++ (instancetype)manager;
+
+/**
+ *  请求协议并跳转
+ *  @param string 类型字符串
+ */
++ (void)jumpToAgreementH5WithString:(NSString *)string;
+
+/**
+ *  请求协议并跳转
+ *  @param type 类型
+ */
++ (void)jumpToAgreementH5WithType:(CNGetAgreementH5Type)type;
+
+/**
+ *  类方法 请求协议
+ *  @param type 类型
+ *  @param success 请求成功回调
+ *  @param failure 请求失败回调
+ */
 + (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(SuccessBlock)success failure:(FailureBlock)failure;
  
-+ (void)jumpToAgreementWebWithType:(CNGetAgreementH5Type)type;
+/**
+ *  对象方法 请求协议
+ *  @param type 类型
+ *  @param success 请求成功回调
+ *  @param failure 请求失败回调
+ */
+- (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(SuccessBlock)success failure:(FailureBlock)failure;
  
 @end
  
 //
-//  CNUserAgreementManager.m
+//  CNLiveAgreementManager.m
 //  Test
 //
 //  Created by CNLive-zxw on 2019/4/13.
 //  Copyright © 2019 CNLive. All rights reserved.
 //
  
-#import "CNUserAgreementManager.h"
+#import "CNLiveAgreementManager.h"
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
 #import "CNLiveEnvironment.h"
+#import "CNLiveAgreementWebController.h"
+
+@interface CNLiveAgreementManager()
  
-@interface CNUserAgreementManager()
  
 @end
  
-@implementation CNUserAgreementManager
-static CNUserAgreementManager *_instance = nil;
+@implementation CNLiveAgreementManager
  
-/* 单例控制器 */
-+ (instancetype)shared {
-    return [[self alloc] init];
-}
+static CNLiveAgreementManager *_instance = nil;
  
-- (instancetype)init {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        _instance = [super init];
-        
+/**
+ * @abstract 单例初始化
+ */
++ (instancetype)manager{
+    static dispatch_once_t once;
+    dispatch_once(&once, ^{
+        _instance = [[CNLiveAgreementManager alloc]init];
     });
     return _instance;
+    
 }
  
-+ (instancetype)allocWithZone:(struct _NSZone *)zone {
++ (id)allocWithZone:(struct _NSZone *)zone{
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         _instance = [super allocWithZone:zone];
-        
     });
     return _instance;
 }
  
-- (id)copyWithZone:(NSZone *)zone {
+- (nonnull id)copyWithZone:(nullable NSZone *)zone {
     return _instance;
 }
  
-- (id)mutableCopyWithZone:(NSZone *)zone {
+- (nonnull id)mutableCopyWithZone:(nullable NSZone *)zone {
     return _instance;
 }
  
@@ -228,7 +228,7 @@ static CNUserAgreementManager *_instance = nil;
 }
  
 + (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(SuccessBlock)success failure:(FailureBlock)failure {
-    [[CNUserAgreementManager shared] getAgreementH5WithType:type success:^(NSString * _Nonnull h5, NSString * _Nonnull title) {
+    [[CNLiveAgreementManager manager] getAgreementH5WithType:type success:^(NSString * _Nonnull h5, NSString * _Nonnull title) {
         success(h5, title);
  
     } failure:^(NSError * _Nonnull error) {
@@ -238,23 +238,62 @@ static CNUserAgreementManager *_instance = nil;
  
 }
  
-
-+ (void)jumpToAgreementWebWithType:(CNGetAgreementH5Type)type{
++ (void)jumpToAgreementH5WithType:(CNGetAgreementH5Type)type{
  
-    __weak typeof(self) weakSelf = self;
-    [[CNUserAgreementManager shared] getAgreementH5WithType:type success:^(NSString * _Nonnull h5, NSString * _Nonnull title) {
-        __strong typeof(self) strongSelf = weakSelf;
-
+    [CNLiveAgreementManager getAgreementH5WithType:type success:^(NSString *h5, NSString *title) {
  
-    } failure:^(NSError * _Nonnull error) {
-        __strong typeof(self) strongSelf = weakSelf;
+        [self pushToWebControllerUrl:h5 name:title];
+        
+    } failure:^(NSError *error) {
+        
+    }];
+    
+}
  
-        if(TestEnvironment){
-            NSLog(@"获取协议请求失败");
++ (void)jumpToAgreementH5WithString:(NSString *)string {
+    [CNLiveNetworking setAllowRequestDefaultArgument:NO];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNGetAgreementH5Url Param:@{} CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        if (!error) {
+            if ([responseObject isKindOfClass:[NSArray class]]) {
+                for (NSDictionary *dic in responseObject) {
+                    if ([[NSString stringWithFormat:@"%@",dic[@"type"]] isEqualToString:string]) {
+                        [self pushToWebControllerUrl:dic[@"detailUrl"] name:dic[@"title"]];
+                        break;
+                    }
+                    
+                }
+                
+            }
+            
         }
-        
     }];
  
 }
  
+#pragma mark - 跳转控制器
++ (void)pushToWebControllerUrl:(NSString *)url name:(NSString *)name {
+    UIViewController *root = [UIApplication sharedApplication].delegate.window.rootViewController;
+    
+    //跟控制器是Navigation
+    if ([root isKindOfClass:[UINavigationController class]]){
+        UINavigationController *nav = (UINavigationController *)root;
+        CNLiveAgreementWebController *vc = [[CNLiveAgreementWebController alloc] initWithUrl:url name:name];
+        [nav pushViewController:vc animated:YES];
+        
+    }
+    //跟控制器是TabBar
+    else if ([root isKindOfClass:[UITabBarController class]]){
+        UITabBarController *tab = (UITabBarController *)root;
+        UINavigationController *nav = tab.selectedViewController;
+        CNLiveAgreementWebController *vc = [[CNLiveAgreementWebController alloc] initWithUrl:url name:name];
+        [nav pushViewController:vc animated:YES];
+        
+    }else{
+        CNLiveAgreementWebController *vc = [[CNLiveAgreementWebController alloc] initWithUrl:url name:name];
+        [root presentViewController:vc animated:YES completion:nil];
+        
+    }
+    
+}
+
 @end
+//
+//  CNLiveAgreementWebController.h
+//  CNLiveServices_Example
+//
+//  Created by CNLive-zxw on 2019/7/30.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveAgreementWebController : UIViewController
+- (instancetype)initWithUrl:(NSString *)url name:(NSString *)name;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveAgreementWebController.m
+//  CNLiveServices_Example
+//
+//  Created by CNLive-zxw on 2019/7/30.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveAgreementWebController.h"
+#import <WebKit/WebKit.h>
+
+@interface CNLiveAgreementWebController ()<WKUIDelegate, WKNavigationDelegate>
+@property (nonatomic, copy) NSString *url;
+@property (nonatomic, copy) NSString *name;
+@property (nonatomic, strong) WKWebView *webView;
+@property (nonatomic, strong) UIProgressView *processView;
+@property (nonatomic, weak) UILabel *titleLabel;
+
+@end
+
+@implementation CNLiveAgreementWebController
+
+- (instancetype)initWithUrl:(NSString *)url name:(NSString *)name {
+    self = [super init];
+    if (self) {
+        self.url = url;
+        self.name = name;
+    }
+    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 setupUI];
+    [self loadUrl];
+    
+}
+
+- (void)dealloc {
+    NSLog(@"CNUserAgreementWebController 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, [UIApplication sharedApplication].statusBarFrame.size.height, [UIScreen mainScreen].bounds.size.width, 44)];
+    navView.backgroundColor = [UIColor clearColor];
+    [self.view bringSubviewToFront:navView];
+    [self.view addSubview:navView];
+    
+    UIButton *leftBtn = [UIButton buttonWithType:UIButtonTypeSystem];
+    leftBtn.frame = CGRectMake(0, 0, 44, 44);
+    UIImage *image = [self xw_getImageName:@"web_black_back" bundle:@"CNLiveAgreementManager.bundle/CNLiveAgreementManager" targetClass:[CNLiveAgreementWebController class]];
+    [leftBtn setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
+//    [leftBtn setContentHorizontalAlignment:UIControlContentHorizontalAlignmentRight];
+    [leftBtn addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];
+    [navView addSubview:leftBtn];
+    
+    UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(([[UIScreen mainScreen] bounds].size.width - 200)/2.0, 0, 200, 44)];
+    titleLabel.font = [UIFont boldSystemFontOfSize:17];
+    titleLabel.textColor = [UIColor blackColor];
+    titleLabel.text = self.name;
+    titleLabel.textAlignment = NSTextAlignmentCenter;
+    [navView addSubview:titleLabel];
+    _titleLabel = titleLabel;
+    
+}
+
+- (void)setupUI {
+    WKWebViewConfiguration * configuration = [[WKWebViewConfiguration alloc] init];
+    configuration.allowsInlineMediaPlayback = YES;
+    WKPreferences *preferences = [WKPreferences new];
+    preferences.javaScriptCanOpenWindowsAutomatically = YES;
+    configuration.preferences = preferences;
+    self.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.allowsBackForwardNavigationGestures = YES;
+    _webView.allowsLinkPreview = NO;
+    [self.view addSubview:self.webView];
+    
+    self.processView = [[UIProgressView alloc] initWithFrame:CGRectMake(0, ([UIApplication sharedApplication].statusBarFrame.size.height+44)+0.5, [[UIScreen mainScreen] bounds].size.width, 1)];
+    _processView.progressTintColor = [UIColor colorWithRed:0.0 green:1.0 blue:0.0 alpha:1.0];
+    _processView.trackTintColor = [UIColor whiteColor];
+    [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 - 清除缓存
+// 清除缓存
+- (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:^{
+        NSLog(@"清楚缓存完毕");
+    }];
+    
+}
+/**
+ *  创建图片
+ *
+ *  @param imageName 图片名字
+ *  @param bundlePath 图片所在的bundle名字
+ *  @param targetClass 类和bundle的同级目录
+ *  @return 返回UIImage
+ */
+- (UIImage *)xw_getImageName:(NSString *)imageName bundle:(NSString *)bundlePath targetClass:(Class)targetClass{
+    NSBundle *bundle = [NSBundle bundleForClass:targetClass];
+    NSURL *url = [bundle URLForResource:bundlePath withExtension:@"bundle"];
+    NSBundle *targetBundle = [NSBundle bundleWithURL:url];
+    UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
+    return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
+    
+}
+
+@end
@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -7,8 +7,7 @@
 //
  
 #import "CNLiveViewController.h"
-#import "CNUserAgreementManager.h"
-#import "CNLiveEnvironmentConfiguration.h"
+#import "CNLiveAgreementManager.h"
  
 @interface CNLiveViewController ()
  
@@ -20,15 +19,27 @@
 {
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
-    NSLog(@"%@",CNGetAgreementH5Url);
  
-    [CNUserAgreementManager getAgreementH5WithType:CNAgreementUser success:^(NSString * _Nonnull h5, NSString * _Nonnull title) {
-        NSLog(@"%@",h5);
-        NSLog(@"%@",title);
+    UIButton *btn0 = [UIButton buttonWithType:UIButtonTypeCustom];
+    btn0.frame = CGRectMake(0, 0, 100, 100);
+    btn0.center = self.view.center;
+    btn0.backgroundColor = [UIColor redColor];
+    [btn0 setTitle:@"进入" forState:UIControlStateNormal];
+    [btn0 addTarget:self action:@selector(testButtonClicked) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:btn0];
+    
+//    [CNLiveAgreementManager getAgreementH5WithType:CNAgreementUser success:^(NSString * _Nonnull h5, NSString * _Nonnull title) {
+//        NSLog(@"%@",h5);
+//        NSLog(@"%@",title);
+//
+//    } failure:^(NSError * _Nonnull error) {
+//
+//    }];
+}
+- (void)testButtonClicked {
+//    [CNLiveAgreementManager jumpToAgreementH5WithType:CNAgreementUser];
+    [CNLiveAgreementManager jumpToAgreementH5WithString:@"bzfk"];
  
-    } failure:^(NSError * _Nonnull error) {
-        
-    }];
 }
  
 - (void)didReceiveMemoryWarning