no message

zhangxiaowen
1 parent d9f394cb
Showing 6 changed files with 38 additions and 61 deletions
CNLiveUserAgreementManager.podspec
CNLiveUserAgreementManager/Classes/CNLiveUserAgreementController.m
CNLiveUserAgreementManager/Classes/CNLiveUserAgreementManager.h
CNLiveUserAgreementManager/Classes/CNLiveUserAgreementManager.m
Example/CNLiveUserAgreementManager.xcodeproj/project.pbxproj
Example/CNLiveUserAgreementManager/CNLiveViewController.m
@@ -48,6 +48,9 @@ TODO: 网家家-用户协议管理类.
   # 类别
   s.dependency 'CNLiveCategory'
+  # 管理类
+  s.dependency 'CNLiveManager'
+  
   # 基类
   s.dependency 'CNLiveBaseClass'
@@ -15,7 +15,6 @@
 @end
 @implementation CNLiveUserAgreementController
-
 #pragma mark - 交互
 - (void)interaction {
     [super interaction];
@@ -41,7 +40,7 @@
 #pragma mark - CNLiveWebViewDelegate
 - (void)webView:(CNLiveWebView *)webView didFinishLoadWithURL:(NSURL *)url {
-    NSLog(@"CNLIVEViewController - didFinishLoad");
+    NSLog(@"CNLiveUserAgreementController - didFinishLoad");
     if(self.title.length == 0){
         self.title = webView.title;
     }
@@ -29,7 +29,7 @@ typedef NS_ENUM(NSUInteger, CNLiveGetAgreementH5Type) {
 };
-typedef void(^SuccessBlock)(NSString *h5, NSString *title, BOOL isShow);
+typedef void(^SuccessBlock)(NSString *h5, NSString *title, BOOL closeHidden);
 typedef void(^FailureBlock)(NSError *error);
 @interface CNLiveUserAgreementManager : NSObject
@@ -9,6 +9,7 @@
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
 #import "CNLiveEnvironment.h"
 #import "CNLiveUserAgreementController.h"
+#import "CNLiveManager.h"
 @interface CNLiveUserAgreementManager()
@@ -63,7 +64,7 @@ static CNLiveUserAgreementManager *_instance = nil;
         }
         else{
             if ([responseObject isKindOfClass:[NSArray class]]) {
-                
+                BOOL closeHidden = NO;
                 for (NSDictionary *dic in responseObject) {
                     switch (type) {
@@ -71,7 +72,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@",dic[@"type"]] isEqualToString:@"yhxy"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -81,7 +82,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@",dic[@"type"]] isEqualToString:@"yszc"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -91,7 +92,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@",dic[@"type"]] isEqualToString:@"bzfk"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -101,7 +102,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@",dic[@"type"]] isEqualToString:@"ljwjj"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -111,7 +112,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@", dic[@"type"]] isEqualToString:@"yyjj"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -121,7 +122,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@", dic[@"type"]] isEqualToString:@"bqxx"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -131,7 +132,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@", dic[@"type"]] isEqualToString:@"rjxkxy"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -141,7 +142,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@", dic[@"type"]] isEqualToString:@"jfgz"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -151,7 +152,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@", dic[@"type"]] isEqualToString:@"jfjlgz"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -161,7 +162,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@", dic[@"type"]] isEqualToString:@"shsqxy"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -171,7 +172,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@", dic[@"type"]] isEqualToString:@"zxxz"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -181,7 +182,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@", dic[@"type"]] isEqualToString:@"fwsm"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -191,7 +192,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@", dic[@"type"]] isEqualToString:@"tssm"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -201,7 +202,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@", dic[@"type"]] isEqualToString:@"qyzz"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -211,7 +212,7 @@ static CNLiveUserAgreementManager *_instance = nil;
                         {
                             if ([[NSString stringWithFormat:@"%@", dic[@"type"]] isEqualToString:@"ypxy"]) {
                                 if (success) {
-                                    success(dic[@"detailUrl"], dic[@"title"], YES);
+                                    success(dic[@"detailUrl"], dic[@"title"], closeHidden);
                                     return ;
                                 }
                             }
@@ -239,8 +240,8 @@ static CNLiveUserAgreementManager *_instance = nil;
  *  @param failure 请求失败回调
  */
 + (void)getAgreementH5WithType:(CNLiveGetAgreementH5Type)type success:(SuccessBlock)success failure:(FailureBlock)failure {
-    [[CNLiveUserAgreementManager manager] getAgreementH5WithType:type success:^(NSString * _Nonnull h5, NSString * _Nonnull title, BOOL isShow) {
-        success?success(h5, title, isShow):@"";
+    [[CNLiveUserAgreementManager manager] getAgreementH5WithType:type success:^(NSString * _Nonnull h5, NSString * _Nonnull title, BOOL closeHidden) {
+        success?success(h5, title, closeHidden):@"";
     } failure:^(NSError * _Nonnull error) {
         failure?failure(error):@"";
@@ -255,10 +256,10 @@ static CNLiveUserAgreementManager *_instance = nil;
  */
 + (void)jumpToAgreementH5WithType:(CNLiveGetAgreementH5Type)type{
     __weak typeof(self) weakSelf = self;
-    [CNLiveUserAgreementManager getAgreementH5WithType:type success:^(NSString *h5, NSString *title, BOOL isShow) {
+    [CNLiveUserAgreementManager getAgreementH5WithType:type success:^(NSString *h5, NSString *title, BOOL closeHidden) {
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if(!strongSelf) return;
-        [strongSelf pushToWebControllerUrl:h5 name:title showCloseBtn:isShow];
+        [strongSelf pushToWebControllerUrl:h5 name:title closeHidden:closeHidden];
     } failure:^(NSError *error) {
         if(TestEnvironment){
@@ -276,10 +277,10 @@ static CNLiveUserAgreementManager *_instance = nil;
  */
 + (void)jumpToAgreementH5WithString:(NSString *)string {
     __weak typeof(self) weakSelf = self;
-    [CNLiveUserAgreementManager getAgreementH5WithString:string success:^(NSString *h5, NSString *title, BOOL isShow) {
+    [CNLiveUserAgreementManager getAgreementH5WithString:string success:^(NSString *h5, NSString *title, BOOL closeHidden) {
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if(!strongSelf) return;
-        [strongSelf pushToWebControllerUrl:h5 name:title showCloseBtn:isShow];
+        [strongSelf pushToWebControllerUrl:h5 name:title closeHidden:closeHidden];
     } failure:^(NSError *error) {
         if(TestEnvironment){
@@ -297,8 +298,8 @@ static CNLiveUserAgreementManager *_instance = nil;
  *  @param failure 请求失败回调
  */
 + (void)getAgreementH5WithString:(NSString *)string success:(SuccessBlock)success failure:(FailureBlock)failure{
-    [[CNLiveUserAgreementManager manager] getAgreementH5WithString:string success:^(NSString *h5, NSString *title, BOOL isShow) {
-        success?success(h5, title, isShow):@"";
+    [[CNLiveUserAgreementManager manager] getAgreementH5WithString:string success:^(NSString *h5, NSString *title, BOOL closeHidden) {
+        success?success(h5, title, closeHidden):@"";
     } failure:^(NSError *error) {
         failure?failure(error):@"";
@@ -319,15 +320,12 @@ static CNLiveUserAgreementManager *_instance = nil;
             if ([responseObject isKindOfClass:[NSArray class]]) {
                 for (NSDictionary *dic in responseObject) {
                     if ([[NSString stringWithFormat:@"%@",dic[@"type"]] isEqualToString:string]) {
-                        success?success(dic[@"detailUrl"], dic[@"title"], YES):@"";
+                        success?success(dic[@"detailUrl"], dic[@"title"], NO):@"";
                         return;
                     }
-                    
                 }
-                
             }
             failure?failure(error):@"";
-
         }else{
             failure?failure(error):@"";
@@ -337,34 +335,9 @@ static CNLiveUserAgreementManager *_instance = nil;
 }
 #pragma mark - 跳转控制器
-+ (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;
-        CNLiveUserAgreementController *vc = [[CNLiveUserAgreementController alloc] initWithUrl:url title:name closeHidden:isShow];
-        [nav pushViewController:vc animated:YES];
-        
-    }
-    //跟控制器是TabBar
-    else if ([root isKindOfClass:[UITabBarController class]]){
-        UITabBarController *tab = (UITabBarController *)root;
-        UIViewController *selected = tab.selectedViewController;
-        if ([selected isKindOfClass:[UINavigationController class]]){
-            UINavigationController *nav = (UINavigationController *)selected;
-            CNLiveUserAgreementController *vc = [[CNLiveUserAgreementController alloc] initWithUrl:url title:name closeHidden:isShow];
-            [nav pushViewController:vc animated:YES];
-        }else{
-            CNLiveUserAgreementController *vc = [[CNLiveUserAgreementController alloc] initWithUrl:url title:name closeHidden:isShow];
-            [root presentViewController:vc animated:YES completion:nil];
-        }
-        
-    }else{
-        CNLiveUserAgreementController *vc = [[CNLiveUserAgreementController alloc] initWithUrl:url title:name closeHidden:isShow];
-        [root presentViewController:vc animated:YES completion:nil];
-        
-    }
++ (void)pushToWebControllerUrl:(NSString *)url name:(NSString *)name closeHidden:(BOOL)closeHidden{
+    CNLiveUserAgreementController *vc = [[CNLiveUserAgreementController alloc] initWithUrl:url title:name closeHidden:closeHidden];
+    [CNLivePageJumpManager jumpViewController:vc];
 }
@@ -354,6 +354,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",
@@ -368,6 +369,7 @@
 				"${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}/CNLiveManager.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",
@@ -35,11 +35,11 @@
 }
 - (void)testButtonClicked {
-//    [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementCancellation];
+    [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementCancellation];
 //    [CNLiveUserAgreementManager jumpToAgreementH5WithString:@"yhxy"];
     [CNLiveUserAgreementManager getAgreementH5WithType:CNLiveUserAgreementCancellation success:^(NSString * _Nonnull h5, NSString * _Nonnull title, BOOL isShow) {
         CNLiveUserAgreementController *vc = [[CNLiveUserAgreementController alloc] initWithUrl:h5 title:title closeHidden:NO];
-        [self.navigationController pushViewController:vc animated:YES];
+//        [self.navigationController pushViewController:vc animated:YES];
     } failure:^(NSError * _Nonnull error) {