iOS Team / CNLiveEnvironment · Commits

Commit 39840d57729ff78563e01bb66104d695fd4644cb

Authored by zhangxiaowen
1 parent 91e287c9

no message

Inline Side-by-side
Showing 4 changed files with 210 additions and 207 deletions
CNLiveEnvironment/Classes/CNLiveEnvironment.h
  View file @39840d5
@@ -20,16 +20,16 @@ @@ -20,16 +20,16 @@
20 #define TestEnvironment [CNLiveEnvironmentManager manager].isTestEnvironment 20 #define TestEnvironment [CNLiveEnvironmentManager manager].isTestEnvironment
21 21
22 // Url域名 22 // Url域名
23 -#define kAppDownloadUrl [CNLiveEnvironmentManager manager].AppDownloadUrl  
24 -#define kShareDarenHomeUrl [CNLiveEnvironmentManager manager].ShareDarenHomeUrl 23 +#define AppDownloadUrl [CNLiveEnvironmentManager manager].AppDownloadUrl
  24 +#define ShareDarenHomeUrl [CNLiveEnvironmentManager manager].ShareDarenHomeUrl
25 25
26 -#define kWjjH5_Host(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].WjjH5_Host,url]  
27 -#define kAPI_Host(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].API_Host,url]  
28 -#define kAPI_Contact(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].API_Contact,url]  
29 -#define kAPI_Refund(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].API_Refund,url]  
30 -#define kAPI_Report(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].API_Report,url]  
31 -#define kAPI_OpenApi2(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].API_OpenApi2,url]  
32 -#define kAPI_Classify(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].API_Classify,url] 26 +#define WjjH5_Host(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].kWjjH5_Host,url]
  27 +#define API_Host(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].kAPI_Host,url]
  28 +#define API_Contact(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].kAPI_Contact,url]
  29 +#define API_Refund(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].kAPI_Refund,url]
  30 +#define API_Report(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].kAPI_Report,url]
  31 +#define API_OpenApi2(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].kAPI_OpenApi2,url]
  32 +#define API_Classify(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].kAPI_Classify,url]
33 33
34 // BundleId 34 // BundleId
35 #define BundleId [CNLiveEnvironmentManager manager].bundleId 35 #define BundleId [CNLiveEnvironmentManager manager].bundleId
@@ -45,46 +45,46 @@ @@ -45,46 +45,46 @@
45 #define DisplayName [CNLiveEnvironmentManager manager].displayName 45 #define DisplayName [CNLiveEnvironmentManager manager].displayName
46 46
47 // 高德地图Key 47 // 高德地图Key
48 -#define kGDApiKey [CNLiveEnvironmentManager manager].GDApiKey 48 +#define GDApiKey [CNLiveEnvironmentManager manager].kGDApiKey
49 49
50 // 百度身份证识别 50 // 百度身份证识别
51 -#define kBDAppId [CNLiveEnvironmentManager manager].BDAppId  
52 -#define kBDAppKey [CNLiveEnvironmentManager manager].BDAppKey  
53 -#define kBDSecret [CNLiveEnvironmentManager manager].BDSecret 51 +#define BDAppId [CNLiveEnvironmentManager manager].kBDAppId
  52 +#define BDAppKey [CNLiveEnvironmentManager manager].kBDAppKey
  53 +#define BDSecret [CNLiveEnvironmentManager manager].kBDSecret
54 54
55 // 百度地图 55 // 百度地图
56 -#define kBDMapAK [CNLiveEnvironmentManager manager].BDMapAK  
57 -#define kBDMapMCODE [CNLiveEnvironmentManager manager].BDMapMCODE  
58 -#define kBDMapServiceID [CNLiveEnvironmentManager manager].BDMapServiceID 56 +#define BDMapAK [CNLiveEnvironmentManager manager].kBDMapAK
  57 +#define BDMapMCODE [CNLiveEnvironmentManager manager].kBDMapMCODE
  58 +#define BDMapServiceID [CNLiveEnvironmentManager manager].kBDMapServiceID
59 59
60 // tingyun 60 // tingyun
61 -#define kTingYunAppKey [CNLiveEnvironmentManager manager].TingYunAppKey 61 +#define TingYunAppKey [CNLiveEnvironmentManager manager].kTingYunAppKey
62 62
63 /*微信相关参数*/ 63 /*微信相关参数*/
64 -#define kWeiChatAppId_Share [CNLiveEnvironmentManager manager].WeiChatAppId_Share  
65 -#define kWeiChatAppSecret_Share [CNLiveEnvironmentManager manager].WeiChatAppSecret_Share 64 +#define WeiChatAppId_Share [CNLiveEnvironmentManager manager].kWeiChatAppId_Share
  65 +#define WeiChatAppSecret_Share [CNLiveEnvironmentManager manager].kWeiChatAppSecret_Share
66 66
67 /*腾讯相关参数*/ 67 /*腾讯相关参数*/
68 -#define kQQShareAppId_Share [CNLiveEnvironmentManager manager].QQShareAppId_Share  
69 -#define kQQShareAppSecret_Share [CNLiveEnvironmentManager manager].QQShareAppSecret_Share 68 +#define QQShareAppId_Share [CNLiveEnvironmentManager manager].kQQShareAppId_Share
  69 +#define QQShareAppSecret_Share [CNLiveEnvironmentManager manager].kQQShareAppSecret_Share
70 70
71 /*shareSDK相关参数*/ 71 /*shareSDK相关参数*/
72 -#define kShareSDKAppId_Share [CNLiveEnvironmentManager manager].ShareSDKAppId_Share  
73 -#define kShareSDKAppSecret_Share [CNLiveEnvironmentManager manager].ShareSDKAppSecret_Share 72 +#define ShareSDKAppId_Share [CNLiveEnvironmentManager manager].kShareSDKAppId_Share
  73 +#define ShareSDKAppSecret_Share [CNLiveEnvironmentManager manager].kShareSDKAppSecret_Share
