no message

zhangxiaowen
1 parent 1400df32
Showing 10 changed files with 111 additions and 25 deletions
CNLiveUserAgreementManager/Assets/CNLiveAgreementManager.bundle/web_black_back@2x.png
CNLiveUserAgreementManager/Assets/CNLiveAgreementManager.bundle/web_black_back@3x.png
CNLiveUserAgreementManager/Assets/CNLiveAgreementManager.bundle/web_black_close@2x.png
CNLiveUserAgreementManager/Assets/CNLiveAgreementManager.bundle/web_black_close@3x.png
CNLiveUserAgreementManager/Classes/CNLiveAgreementManager.h
CNLiveUserAgreementManager/Classes/CNLiveAgreementManager.m
CNLiveUserAgreementManager/Classes/CNLiveAgreementWebController.h
CNLiveUserAgreementManager/Classes/CNLiveAgreementWebController.m
Example/CNLiveUserAgreementManager/CNLiveAppDelegate.m
Example/CNLiveUserAgreementManager/CNLiveViewController.m
@@ -42,6 +42,22 @@ typedef void(^FailureBlock)(NSError *error);
 + (void)jumpToAgreementH5WithString:(NSString *)string;
 /**
+ *  类方法 请求协议
+ *  @param string 类型字符串
+ *  @param success 请求成功回调
+ *  @param failure 请求失败回调
+ */
++ (void)getAgreementH5WithString:(NSString *)string success:(SuccessBlock)success failure:(FailureBlock)failure;
+
+/**
+ *  对象方法 请求协议
+ *  @param string 类型字符串
+ *  @param success 请求成功回调
+ *  @param failure 请求失败回调
+ */
+- (void)getAgreementH5WithString:(NSString *)string success:(SuccessBlock)success failure:(FailureBlock)failure;
+
+/**
  *  请求协议并跳转
  *  @param type 类型
  */
@@ -48,6 +48,7 @@ static CNLiveAgreementManager *_instance = nil;
     return _instance;
 }
+#pragma mark - 类型
 - (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(SuccessBlock)success failure:(FailureBlock)failure {
     [CNLiveNetworking setAllowRequestDefaultArgument:NO];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNGetAgreementH5Url Param:@{} CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
@@ -229,55 +230,106 @@ static CNLiveAgreementManager *_instance = nil;
 + (void)getAgreementH5WithType:(CNGetAgreementH5Type)type success:(SuccessBlock)success failure:(FailureBlock)failure {
     [[CNLiveAgreementManager manager] getAgreementH5WithType:type success:^(NSString * _Nonnull h5, NSString * _Nonnull title) {
-        success(h5, title);
+        success?success(h5, title):@"";
     } failure:^(NSError * _Nonnull error) {
-        failure(error);
+        failure?failure(error):@"";
     }];
 }
 + (void)jumpToAgreementH5WithType:(CNGetAgreementH5Type)type{
-    
+    __weak typeof(self) weakSelf = self;
     [CNLiveAgreementManager getAgreementH5WithType:type success:^(NSString *h5, NSString *title) {
-        
-        [self pushToWebControllerUrl:h5 name:title];
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return;
+        [strongSelf pushToWebControllerUrl:h5 name:title showCloseBtn:YES];
     } failure:^(NSError *error) {
-        
+        if(TestEnvironment){
+            NSLog(@"点击协议跳转失败");
+
+        }
     }];
 }
+#pragma mark - 类型字符串
+/**
+ *  请求协议并跳转
+ *  @param string 类型字符串
+ */
 + (void)jumpToAgreementH5WithString:(NSString *)string {
+    __weak typeof(self) weakSelf = self;
+    [CNLiveAgreementManager getAgreementH5WithString:string success:^(NSString *h5, NSString *title) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return;
+        [strongSelf pushToWebControllerUrl:h5 name:title showCloseBtn:NO];
+        
+    } failure:^(NSError *error) {
+        if(TestEnvironment){
+            NSLog(@"点击协议跳转失败");
+            
+        }
+    }];
+    
+}
+
+/**
+ *  类方法 请求协议
+ *  @param string 类型字符串
+ *  @param success 请求成功回调
+ *  @param failure 请求失败回调
+ */
++ (void)getAgreementH5WithString:(NSString *)string success:(SuccessBlock)success failure:(FailureBlock)failure{
+    [[CNLiveAgreementManager manager] getAgreementH5WithString:string success:^(NSString *h5, NSString *title) {
+        success?success(h5, title):@"";
+        
+    } failure:^(NSError *error) {
+        failure?failure(error):@"";
+
+    }];
+}
+
+/**
+ *  对象方法 请求协议
+ *  @param string 类型字符串
+ *  @param success 请求成功回调
+ *  @param failure 请求失败回调
+ */
+- (void)getAgreementH5WithString:(NSString *)string success:(SuccessBlock)success failure:(FailureBlock)failure{
     [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;
+                        success?success(dic[@"detailUrl"], dic[@"title"]):@"";
+                        return;
                     }
                 }
             }
