iOS Team / CNLiveEnvironment · Commits

Commit 91e287c912d52d4f0f9a593c2b51148ea3775965

Authored by zhangxiaowen
1 parent c312392c

no message

Inline Side-by-side
Showing 4 changed files with 51 additions and 51 deletions
CNLiveEnvironment/Classes/CNLiveEnvironment.h
  View file @91e287c
... ... @@ -20,16 +20,16 @@
20 20 #define TestEnvironment [CNLiveEnvironmentManager manager].isTestEnvironment
21 21  
22 22 // Url域名
23   -#define AppDownloadUrl [CNLiveEnvironmentManager manager].AppDownloadUrl
24   -#define ShareDarenHomeUrl [CNLiveEnvironmentManager manager].ShareDarenHomeUrl
  23 +#define kAppDownloadUrl [CNLiveEnvironmentManager manager].AppDownloadUrl
  24 +#define kShareDarenHomeUrl [CNLiveEnvironmentManager manager].ShareDarenHomeUrl
25 25  
26   -#define WjjH5_Host(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].WjjH5_Host,url]
27   -#define API_Host(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].API_Host,url]
28   -#define API_Contact(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].API_Contact,url]
29   -#define API_Refund(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].API_Refund,url]
30   -#define API_Report(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].API_Report,url]
31   -#define API_OpenApi2(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].API_OpenApi2,url]
32   -#define API_Classify(url) [NSString stringWithFormat:@"%@/%@",[CNLiveEnvironmentManager manager].API_Classify,url]
  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]
33 33  
34 34 // BundleId
35 35 #define BundleId [CNLiveEnvironmentManager manager].bundleId
... ... @@ -45,46 +45,46 @@
45 45 #define DisplayName [CNLiveEnvironmentManager manager].displayName
46 46  
47 47 // 高德地图Key
48   -#define GDApiKey [CNLiveEnvironmentManager manager].GDApiKey
  48 +#define kGDApiKey [CNLiveEnvironmentManager manager].GDApiKey
49 49  
50 50 // 百度身份证识别
51   -#define BDAppId [CNLiveEnvironmentManager manager].BDAppId
52   -#define BDAppKey [CNLiveEnvironmentManager manager].BDAppKey
53   -#define BDSecret [CNLiveEnvironmentManager manager].BDSecret
  51 +#define kBDAppId [CNLiveEnvironmentManager manager].BDAppId
  52 +#define kBDAppKey [CNLiveEnvironmentManager manager].BDAppKey
  53 +#define kBDSecret [CNLiveEnvironmentManager manager].BDSecret
54 54  
55 55 // 百度地图
56   -#define BDMapAK [CNLiveEnvironmentManager manager].BDMapAK
57   -#define BDMapMCODE [CNLiveEnvironmentManager manager].BDMapMCODE
58   -#define BDMapServiceID [CNLiveEnvironmentManager manager].BDMapServiceID
  56 +#define kBDMapAK [CNLiveEnvironmentManager manager].BDMapAK
  57 +#define kBDMapMCODE [CNLiveEnvironmentManager manager].BDMapMCODE
  58 +#define kBDMapServiceID [CNLiveEnvironmentManager manager].BDMapServiceID
59 59  
60 60 // tingyun
61   -#define TingYunAppKey [CNLiveEnvironmentManager manager].TingYunAppKey
  61 +#define kTingYunAppKey [CNLiveEnvironmentManager manager].TingYunAppKey
62 62  
63 63 /*微信相关参数*/
64   -#define WeiChatAppId_Share [CNLiveEnvironmentManager manager].WeiChatAppId_Share
65   -#define WeiChatAppSecret_Share [CNLiveEnvironmentManager manager].WeiChatAppSecret_Share
  64 +#define kWeiChatAppId_Share [CNLiveEnvironmentManager manager].WeiChatAppId_Share
  65 +#define kWeiChatAppSecret_Share [CNLiveEnvironmentManager manager].WeiChatAppSecret_Share