74 74
75 -#define kWjjShare_Iden [CNLiveEnvironmentManager manager].WjjShare_Iden 75 +#define WjjShare_Iden [CNLiveEnvironmentManager manager].kWjjShare_Iden
76 76
77 // 正式环境平台配置 77 // 正式环境平台配置
78 // IMSDK相关的配置 78 // IMSDK相关的配置
79 -#define kWXAccount [CNLiveEnvironmentManager manager].WXAccount  
80 -#define kSdkAppId [CNLiveEnvironmentManager manager].SdkAppId  
81 -#define kSdkAccountType [CNLiveEnvironmentManager manager].SdkAccountType 79 +#define WXAccount [CNLiveEnvironmentManager manager].kWXAccount
  80 +#define SdkAppId [CNLiveEnvironmentManager manager].kSdkAppId
  81 +#define SdkAccountType [CNLiveEnvironmentManager manager].kSdkAccountType
82 82
83 // 支付宝支付Schems 83 // 支付宝支付Schems
84 -#define kNetAddTestUrlSchems [CNLiveEnvironmentManager manager].NetAddTestUrlSchems 84 +#define NetAddTestUrlSchems [CNLiveEnvironmentManager manager].kNetAddTestUrlSchems
85 85
86 // 银联支付Schems 86 // 银联支付Schems
87 -#define kNetAddTestUnionPaySchems [CNLiveEnvironmentManager manager].NetAddTestUnionPaySchems 87 +#define NetAddTestUnionPaySchems [CNLiveEnvironmentManager manager].kNetAddTestUnionPaySchems
88 88
89 89
90 #endif /* CNLiveEnvironment_h */ 90 #endif /* CNLiveEnvironment_h */
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.h
  View file @39840d5