+            failure?failure(error):@"";
+
+        }else{
+            failure?failure(error):@"";
+
         }
     }];
-    
 }
 #pragma mark - 跳转控制器
-+ (void)pushToWebControllerUrl:(NSString *)url name:(NSString *)name {
++ (void)pushToWebControllerUrl:(NSString *)url name:(NSString *)name showCloseBtn:(BOOL)isShow{
     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];
+        CNLiveAgreementWebController *vc = [[CNLiveAgreementWebController alloc] initWithUrl:url name:name showCloseBtn:isShow];
         [nav pushViewController:vc animated:YES];
     }
@@ -285,11 +337,11 @@ static CNLiveAgreementManager *_instance = nil;
     else if ([root isKindOfClass:[UITabBarController class]]){
         UITabBarController *tab = (UITabBarController *)root;
         UINavigationController *nav = tab.selectedViewController;
-        CNLiveAgreementWebController *vc = [[CNLiveAgreementWebController alloc] initWithUrl:url name:name];
+        CNLiveAgreementWebController *vc = [[CNLiveAgreementWebController alloc] initWithUrl:url name:name showCloseBtn:isShow];
         [nav pushViewController:vc animated:YES];
     }else{
-        CNLiveAgreementWebController *vc = [[CNLiveAgreementWebController alloc] initWithUrl:url name:name];
+        CNLiveAgreementWebController *vc = [[CNLiveAgreementWebController alloc] initWithUrl:url name:name showCloseBtn:isShow];
         [root presentViewController:vc animated:YES completion:nil];
     }
@@ -11,7 +11,13 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveAgreementWebController : UIViewController
-- (instancetype)initWithUrl:(NSString *)url name:(NSString *)name;
+/**
+ *  对象方法 初始化方法
+ *  @param url url
+ *  @param name 标题
+ *  @param isShow 是否显示关闭按钮
+ */
+- (instancetype)initWithUrl:(NSString *)url name:(NSString *)name showCloseBtn:(BOOL)isShow;
 @end
@@ -12,6 +12,8 @@
 @interface CNLiveAgreementWebController ()<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;
@@ -20,11 +22,12 @@
 @implementation CNLiveAgreementWebController
-- (instancetype)initWithUrl:(NSString *)url name:(NSString *)name {
+- (instancetype)initWithUrl:(NSString *)url name:(NSString *)name showCloseBtn:(BOOL)isShow {
     self = [super init];
     if (self) {
         self.url = url;
         self.name = name;
+        self.isShow = isShow;
     }
     return self;
 }
@@ -93,12 +96,19 @@
     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];
+    UIImage *leftImage = [self xw_getImageName:@"web_black_back" bundle:@"CNLiveAgreementManager.bundle/CNLiveAgreementManager" targetClass:[CNLiveAgreementWebController class]];
+    [leftBtn setImage:[leftImage imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
     [leftBtn addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];
     [navView addSubview:leftBtn];
+    UIButton *closeBtn = [UIButton buttonWithType:UIButtonTypeSystem];
+    closeBtn.frame = CGRectMake(44, 0, 44, 44);
+    UIImage *closeImage = [self xw_getImageName:@"web_black_close" bundle:@"CNLiveAgreementManager.bundle/CNLiveAgreementManager" targetClass:[CNLiveAgreementWebController class]];
+    [closeBtn setImage:[closeImage imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
+    [closeBtn addTarget:self action:@selector(closeClick) forControlEvents:UIControlEventTouchUpInside];
+    closeBtn.hidden = !self.isShow;
+    [navView addSubview:closeBtn];
+    
     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];
@@ -7,12 +7,18 @@
 //
 #import "CNLiveAppDelegate.h"
+#import "CNLiveViewController.h"
 @implementation CNLiveAppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     // Override point for customization after application launch.
+    UINavigationController *navCtrl = [[UINavigationController alloc] initWithRootViewController:[CNLiveViewController new]];
+    
+    self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+    self.window.rootViewController = navCtrl;
+    [self.window makeKeyAndVisible];
     return YES;
 }
@@ -8,6 +8,7 @@
 #import "CNLiveViewController.h"
 #import "CNLiveAgreementManager.h"
+#import "CNLiveEnvironment.h"
 @interface CNLiveViewController ()
@@ -20,6 +21,8 @@
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
+    [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];
+    self.view.backgroundColor = [UIColor whiteColor];
     UIButton *btn0 = [UIButton buttonWithType:UIButtonTypeCustom];
     btn0.frame = CGRectMake(0, 0, 100, 100);
     btn0.center = self.view.center;
@@ -28,13 +31,6 @@
     [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];