66 66  
67 67 /*腾讯相关参数*/
68   -#define QQShareAppId_Share [CNLiveEnvironmentManager manager].QQShareAppId_Share
69   -#define QQShareAppSecret_Share [CNLiveEnvironmentManager manager].QQShareAppSecret_Share
  68 +#define kQQShareAppId_Share [CNLiveEnvironmentManager manager].QQShareAppId_Share
  69 +#define kQQShareAppSecret_Share [CNLiveEnvironmentManager manager].QQShareAppSecret_Share
70 70  
71 71 /*shareSDK相关参数*/
72   -#define ShareSDKAppId_Share [CNLiveEnvironmentManager manager].ShareSDKAppId_Share
73   -#define ShareSDKAppSecret_Share [CNLiveEnvironmentManager manager].ShareSDKAppSecret_Share
  72 +#define kShareSDKAppId_Share [CNLiveEnvironmentManager manager].ShareSDKAppId_Share
  73 +#define kShareSDKAppSecret_Share [CNLiveEnvironmentManager manager].ShareSDKAppSecret_Share
74 74  
75   -#define WjjShare_Iden [CNLiveEnvironmentManager manager].WjjShare_Iden
  75 +#define kWjjShare_Iden [CNLiveEnvironmentManager manager].WjjShare_Iden
76 76  
77 77 // 正式环境平台配置
78 78 // IMSDK相关的配置
79   -#define kWXAccount [CNLiveEnvironmentManager manager].kWXAccount
80   -#define kSdkAppId [CNLiveEnvironmentManager manager].kSdkAppId
81   -#define kSdkAccountType [CNLiveEnvironmentManager manager].kSdkAccountType
  79 +#define kWXAccount [CNLiveEnvironmentManager manager].WXAccount
  80 +#define kSdkAppId [CNLiveEnvironmentManager manager].SdkAppId
  81 +#define kSdkAccountType [CNLiveEnvironmentManager manager].SdkAccountType
82 82  
83 83 // 支付宝支付Schems
84   -#define NetAddTestUrlSchems [CNLiveEnvironmentManager manager].NetAddTestUrlSchems
  84 +#define kNetAddTestUrlSchems [CNLiveEnvironmentManager manager].NetAddTestUrlSchems
85 85  
86 86 // 银联支付Schems
87   -#define NetAddTestUnionPaySchems [CNLiveEnvironmentManager manager].NetAddTestUnionPaySchems
  87 +#define kNetAddTestUnionPaySchems [CNLiveEnvironmentManager manager].NetAddTestUnionPaySchems
88 88  
89 89  
90 90 #endif /* CNLiveEnvironment_h */
... ...
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.h
  View file @91e287c