@@ -24,16 +24,16 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) { @@ -24,16 +24,16 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) {
24 @property (nonatomic, assign, readonly) BOOL isFormalEnvironment; // 是否是正式环境 24 @property (nonatomic, assign, readonly) BOOL isFormalEnvironment; // 是否是正式环境
25 @property (nonatomic, assign, readonly) BOOL isTestEnvironment; // 是否是测试环境 25 @property (nonatomic, assign, readonly) BOOL isTestEnvironment; // 是否是测试环境
26 26
27 -@property (nonatomic, copy, readonly) NSString *AppDownloadUrl;  
28 -@property (nonatomic, copy, readonly) NSString *ShareDarenHomeUrl;  
29 -@property (nonatomic, copy, readonly) NSString *WjjH5_Host; 27 +@property (nonatomic, copy, readonly) NSString *kAppDownloadUrl;
  28 +@property (nonatomic, copy, readonly) NSString *kShareDarenHomeUrl;
  29 +@property (nonatomic, copy, readonly) NSString *kWjjH5_Host;
30 30
31 -@property (nonatomic, copy, readonly) NSString *API_Host;  
32 -@property (nonatomic, copy, readonly) NSString *API_Contact;  
33 -@property (nonatomic, copy, readonly) NSString *API_Refund;  
34 -@property (nonatomic, copy, readonly) NSString *API_Report;  
35 -@property (nonatomic, copy, readonly) NSString *API_OpenApi2;  
36 -@property (nonatomic, copy, readonly) NSString *API_Classify; 31 +@property (nonatomic, copy, readonly) NSString *kAPI_Host;
  32 +@property (nonatomic, copy, readonly) NSString *kAPI_Contact;
  33 +@property (nonatomic, copy, readonly) NSString *kAPI_Refund;
  34 +@property (nonatomic, copy, readonly) NSString *kAPI_Report;
  35 +@property (nonatomic, copy, readonly) NSString *kAPI_OpenApi2;
  36 +@property (nonatomic, copy, readonly) NSString *kAPI_Classify;
37 37
38 @property (nonatomic, copy, readonly) NSString *environmentDesc; // 环境描述 38 @property (nonatomic, copy, readonly) NSString *environmentDesc; // 环境描述
39 @property (nonatomic, copy, readonly) NSString *bundleId; // BundleId 39 @property (nonatomic, copy, readonly) NSString *bundleId; // BundleId
@@ -44,44 +44,44 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) { @@ -44,44 +44,44 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) {
44 44
45 @property (nonatomic, copy, readonly) NSString *displayName; // 展示名字 45 @property (nonatomic, copy, readonly) NSString *displayName; // 展示名字
46 46
47 -@property (nonatomic, copy, readonly) NSString *GDApiKey; // 高德地图Key 47 +@property (nonatomic, copy, readonly) NSString *kGDApiKey; // 高德地图Key
48 48
49 -@property (nonatomic, copy, readonly) NSString *BDAppId; // 百度身份证识别  
50 -@property (nonatomic, copy, readonly) NSString *BDAppKey; // AppKey  
51 -@property (nonatomic, copy, readonly) NSString *BDSecret; // AppSecret 49 +@property (nonatomic, copy, readonly) NSString *kBDAppId; // 百度身份证识别
  50 +@property (nonatomic, copy, readonly) NSString *kBDAppKey; // AppKey
  51 +@property (nonatomic, copy, readonly) NSString *kBDSecret; // AppSecret
52 52
53 -@property (nonatomic, copy, readonly) NSString *BDMapAK; // 百度地图  
54 -@property (nonatomic, copy, readonly) NSString *BDMapMCODE; // 百度地图  
55 -@property (nonatomic, assign, readonly) NSInteger BDMapServiceID; // 百度地图 53 +@property (nonatomic, copy, readonly) NSString *kBDMapAK; // 百度地图
  54 +@property (nonatomic, copy, readonly) NSString *kBDMapMCODE; // 百度地图
  55 +@property (nonatomic, assign, readonly) NSInteger kBDMapServiceID; // 百度地图
56 56
57 -@property (nonatomic, copy, readonly) NSString *TingYunAppKey; //tingyun 57 +@property (nonatomic, copy, readonly) NSString *kTingYunAppKey; //tingyun
58 58
59 /*微信相关参数*/ 59 /*微信相关参数*/
60 -@property (nonatomic, copy, readonly) NSString *WeiChatAppId_Share;  
61 -@property (nonatomic, copy, readonly) NSString *WeiChatAppSecret_Share; 60 +@property (nonatomic, copy, readonly) NSString *kWeiChatAppId_Share;
  61 +@property (nonatomic, copy, readonly) NSString *kWeiChatAppSecret_Share;
62 62
63 /*腾讯相关参数*/ 63 /*腾讯相关参数*/
64 -@property (nonatomic, copy, readonly) NSString *QQShareAppId_Share;  
65 -@property (nonatomic, copy, readonly) NSString *QQShareAppSecret_Share; 64 +@property (nonatomic, copy, readonly) NSString *kQQShareAppId_Share;
  65 +@property (nonatomic, copy, readonly) NSString *kQQShareAppSecret_Share;
66 66
67 /*shareSDK相关参数*/ 67 /*shareSDK相关参数*/
68 -@property (nonatomic, copy, readonly) NSString *ShareSDKAppId_Share;  
69 -@property (nonatomic, copy, readonly) NSString *ShareSDKAppSecret_Share; 68 +@property (nonatomic, copy, readonly) NSString *kShareSDKAppId_Share;
  69 +@property (nonatomic, copy, readonly) NSString *kShareSDKAppSecret_Share;
70 70
71 //Share 71 //Share
72 -@property (nonatomic, copy, readonly) NSString *WjjShare_Iden; 72 +@property (nonatomic, copy, readonly) NSString *kWjjShare_Iden;
73 73
74 // 正式环境平台配置 74 // 正式环境平台配置
75 // IMSDK相关的配置 75 // IMSDK相关的配置
76 -@property (nonatomic, copy, readonly) NSString *WXAccount;  
77 -@property (nonatomic, copy, readonly) NSString *SdkAppId;  
78 -@property (nonatomic, copy, readonly) NSString *SdkAccountType; 76 +@property (nonatomic, copy, readonly) NSString *kWXAccount;
  77 +@property (nonatomic, copy, readonly) NSString *kSdkAppId;
  78 +@property (nonatomic, copy, readonly) NSString *kSdkAccountType;
79 79
80 // 支付宝支付Schems 80 // 支付宝支付Schems
81 -@property (nonatomic, copy, readonly) NSString *NetAddTestUrlSchems; 81 +@property (nonatomic, copy, readonly) NSString *kNetAddTestUrlSchems;
82 82
83 // 银联支付Schems 83 // 银联支付Schems
84 -@property (nonatomic, copy, readonly) NSString *NetAddTestUnionPaySchems; 84 +@property (nonatomic, copy, readonly) NSString *kNetAddTestUnionPaySchems;
85 85
86 /** 86 /**
87 * @abstract 单例初始化 87 * @abstract 单例初始化
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.m
  View file @39840d5
@@ -12,16 +12,16 @@ @@ -12,16 +12,16 @@
12 @property (nonatomic, assign, readwrite) BOOL isFormalEnvironment; // 是否是正式环境 12 @property (nonatomic, assign, readwrite) BOOL isFormalEnvironment; // 是否是正式环境
13 @property (nonatomic, assign, readwrite) BOOL isTestEnvironment; // 是否是测试环境 13 @property (nonatomic, assign, readwrite) BOOL isTestEnvironment; // 是否是测试环境
14 14
15 -@property (nonatomic, copy, readwrite) NSString *AppDownloadUrl;  
16 -@property (nonatomic, copy, readwrite) NSString *ShareDarenHomeUrl;  
17 -@property (nonatomic, copy, readwrite) NSString *WjjH5_Host; 15 +@property (nonatomic, copy, readwrite) NSString *kAppDownloadUrl;
  16 +@property (nonatomic, copy, readwrite) NSString *kShareDarenHomeUrl;
  17 +@property (nonatomic, copy, readwrite) NSString *kWjjH5_Host;
18 18
19 -@property (nonatomic, copy, readwrite) NSString *API_Host;  
20 -@property (nonatomic, copy, readwrite) NSString *API_Contact;  
21 -@property (nonatomic, copy, readwrite) NSString *API_Refund;  
22 -@property (nonatomic, copy, readwrite) NSString *API_Report;  
23 -@property (nonatomic, copy, readwrite) NSString *API_OpenApi2;  
24 -@property (nonatomic, copy, readwrite) NSString *API_Classify; 19 +@property (nonatomic, copy, readwrite) NSString *kAPI_Host;
  20 +@property (nonatomic, copy, readwrite) NSString *kAPI_Contact;
  21 +@property (nonatomic, copy, readwrite) NSString *kAPI_Refund;
  22 +@property (nonatomic, copy, readwrite) NSString *kAPI_Report;
  23 +@property (nonatomic, copy, readwrite) NSString *kAPI_OpenApi2;
  24 +@property (nonatomic, copy, readwrite) NSString *kAPI_Classify;
25 25
26 @property (nonatomic, copy, readwrite) NSString *environmentDesc; //环境描述 26 @property (nonatomic, copy, readwrite) NSString *environmentDesc; //环境描述
27 @property (nonatomic, copy, readwrite) NSString *bundleId; //BundleId 27 @property (nonatomic, copy, readwrite) NSString *bundleId; //BundleId
@@ -32,41 +32,41 @@ @@ -32,41 +32,41 @@
32 32
33 @property (nonatomic, copy, readwrite) NSString *displayName; //App展示名字 33 @property (nonatomic, copy, readwrite) NSString *displayName; //App展示名字
34 34
35 -@property (nonatomic, copy, readwrite) NSString *GDApiKey; // 高德地图Key 35 +@property (nonatomic, copy, readwrite) NSString *kGDApiKey; // 高德地图Key
36 36
37 -@property (nonatomic, copy, readwrite) NSString *BDAppId; //百度身份证识别  
38 -@property (nonatomic, copy, readwrite) NSString *BDAppKey; //AppKey  
39 -@property (nonatomic, copy, readwrite) NSString *BDSecret; //AppSecret 37 +@property (nonatomic, copy, readwrite) NSString *kBDAppId; //百度身份证识别
  38 +@property (nonatomic, copy, readwrite) NSString *kBDAppKey; //AppKey
  39 +@property (nonatomic, copy, readwrite) NSString *kBDSecret; //AppSecret
40 40
41 -@property (nonatomic, copy, readwrite) NSString *BDMapAK; // 百度地图  
42 -@property (nonatomic, copy, readwrite) NSString *BDMapMCODE; // 百度地图  
43 -@property (nonatomic, assign, readwrite) NSInteger BDMapServiceID; // 百度地图 41 +@property (nonatomic, copy, readwrite) NSString *kBDMapAK; // 百度地图
  42 +@property (nonatomic, copy, readwrite) NSString *kBDMapMCODE; // 百度地图
  43 +@property (nonatomic, assign, readwrite) NSInteger kBDMapServiceID; // 百度地图
44 44
45 -@property (nonatomic, copy, readwrite) NSString *TingYunAppKey; //tingyun 45 +@property (nonatomic, copy, readwrite) NSString *kTingYunAppKey; //tingyun
46 46
47 /*微信相关参数*/ 47 /*微信相关参数*/
48 -@property (nonatomic, copy, readwrite) NSString *WeiChatAppId_Share;  
49 -@property (nonatomic, copy, readwrite) NSString *WeiChatAppSecret_Share; 48 +@property (nonatomic, copy, readwrite) NSString *kWeiChatAppId_Share;
  49 +@property (nonatomic, copy, readwrite) NSString *kWeiChatAppSecret_Share;
50 50
51 /*腾讯相关参数*/ 51 /*腾讯相关参数*/
52 -@property (nonatomic, copy, readwrite) NSString *QQShareAppId_Share;  
53 -@property (nonatomic, copy, readwrite) NSString *QQShareAppSecret_Share; 52 +@property (nonatomic, copy, readwrite) NSString *kQQShareAppId_Share;
  53 +@property (nonatomic, copy, readwrite) NSString *kQQShareAppSecret_Share;
54 54
55 /*ShareSDK相关参数*/ 55 /*ShareSDK相关参数*/
56 -@property (nonatomic, copy, readwrite) NSString *ShareSDKAppId_Share;  
57 -@property (nonatomic, copy, readwrite) NSString *ShareSDKAppSecret_Share; 56 +@property (nonatomic, copy, readwrite) NSString *kShareSDKAppId_Share;
  57 +@property (nonatomic, copy, readwrite) NSString *kShareSDKAppSecret_Share;
58 58
59 -@property (nonatomic, copy, readwrite) NSString *WjjShare_Iden; 59 +@property (nonatomic, copy, readwrite) NSString *kWjjShare_Iden;
60 60
61 -@property (nonatomic, copy, readwrite) NSString *WXAccount;  
62 -@property (nonatomic, copy, readwrite) NSString *SdkAppId;  
63 -@property (nonatomic, copy, readwrite) NSString *SdkAccountType; 61 +@property (nonatomic, copy, readwrite) NSString *kWXAccount;
  62 +@property (nonatomic, copy, readwrite) NSString *kSdkAppId;
  63 +@property (nonatomic, copy, readwrite) NSString *kSdkAccountType;
64 64
65 // 支付宝支付Schems 65 // 支付宝支付Schems
66 -@property (nonatomic, copy, readwrite) NSString *NetAddTestUrlSchems; 66 +@property (nonatomic, copy, readwrite) NSString *kNetAddTestUrlSchems;
67 67
68 // 银联支付Schems 68 // 银联支付Schems
69 -@property (nonatomic, copy, readwrite) NSString *NetAddTestUnionPaySchems; 69 +@property (nonatomic, copy, readwrite) NSString *kNetAddTestUnionPaySchems;
70 70
71 @end 71 @end
72 72
@@ -108,16 +108,16 @@ @@ -108,16 +108,16 @@
108 manager.isFormalEnvironment = NO; 108 manager.isFormalEnvironment = NO;
109 manager.isTestEnvironment = YES; 109 manager.isTestEnvironment = YES;
110 110
111 - manager.AppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";  
112 - manager.ShareDarenHomeUrl = @"http://apiwjj.cnlive.com/download/index.html";  
113 - manager.WjjH5_Host = @"http://wjjh5test.cnlive.com"; 111 + manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
  112 + manager.kShareDarenHomeUrl = @"http://apiwjj.cnlive.com/download/index.html";
  113 + manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com";
114 114
115 - manager.API_Host = @"https://apiwjjtest.cnlive.com";  
116 - manager.API_Contact = @"https://imtest.cnlive.com";  
117 - manager.API_Refund = @"https://wjj.ys1.cnliveimg.com";  
118 - manager.API_Report = @"https://mobile.cnlive.com";  
119 - manager.API_OpenApi2 = @"https://api.cnlive.com/open/api2";  
120 - manager.API_Classify = @"http://cmstest.cnlive.com:8768"; 115 + manager.kAPI_Host = @"https://apiwjjtest.cnlive.com";
  116 + manager.kAPI_Contact = @"https://imtest.cnlive.com";
  117 + manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com";
  118 + manager.kAPI_Report = @"https://mobile.cnlive.com";
  119 + manager.kAPI_OpenApi2 = @"https://api.cnlive.com/open/api2";
  120 + manager.kAPI_Classify = @"http://cmstest.cnlive.com:8768";
121 121
122 manager.environmentDesc = @"测试企业版"; 122 manager.environmentDesc = @"测试企业版";
123 manager.bundleId = @"com.cnlive.CNLiveNetAddInHouse.debug"; 123 manager.bundleId = @"com.cnlive.CNLiveNetAddInHouse.debug";
@@ -128,34 +128,34 @@ @@ -128,34 +128,34 @@
128 128
129 manager.displayName = @"网家家测试企业"; 129 manager.displayName = @"网家家测试企业";
130 130
131 - manager.GDApiKey = @"f4459435f1c756d2efedc6ceec12be63";  
132 - manager.TingYunAppKey = @"3dda66ec904a4c3a8ad0169ca74de352"; 131 + manager.kGDApiKey = @"f4459435f1c756d2efedc6ceec12be63";
  132 + manager.kTingYunAppKey = @"3dda66ec904a4c3a8ad0169ca74de352";
133 133
134 - manager.BDAppId = @"14435716";  
135 - manager.BDAppKey = @"4foSD6VBILQ61olzmVAFEVGZ";  
136 - manager.BDSecret = @"VEuz92EVrmEVrrgTZKxYo4ApUkol7Ptk"; 134 + manager.kBDAppId = @"14435716";
  135 + manager.kBDAppKey = @"4foSD6VBILQ61olzmVAFEVGZ";
  136 + manager.kBDSecret = @"VEuz92EVrmEVrrgTZKxYo4ApUkol7Ptk";
137 137
138 - manager.BDMapAK = @"Nb4bz9t32YnmTkqVKrNHtToPQAwWvjzK";  
139 - manager.BDMapMCODE = @"com.cnlive.CNLiveNetAddInHouse.debug";  
140 - manager.BDMapServiceID = 213511; 138 + manager.kBDMapAK = @"Nb4bz9t32YnmTkqVKrNHtToPQAwWvjzK";
  139 + manager.kBDMapMCODE = @"com.cnlive.CNLiveNetAddInHouse.debug";
  140 + manager.kBDMapServiceID = 213511;
141 141
142 - manager.WeiChatAppId_Share = @"wx9b7f9443a8ccf15a";  
143 - manager.WeiChatAppSecret_Share = @"8d9970bf2901411d8dd2bffb344f147e"; 142 + manager.kWeiChatAppId_Share = @"wx9b7f9443a8ccf15a";
  143 + manager.kWeiChatAppSecret_Share = @"8d9970bf2901411d8dd2bffb344f147e";
144 144
145 - manager.QQShareAppId_Share = @"1106970445";  
146 - manager.QQShareAppSecret_Share = @"4hxuJ1HIes4i4hqT"; 145 + manager.kQQShareAppId_Share = @"1106970445";
  146 + manager.kQQShareAppSecret_Share = @"4hxuJ1HIes4i4hqT";
147 147
148 - manager.ShareSDKAppId_Share = @"26192e9007048";  
149 - manager.ShareSDKAppSecret_Share = @"f9d2fbf7f7827925c532a716340363c7"; 148 + manager.kShareSDKAppId_Share = @"26192e9007048";
  149 + manager.kShareSDKAppSecret_Share = @"f9d2fbf7f7827925c532a716340363c7";
150 150
151 - manager.WjjShare_Iden = @"group.com.cnlive.CNLiveNetAddInHouse.debug"; 151 + manager.kWjjShare_Iden = @"group.com.cnlive.CNLiveNetAddInHouse.debug";
152 152
153 - manager.WXAccount = @"wjj_app_test";  
154 - manager.SdkAppId = @"1400052101";  
155 - manager.SdkAccountType = @"27313"; 153 + manager.kWXAccount = @"wjj_app_test";
  154 + manager.kSdkAppId = @"1400052101";
  155 + manager.kSdkAccountType = @"27313";
156 156
157 - manager.NetAddTestUrlSchems = @"CNLiveNetAddTestUrlSchems";  
158 - manager.NetAddTestUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems"; 157 + manager.kNetAddTestUrlSchems = @"CNLiveNetAddTestUrlSchems";
  158 + manager.kNetAddTestUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems";
159 159
160 160
161 } 161 }
@@ -167,16 +167,16 @@ @@ -167,16 +167,16 @@
167 manager.isFormalEnvironment = YES; 167 manager.isFormalEnvironment = YES;
168 manager.isTestEnvironment = NO; 168 manager.isTestEnvironment = NO;
169 169
170 - manager.AppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";  
171 - manager.ShareDarenHomeUrl = @"http://apiwjj.cnlive.com/daren/download.html";  
172 - manager.WjjH5_Host = @"http://wjjh5.cnlive.com"; 170 + manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
  171 + manager.kShareDarenHomeUrl = @"http://apiwjj.cnlive.com/daren/download.html";
  172 + manager.kWjjH5_Host = @"http://wjjh5.cnlive.com";
