no message

zhangxiaowen
1 parent 14fd13fb
Showing 4 changed files with 9 additions and 19 deletions
CNLiveEnvironment/Classes/CNLiveEnvironment.h
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.h
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.m
Example/CNLiveEnvironment/XWViewController.m
@@ -13,14 +13,12 @@
 // 详细环境
 #define EnvironmentType [CNLiveEnvironmentManager manager].isEnvironment
-// 是否是正式环境
-#define FormalEnvironment [CNLiveEnvironmentManager manager].isFormalEnvironment
+
 // 是否是测试环境
 #define TestEnvironment [CNLiveEnvironmentManager manager].isTestEnvironment
 // Url域名
 #define AppDownloadUrl [CNLiveEnvironmentManager manager].kAppDownloadUrl
-#define ShareDarenHomeUrl [CNLiveEnvironmentManager manager].kShareDarenHomeUrl
 #define WjjH5_Host [CNLiveEnvironmentManager manager].kWjjH5_Host
 #define API_Host [CNLiveEnvironmentManager manager].kAPI_Host
@@ -21,11 +21,9 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) {
 @interface CNLiveEnvironmentManager : NSObject
 @property (nonatomic, assign, readonly) CNLiveEnvironmentType isEnvironment; // 详细环境
-@property (nonatomic, assign, readonly) BOOL isFormalEnvironment; // 是否是正式环境
 @property (nonatomic, assign, readonly) BOOL isTestEnvironment; // 是否是测试环境
-@property (nonatomic, copy, readonly) NSString *kAppDownloadUrl;
-@property (nonatomic, copy, readonly) NSString *kShareDarenHomeUrl;
+@property (nonatomic, copy, readonly) NSString *kAppDownloadUrl;// 下载地址
 @property (nonatomic, copy, readonly) NSString *kWjjH5_Host;
 @property (nonatomic, copy, readonly) NSString *kAPI_Host;
@@ -42,7 +40,7 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) {
 @property (nonatomic, copy, readonly) NSString *appKey; // App Key
 @property (nonatomic, copy, readonly) NSString *appSecret; // App Secret
-@property (nonatomic, copy, readonly) NSString *displayName; // 展示名字
+@property (nonatomic, copy, readonly) NSString *displayName; // 展示名字/App名字
 @property (nonatomic, assign, readonly) NSInteger kIM_Cer_BusiId; // IM
 @property (nonatomic, copy, readonly) NSString *kTIM_GetTokenUrl; // IM请求token
@@ -73,7 +71,7 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) {
 @property (nonatomic, copy, readonly) NSString *kQQShareAppId_Share;
 @property (nonatomic, copy, readonly) NSString *kQQShareAppSecret_Share;
-/*shareSDK相关参数*/
+/*ShareSDK相关参数*/
 @property (nonatomic, copy, readonly) NSString *kShareSDKAppId_Share;
 @property (nonatomic, copy, readonly) NSString *kShareSDKAppSecret_Share;
@@ -9,11 +9,9 @@
 #import "CNLiveEnvironmentManager.h"
 @interface CNLiveEnvironmentManager()
 @property (nonatomic, assign, readwrite) CNLiveEnvironmentType isEnvironment; //详细环境
-@property (nonatomic, assign, readwrite) BOOL isFormalEnvironment; // 是否是正式环境
 @property (nonatomic, assign, readwrite) BOOL isTestEnvironment; // 是否是测试环境
 @property (nonatomic, copy, readwrite) NSString *kAppDownloadUrl;
-@property (nonatomic, copy, readwrite) NSString *kShareDarenHomeUrl;
 @property (nonatomic, copy, readwrite) NSString *kWjjH5_Host;
 @property (nonatomic, copy, readwrite) NSString *kAPI_Host;
@@ -125,11 +123,9 @@ static CNLiveEnvironmentManager *_instance = nil;
 #pragma mark - 测试企业环境
         case CNLiveDebugInHouse://测试企业环境
         {
-            manager.isFormalEnvironment = NO;
             manager.isTestEnvironment = YES;
             manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
-            manager.kShareDarenHomeUrl = @"http://apiwjj.cnlive.com/download/index.html";
             manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com";
             manager.kAPI_Host = @"https://apiwjjtest.cnlive.com";
@@ -188,7 +184,6 @@ static CNLiveEnvironmentManager *_instance = nil;
             manager.kNetAddTestUrlSchems = @"CNLiveNetAddTestUrlSchems";
             manager.kNetAddTestUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems";
-
         }
             break;
@@ -196,11 +191,9 @@ static CNLiveEnvironmentManager *_instance = nil;
 #pragma mark - 正式企业环境
         case CNLiveProductionInHouse://正式企业环境
         {
-            manager.isFormalEnvironment = YES;
             manager.isTestEnvironment = NO;
             manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
-            manager.kShareDarenHomeUrl = @"http://apiwjj.cnlive.com/daren/download.html";
             manager.kWjjH5_Host = @"http://wjjh5.cnlive.com";
             manager.kAPI_Host = @"https://apiwjj.cnlive.com";
@@ -266,11 +259,9 @@ static CNLiveEnvironmentManager *_instance = nil;
 #pragma mark - 测试商店环境
         case CNLiveDebugAppStore://测试商店环境
         {
-            manager.isFormalEnvironment = NO;
             manager.isTestEnvironment = YES;
             manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
-            manager.kShareDarenHomeUrl = @"http://apiwjj.cnlive.com/download/index.html";
             manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com";
             manager.kAPI_Host = @"https://apiwjjtest.cnlive.com";
@@ -336,11 +327,9 @@ static CNLiveEnvironmentManager *_instance = nil;
 #pragma mark - 正式商店环境
         case CNLiveProductionAppStore://正式商店环境
         {
-            manager.isFormalEnvironment = YES;
             manager.isTestEnvironment = NO;
             manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
-            manager.kShareDarenHomeUrl = @"http://apiwjj.cnlive.com/daren/download.html";
             manager.kWjjH5_Host = @"http://wjjh5.cnlive.com";
             manager.kAPI_Host = @"https://apiwjj.cnlive.com";
@@ -20,8 +20,13 @@
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
     NSLog(@"%@",TIM_GetTokenUrl);
+    NSLog(@"%d",TestEnvironment);
+
     [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
     NSLog(@"%@",TIM_GetTokenUrl);
+    NSLog(@"%d",TestEnvironment);
+
+    NSLog(@"%@",AppDownloadUrl);
 }