... ... @@ -73,9 +73,9 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) {
73 73  
74 74 // 正式环境平台配置
75 75 // IMSDK相关的配置
76   -@property (nonatomic, copy, readonly) NSString *kWXAccount;
77   -@property (nonatomic, copy, readonly) NSString *kSdkAppId;
78   -@property (nonatomic, copy, readonly) NSString *kSdkAccountType;
  76 +@property (nonatomic, copy, readonly) NSString *WXAccount;
  77 +@property (nonatomic, copy, readonly) NSString *SdkAppId;
  78 +@property (nonatomic, copy, readonly) NSString *SdkAccountType;
79 79  
80 80 // 支付宝支付Schems
81 81 @property (nonatomic, copy, readonly) NSString *NetAddTestUrlSchems;
... ...
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.m
  View file @91e287c
... ... @@ -58,9 +58,9 @@
58 58  
59 59 @property (nonatomic, copy, readwrite) NSString *WjjShare_Iden;
60 60  
61   -@property (nonatomic, copy, readwrite) NSString *kWXAccount;
62   -@property (nonatomic, copy, readwrite) NSString *kSdkAppId;
63   -@property (nonatomic, copy, readwrite) NSString *kSdkAccountType;
  61 +@property (nonatomic, copy, readwrite) NSString *WXAccount;
  62 +@property (nonatomic, copy, readwrite) NSString *SdkAppId;
  63 +@property (nonatomic, copy, readwrite) NSString *SdkAccountType;
64 64  
65 65 // 支付宝支付Schems
66 66 @property (nonatomic, copy, readwrite) NSString *NetAddTestUrlSchems;
... ... @@ -150,9 +150,9 @@
150 150  
151 151 manager.WjjShare_Iden = @"group.com.cnlive.CNLiveNetAddInHouse.debug";
152 152  
153   - manager.kWXAccount = @"wjj_app_test";
154   - manager.kSdkAppId = @"1400052101";
155   - manager.kSdkAccountType = @"27313";
  153 + manager.WXAccount = @"wjj_app_test";
  154 + manager.SdkAppId = @"1400052101";
  155 + manager.SdkAccountType = @"27313";
156 156  
157 157 manager.NetAddTestUrlSchems = @"CNLiveNetAddTestUrlSchems";
158 158 manager.NetAddTestUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems";
... ... @@ -209,9 +209,9 @@
209 209  
210 210 manager.WjjShare_Iden = @"group.com.cnlive.CNLiveNetAddInHouse";
211 211  
212   - manager.kWXAccount = @"wjj_app";
213   - manager.kSdkAppId = @"1400051680";
214   - manager.kSdkAccountType = @"19645";
  212 + manager.WXAccount = @"wjj_app";
  213 + manager.SdkAppId = @"1400051680";
  214 + manager.SdkAccountType = @"19645";
215 215  
216 216 manager.NetAddTestUrlSchems = @"CNLiveNetAddUrlSchems";
217 217 manager.NetAddTestUnionPaySchems = @"CNLiveNetAddUnionPaySchems";
... ... @@ -267,9 +267,9 @@
267 267  
268 268 manager.WjjShare_Iden = @"group.com.cnlive.CNLiveNetAdd.debug";
269 269  
270   - manager.kWXAccount = @"wjj_app_test";
271   - manager.kSdkAppId = @"1400052101";
272   - manager.kSdkAccountType = @"27313";
  270 + manager.WXAccount = @"wjj_app_test";
  271 + manager.SdkAppId = @"1400052101";
  272 + manager.SdkAccountType = @"27313";
273 273  
274 274 manager.NetAddTestUrlSchems = @"CNLiveNetAddTestUrlSchems";
275 275 manager.NetAddTestUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems";
... ... @@ -325,9 +325,9 @@
325 325  
326 326 manager.WjjShare_Iden = @"group.com.cnlive.CNLiveNetAdd";
327 327  
328   - manager.kWXAccount = @"wjj_app";
329   - manager.kSdkAppId = @"1400051680";
330   - manager.kSdkAccountType = @"19645";
  328 + manager.WXAccount = @"wjj_app";
  329 + manager.SdkAppId = @"1400051680";
  330 + manager.SdkAccountType = @"19645";
331 331  
332 332 manager.NetAddTestUrlSchems = @"CNLiveNetAddUrlSchems";
333 333 manager.NetAddTestUnionPaySchems = @"CNLiveNetAddUnionPaySchems";
... ...
Example/CNLiveEnvironment/XWAppDelegate.m
  View file @91e287c
... ... @@ -17,15 +17,15 @@
17 17 // Override point for customization after application launch.
18 18 [CNLiveEnvironmentManager setEnvironment:CNLiveEnvironmentDebugInHouse];
19 19 NSLog(@"%@",EnvironmentDesc);
20   - NSLog(@"%@",ShareSDKAppId_Share);
  20 + NSLog(@"%@",kShareSDKAppId_Share);
21 21 NSLog(@"%d",TestEnvironment);
22   - NSLog(@"%@",API_Host(@"asd"));
  22 + NSLog(@"%@",kAPI_Host(@"asd"));
23 23  
24 24 [CNLiveEnvironmentManager setEnvironment:CNLiveEnvironmentProductionAppStore];
25 25 NSLog(@"%@",EnvironmentDesc);
26   - NSLog(@"%@",ShareSDKAppId_Share);
  26 + NSLog(@"%@",kShareSDKAppId_Share);
27 27 NSLog(@"%d",TestEnvironment);
28   - NSLog(@"%@",API_Host(@"asd"));
  28 + NSLog(@"%@",kAPI_Host(@"asd"));
29 29  
30 30 return YES;
31 31 }
... ...