173 173
174 - manager.API_Host = @"https://apiwjj.cnlive.com";  
175 - manager.API_Contact = @"https://wjjim.cnlive.com";  
176 - manager.API_Refund = @"https://wjj.ys1.cnliveimg.com";  
177 - manager.API_Report = @"https://mobile.cnlive.com";  
178 - manager.API_OpenApi2 = @"https://api.cnlive.com/open/api2";  
179 - manager.API_Classify = @"http://cms.cnlive.com:8768"; 174 + manager.kAPI_Host = @"https://apiwjj.cnlive.com";
  175 + manager.kAPI_Contact = @"https://wjjim.cnlive.com";
  176 + manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com";
  177 + manager.kAPI_Report = @"https://mobile.cnlive.com";
  178 + manager.kAPI_OpenApi2 = @"https://api.cnlive.com/open/api2";
  179 + manager.kAPI_Classify = @"http://cms.cnlive.com:8768";
180 180
181 manager.environmentDesc = @"正式企业版"; 181 manager.environmentDesc = @"正式企业版";
182 manager.bundleId = @"com.cnlive.CNLiveNetAddInHouse"; 182 manager.bundleId = @"com.cnlive.CNLiveNetAddInHouse";
@@ -187,34 +187,34 @@ @@ -187,34 +187,34 @@
187 187
188 manager.displayName = @"网家家正式企业"; 188 manager.displayName = @"网家家正式企业";
189 189
190 - manager.GDApiKey = @"84d765606a54635aec2648f663d4a5ed";  
191 - manager.TingYunAppKey = @"782d9a70547a4e3f91cb328b122bb85c"; 190 + manager.kGDApiKey = @"84d765606a54635aec2648f663d4a5ed";
  191 + manager.kTingYunAppKey = @"782d9a70547a4e3f91cb328b122bb85c";
