no message

iOS-Xiaowen
1 parent 24c6956c
Showing 6 changed files with 5 additions and 22 deletions
CNLiveUserAgreementManager.podspec
CNLiveUserAgreementManager/Classes/CNLiveUserAgreementController.m
CNLiveUserAgreementManager/Classes/CNLiveUserAgreementManager.m
Example/CNLiveUserAgreementManager.xcodeproj/project.pbxproj
Example/CNLiveUserAgreementManager/CNLiveAppDelegate.m
Example/CNLiveUserAgreementManager/CNLiveViewController.m
@@ -40,9 +40,6 @@ TODO: 网家家-用户协议管理类.
   # s.frameworks = 'UIKit', 'MapKit'
   s.dependency 'CNLiveTripartiteManagement/AFNetworking'
-  #环境库
-  s.dependency 'CNLiveEnvironment'
-
   # 数据请求
   s.dependency 'CNLiveRequestBastKit'
@@ -9,7 +9,6 @@
 #import "CNLiveUserAgreementController.h"
 #import "WKWebViewJavascriptBridge.h"
-#import "CNLiveEnvironment.h"
 #import "CNLiveWebView.h"
 @interface CNLiveUserAgreementController ()
@@ -19,7 +18,7 @@
 @implementation CNLiveUserAgreementController
 - (void)createSubViews {
     [super createSubViews];
-    UIColor *color = Business?[UIColor colorWithRed:72/255.0 green:168/255.0 blue:249/255.0 alpha:1.0]:[UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
+    UIColor *color = [UIColor colorWithRed:72/255.0 green:168/255.0 blue:249/255.0 alpha:1.0];
     self.webView.progressViewColor = color;
 }
 #pragma mark - 交互
@@ -7,7 +7,6 @@
 //
 #import "CNLiveUserAgreementManager.h"
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
-#import "CNLiveEnvironment.h"
 #import "CNLiveUserAgreementController.h"
 #import "CNLiveManager.h"
@@ -56,7 +55,7 @@ static CNLiveUserAgreementManager *_instance = nil;
  */
 - (void)getAgreementH5WithType:(CNLiveGetAgreementH5Type)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) {
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:@"https://wjj.ys1.cnliveimg.com/json/wjj_user_terms.json" Param:@{} CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         if (error) {
             if (failure) {
                 failure(error);
@@ -262,10 +261,7 @@ static CNLiveUserAgreementManager *_instance = nil;
         [strongSelf pushToWebControllerUrl:h5 name:title closeHidden:closeHidden];
     } failure:^(NSError *error) {
-        if(TestEnvironment){
-            NSLog(@"点击协议跳转失败");
-
-        }
+        NSLog(@"点击协议跳转失败");
     }];
 }
@@ -283,10 +279,7 @@ static CNLiveUserAgreementManager *_instance = nil;
         [strongSelf pushToWebControllerUrl:h5 name:title closeHidden:closeHidden];
     } failure:^(NSError *error) {
-        if(TestEnvironment){
-            NSLog(@"点击协议跳转失败");
-            
-        }
+        NSLog(@"点击协议跳转失败");
     }];
 }
@@ -315,7 +308,7 @@ static CNLiveUserAgreementManager *_instance = nil;
  */
 - (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) {
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:@"https://wjj.ys1.cnliveimg.com/json/wjj_user_terms.json" Param:@{} CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         if (!error) {
             if ([responseObject isKindOfClass:[NSArray class]]) {
                 for (NSDictionary *dic in responseObject) {
@@ -328,7 +328,6 @@
 				"${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}/CNLiveManager/CNLiveManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
@@ -342,7 +341,6 @@
 				"${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}/CNLiveManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
@@ -8,13 +8,11 @@
 #import "CNLiveAppDelegate.h"
 #import "CNLiveViewController.h"
-#import "CNLiveEnvironment.h"
 @implementation CNLiveAppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBusiness environmentType:CNLiveProductionAppStore];
     // Override point for customization after application launch.
     UINavigationController *navCtrl = [[UINavigationController alloc] initWithRootViewController:[CNLiveViewController new]];
@@ -7,7 +7,6 @@
 //
 #import "CNLiveViewController.h"
-#import "CNLiveEnvironment.h"
 #import "CNLiveUserAgreementManager.h"
 #import "CNLiveUserAgreementController.h"
@@ -23,7 +22,6 @@
     [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);