192 192
193 - manager.BDAppId = @"14380872";  
194 - manager.BDAppKey = @"ibl8vbKkPVYBw5IOvR8tVGGo";  
195 - manager.BDSecret = @"QEd6n1qruIGG8AYkyLyqepksO2uUe0GK"; 193 + manager.kBDAppId = @"14380872";
  194 + manager.kBDAppKey = @"ibl8vbKkPVYBw5IOvR8tVGGo";
  195 + manager.kBDSecret = @"QEd6n1qruIGG8AYkyLyqepksO2uUe0GK";
196 196
197 - manager.BDMapAK = @"1249woAM397jz6uGFEfXY4MxRxfkGtIN";  
198 - manager.BDMapMCODE = @"com.cnlive.CNLiveNetAddInHouse";  
199 - manager.BDMapServiceID = 214690; 197 + manager.kBDMapAK = @"1249woAM397jz6uGFEfXY4MxRxfkGtIN";
  198 + manager.kBDMapMCODE = @"com.cnlive.CNLiveNetAddInHouse";
  199 + manager.kBDMapServiceID = 214690;
200 200
201 - manager.WeiChatAppId_Share = @"wxed528fc749b7ee88";  
202 - manager.WeiChatAppSecret_Share = @"729c3d3055fe336bcdef7020c2548e89"; 201 + manager.kWeiChatAppId_Share = @"wxed528fc749b7ee88";
  202 + manager.kWeiChatAppSecret_Share = @"729c3d3055fe336bcdef7020c2548e89";
203 203
204 - manager.QQShareAppId_Share = @"1106691520";  
205 - manager.QQShareAppSecret_Share = @"kLZ8CglGFjzrJFan"; 204 + manager.kQQShareAppId_Share = @"1106691520";
  205 + manager.kQQShareAppSecret_Share = @"kLZ8CglGFjzrJFan";
206 206
207 - manager.ShareSDKAppId_Share = @"24e4abeaa92d8";  
208 - manager.ShareSDKAppSecret_Share = @"da94a6f881d404092c9a7108e4470e8f"; 207 + manager.kShareSDKAppId_Share = @"24e4abeaa92d8";
  208 + manager.kShareSDKAppSecret_Share = @"da94a6f881d404092c9a7108e4470e8f";
209 209
210 - manager.WjjShare_Iden = @"group.com.cnlive.CNLiveNetAddInHouse"; 210 + manager.kWjjShare_Iden = @"group.com.cnlive.CNLiveNetAddInHouse";
211 211
212 - manager.WXAccount = @"wjj_app";  
213 - manager.SdkAppId = @"1400051680";  
214 - manager.SdkAccountType = @"19645"; 212 + manager.kWXAccount = @"wjj_app";
  213 + manager.kSdkAppId = @"1400051680";
  214 + manager.kSdkAccountType = @"19645";
215 215
216 - manager.NetAddTestUrlSchems = @"CNLiveNetAddUrlSchems";  
217 - manager.NetAddTestUnionPaySchems = @"CNLiveNetAddUnionPaySchems"; 216 + manager.kNetAddTestUrlSchems = @"CNLiveNetAddUrlSchems";
  217 + manager.kNetAddTestUnionPaySchems = @"CNLiveNetAddUnionPaySchems";
218 218
219 } 219 }
220 break; 220 break;
@@ -225,16 +225,16 @@ @@ -225,16 +225,16 @@
225 manager.isFormalEnvironment = NO; 225 manager.isFormalEnvironment = NO;
226 manager.isTestEnvironment = YES; 226 manager.isTestEnvironment = YES;
227 227
228 - manager.AppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";  
229 - manager.ShareDarenHomeUrl = @"http://apiwjj.cnlive.com/download/index.html";  
230 - manager.WjjH5_Host = @"http://wjjh5test.cnlive.com"; 228 + manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
  229 + manager.kShareDarenHomeUrl = @"http://apiwjj.cnlive.com/download/index.html";
  230 + manager.kWjjH5_Host = @"http://wjjh5test.cnlive.com";
231 231
232 - manager.API_Host = @"https://apiwjjtest.cnlive.com";  
233 - manager.API_Contact = @"https://imtest.cnlive.com";  
234 - manager.API_Refund = @"https://wjj.ys1.cnliveimg.com";  
235 - manager.API_Report = @"https://mobile.cnlive.com";  
236 - manager.API_OpenApi2 = @"https://api.cnlive.com/open/api2";  
237 - manager.API_Classify = @"http://cmstest.cnlive.com:8768"; 232 + manager.kAPI_Host = @"https://apiwjjtest.cnlive.com";
  233 + manager.kAPI_Contact = @"https://imtest.cnlive.com";
  234 + manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com";
  235 + manager.kAPI_Report = @"https://mobile.cnlive.com";
  236 + manager.kAPI_OpenApi2 = @"https://api.cnlive.com/open/api2";
  237 + manager.kAPI_Classify = @"http://cmstest.cnlive.com:8768";
238 238
239 manager.environmentDesc = @"测试商店版"; 239 manager.environmentDesc = @"测试商店版";
240 manager.bundleId = @"com.cnlive.CNLiveNetAdd.debug"; 240 manager.bundleId = @"com.cnlive.CNLiveNetAdd.debug";
@@ -245,34 +245,34 @@ @@ -245,34 +245,34 @@
245 245
246 manager.displayName = @"网家家测试商店"; 246 manager.displayName = @"网家家测试商店";
247 247
248 - manager.GDApiKey = @"4b15525f4265edfed8dce1d02f08a893";  
249 - manager.TingYunAppKey = @"3dda66ec904a4c3a8ad0169ca74de352"; 248 + manager.kGDApiKey = @"4b15525f4265edfed8dce1d02f08a893";
  249 + manager.kTingYunAppKey = @"3dda66ec904a4c3a8ad0169ca74de352";
250 250
251 - manager.BDAppId = @"14435697";  
252 - manager.BDAppKey = @"3LqIXy2AtXxrxyFM8N73QGYN";  
253 - manager.BDSecret = @"EKZxZza8purqGHOmngkMi7awtZkm0lOW"; 251 + manager.kBDAppId = @"14435697";
  252 + manager.kBDAppKey = @"3LqIXy2AtXxrxyFM8N73QGYN";
  253 + manager.kBDSecret = @"EKZxZza8purqGHOmngkMi7awtZkm0lOW";
254 254
255 - manager.BDMapAK = @"jjrZsIZYalD5IPOkjzCOOqkApKLtn8LW";  
256 - manager.BDMapMCODE = @"com.cnlive.CNLiveNetAdd.debug";  
257 - manager.BDMapServiceID = 213511; 255 + manager.kBDMapAK = @"jjrZsIZYalD5IPOkjzCOOqkApKLtn8LW";
  256 + manager.kBDMapMCODE = @"com.cnlive.CNLiveNetAdd.debug";
  257 + manager.kBDMapServiceID = 213511;
258 258
259 - manager.WeiChatAppId_Share = @"wx9b7f9443a8ccf15a";  
260 - manager.WeiChatAppSecret_Share = @"8d9970bf2901411d8dd2bffb344f147e"; 259 + manager.kWeiChatAppId_Share = @"wx9b7f9443a8ccf15a";
  260 + manager.kWeiChatAppSecret_Share = @"8d9970bf2901411d8dd2bffb344f147e";
261 261
262 - manager.QQShareAppId_Share = @"1106970445";  
263 - manager.QQShareAppSecret_Share = @"4hxuJ1HIes4i4hqT"; 262 + manager.kQQShareAppId_Share = @"1106970445";
  263 + manager.kQQShareAppSecret_Share = @"4hxuJ1HIes4i4hqT";
264 264
265 - manager.ShareSDKAppId_Share = @"26192e9007048";  
266 - manager.ShareSDKAppSecret_Share = @"f9d2fbf7f7827925c532a716340363c7"; 265 + manager.kShareSDKAppId_Share = @"26192e9007048";
  266 + manager.kShareSDKAppSecret_Share = @"f9d2fbf7f7827925c532a716340363c7";
267 267
268 - manager.WjjShare_Iden = @"group.com.cnlive.CNLiveNetAdd.debug"; 268 + manager.kWjjShare_Iden = @"group.com.cnlive.CNLiveNetAdd.debug";
269 269
270 - manager.WXAccount = @"wjj_app_test";  
271 - manager.SdkAppId = @"1400052101";  
272 - manager.SdkAccountType = @"27313"; 270 + manager.kWXAccount = @"wjj_app_test";
  271 + manager.kSdkAppId = @"1400052101";
  272 + manager.kSdkAccountType = @"27313";
273 273
274 - manager.NetAddTestUrlSchems = @"CNLiveNetAddTestUrlSchems";  
275 - manager.NetAddTestUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems"; 274 + manager.kNetAddTestUrlSchems = @"CNLiveNetAddTestUrlSchems";
  275 + manager.kNetAddTestUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems";
276 276
277 } 277 }
278 break; 278 break;
@@ -283,16 +283,16 @@ @@ -283,16 +283,16 @@
283 manager.isFormalEnvironment = YES; 283 manager.isFormalEnvironment = YES;
284 manager.isTestEnvironment = NO; 284 manager.isTestEnvironment = NO;
285 285
286 - manager.AppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";  
287 - manager.ShareDarenHomeUrl = @"http://apiwjj.cnlive.com/daren/download.html";  
288 - manager.WjjH5_Host = @"http://wjjh5.cnlive.com"; 286 + manager.kAppDownloadUrl = @"http://apiwjj.cnlive.com/download/index.html";
  287 + manager.kShareDarenHomeUrl = @"http://apiwjj.cnlive.com/daren/download.html";
  288 + manager.kWjjH5_Host = @"http://wjjh5.cnlive.com";
289 289
290 - manager.API_Host = @"https://apiwjj.cnlive.com";  
291 - manager.API_Contact = @"https://wjjim.cnlive.com";  
292 - manager.API_Refund = @"https://wjj.ys1.cnliveimg.com";  
293 - manager.API_Report = @"https://mobile.cnlive.com";  
294 - manager.API_OpenApi2 = @"https://api.cnlive.com/open/api2";  
295 - manager.API_Classify = @"http://cms.cnlive.com:8768"; 290 + manager.kAPI_Host = @"https://apiwjj.cnlive.com";
  291 + manager.kAPI_Contact = @"https://wjjim.cnlive.com";
  292 + manager.kAPI_Refund = @"https://wjj.ys1.cnliveimg.com";
  293 + manager.kAPI_Report = @"https://mobile.cnlive.com";
  294 + manager.kAPI_OpenApi2 = @"https://api.cnlive.com/open/api2";
  295 + manager.kAPI_Classify = @"http://cms.cnlive.com:8768";
296 296
297 manager.environmentDesc = @"正式商店版"; 297 manager.environmentDesc = @"正式商店版";
298 manager.bundleId = @"com.cnlive.CNLiveNetAdd"; 298 manager.bundleId = @"com.cnlive.CNLiveNetAdd";
@@ -303,34 +303,34 @@ @@ -303,34 +303,34 @@
303 303
304 manager.displayName = @"网家家"; 304 manager.displayName = @"网家家";
305 305
306 - manager.GDApiKey = @"5a0e2a559b987e67d5b0c13490adde02";  
307 - manager.TingYunAppKey = @"37c9ea3f439145269e5cffe095466b17"; 306 + manager.kGDApiKey = @"5a0e2a559b987e67d5b0c13490adde02";
  307 + manager.kTingYunAppKey = @"37c9ea3f439145269e5cffe095466b17";
308 308
309 - manager.BDAppId = @"14380860";  
310 - manager.BDAppKey = @"4bX1eK7SiCL461QBnRKilowc";  
311 - manager.BDSecret = @"BTzXLoPbUjlLeOM1nHnfOuTB9q18YZVq"; 309 + manager.kBDAppId = @"14380860";
  310 + manager.kBDAppKey = @"4bX1eK7SiCL461QBnRKilowc";
  311 + manager.kBDSecret = @"BTzXLoPbUjlLeOM1nHnfOuTB9q18YZVq";
312 312
313 - manager.BDMapAK = @"KbQoyL7KebOF1CvHWHqKa61pf8nMhUL4";  
314 - manager.BDMapMCODE = @"com.cnlive.CNLiveNetAdd";  
315 - manager.BDMapServiceID = 214690; 313 + manager.kBDMapAK = @"KbQoyL7KebOF1CvHWHqKa61pf8nMhUL4";
  314 + manager.kBDMapMCODE = @"com.cnlive.CNLiveNetAdd";
  315 + manager.kBDMapServiceID = 214690;
316 316
317 - manager.WeiChatAppId_Share = @"wxed528fc749b7ee88";  
318 - manager.WeiChatAppSecret_Share = @"729c3d3055fe336bcdef7020c2548e89"; 317 + manager.kWeiChatAppId_Share = @"wxed528fc749b7ee88";
  318 + manager.kWeiChatAppSecret_Share = @"729c3d3055fe336bcdef7020c2548e89";
319 319
320 - manager.QQShareAppId_Share = @"1106691520";  
321 - manager.QQShareAppSecret_Share = @"kLZ8CglGFjzrJFan"; 320 + manager.kQQShareAppId_Share = @"1106691520";
  321 + manager.kQQShareAppSecret_Share = @"kLZ8CglGFjzrJFan";
322 322
323 - manager.ShareSDKAppId_Share = @"24e4abeaa92d8";  
324 - manager.ShareSDKAppSecret_Share = @"da94a6f881d404092c9a7108e4470e8f"; 323 + manager.kShareSDKAppId_Share = @"24e4abeaa92d8";
  324 + manager.kShareSDKAppSecret_Share = @"da94a6f881d404092c9a7108e4470e8f";
325 325
326 - manager.WjjShare_Iden = @"group.com.cnlive.CNLiveNetAdd"; 326 + manager.kWjjShare_Iden = @"group.com.cnlive.CNLiveNetAdd";
327 327
328 - manager.WXAccount = @"wjj_app";  
329 - manager.SdkAppId = @"1400051680";  
330 - manager.SdkAccountType = @"19645"; 328 + manager.kWXAccount = @"wjj_app";
  329 + manager.kSdkAppId = @"1400051680";
  330 + manager.kSdkAccountType = @"19645";
331 331
332 - manager.NetAddTestUrlSchems = @"CNLiveNetAddUrlSchems";  
333 - manager.NetAddTestUnionPaySchems = @"CNLiveNetAddUnionPaySchems"; 332 + manager.kNetAddTestUrlSchems = @"CNLiveNetAddUrlSchems";
  333 + manager.kNetAddTestUnionPaySchems = @"CNLiveNetAddUnionPaySchems";
334 334
335 } 335 }
336 break; 336 break;
Example/CNLiveEnvironment/XWAppDelegate.m
  View file @39840d5
@@ -17,15 +17,18 @@ @@ -17,15 +17,18 @@
17 // Override point for customization after application launch. 17 // Override point for customization after application launch.
18 [CNLiveEnvironmentManager setEnvironment:CNLiveEnvironmentDebugInHouse]; 18 [CNLiveEnvironmentManager setEnvironment:CNLiveEnvironmentDebugInHouse];
19 NSLog(@"%@",EnvironmentDesc); 19 NSLog(@"%@",EnvironmentDesc);
20 - NSLog(@"%@",kShareSDKAppId_Share); 20 + NSLog(@"%@",ShareSDKAppId_Share);
21 NSLog(@"%d",TestEnvironment); 21 NSLog(@"%d",TestEnvironment);
22 - NSLog(@"%@",kAPI_Host(@"asd")); 22 + NSLog(@"%@",API_Host(@"asd"));
  23 + NSLog(@"%@",AppId);
  24 + NSLog(@"%@",AppKey);
  25 + NSLog(@"%@",AppSecret);
23 26
24 [CNLiveEnvironmentManager setEnvironment:CNLiveEnvironmentProductionAppStore]; 27 [CNLiveEnvironmentManager setEnvironment:CNLiveEnvironmentProductionAppStore];
25 NSLog(@"%@",EnvironmentDesc); 28 NSLog(@"%@",EnvironmentDesc);
26 - NSLog(@"%@",kShareSDKAppId_Share); 29 + NSLog(@"%@",ShareSDKAppId_Share);
27 NSLog(@"%d",TestEnvironment); 30 NSLog(@"%d",TestEnvironment);
28 - NSLog(@"%@",kAPI_Host(@"asd")); 31 + NSLog(@"%@",API_Host(@"asd"));
29 32
30 return YES; 33 return YES;
31 } 34 }