iOS Team / CNLiveEnvironment · Commits

Commit 4d10e65950cd4cddb936ca16712d5a8616cf1607

Authored by zhangxiaowen
1 parent 2eb32993

no message

Inline Side-by-side
Showing 4 changed files with 16 additions and 15 deletions
CNLiveEnvironment/Classes/CNLiveEnvironment.h
  View file @4d10e65
@@ -94,9 +94,9 @@ @@ -94,9 +94,9 @@
94 #define SdkAccountType [CNLiveEnvironmentManager manager].kSdkAccountType 94 #define SdkAccountType [CNLiveEnvironmentManager manager].kSdkAccountType
95 95
96 // 支付宝支付Schems 96 // 支付宝支付Schems
97 -#define NetAddTestUrlSchems [CNLiveEnvironmentManager manager].kNetAddTestUrlSchems 97 +#define NetAddUrlSchems [CNLiveEnvironmentManager manager].kNetAddUrlSchems
98 98
99 // 银联支付Schems 99 // 银联支付Schems
100 -#define NetAddTestUnionPaySchems [CNLiveEnvironmentManager manager].kNetAddTestUnionPaySchems 100 +#define NetAddUnionPaySchems [CNLiveEnvironmentManager manager].kNetAddUnionPaySchems
101 101
102 #endif /* CNLiveEnvironment_h */ 102 #endif /* CNLiveEnvironment_h */
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.h
  View file @4d10e65
@@ -84,10 +84,10 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) { @@ -84,10 +84,10 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) {
84 @property (nonatomic, copy, readonly) NSString *kSdkAccountType; 84 @property (nonatomic, copy, readonly) NSString *kSdkAccountType;
85 85
86 // 支付宝支付Schems 86 // 支付宝支付Schems
87 -@property (nonatomic, copy, readonly) NSString *kNetAddTestUrlSchems; 87 +@property (nonatomic, copy, readonly) NSString *kNetAddUrlSchems;
88 88
89 // 银联支付Schems 89 // 银联支付Schems
90 -@property (nonatomic, copy, readonly) NSString *kNetAddTestUnionPaySchems; 90 +@property (nonatomic, copy, readonly) NSString *kNetAddUnionPaySchems;
91 91
92 /** 92 /**
93 * @abstract 单例初始化 93 * @abstract 单例初始化
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.m
  View file @4d10e65
@@ -70,10 +70,10 @@ @@ -70,10 +70,10 @@
70 @property (nonatomic, copy, readwrite) NSString *kSdkAccountType; 70 @property (nonatomic, copy, readwrite) NSString *kSdkAccountType;
71 71
72 // 支付宝支付Schems 72 // 支付宝支付Schems
73 -@property (nonatomic, copy, readwrite) NSString *kNetAddTestUrlSchems; 73 +@property (nonatomic, copy, readwrite) NSString *kNetAddUrlSchems;
74 74
75 // 银联支付Schems 75 // 银联支付Schems
76 -@property (nonatomic, copy, readwrite) NSString *kNetAddTestUnionPaySchems; 76 +@property (nonatomic, copy, readwrite) NSString *kNetAddUnionPaySchems;
77 77
78 @end 78 @end
79 79
@@ -199,8 +199,8 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -199,8 +199,8 @@ static CNLiveEnvironmentManager *_instance = nil;
199 manager.kSdkAppId = @"1400052101"; 199 manager.kSdkAppId = @"1400052101";
200 manager.kSdkAccountType = @"27313"; 200 manager.kSdkAccountType = @"27313";
201 201
202 - manager.kNetAddTestUrlSchems = @"CNLiveNetAddTestUrlSchems";  
203 - manager.kNetAddTestUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems"; 202 + manager.kNetAddUrlSchems = @"CNLiveNetAddTestUrlSchems";
  203 + manager.kNetAddUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems";
204 204
205 } 205 }
206 break; 206 break;
@@ -267,8 +267,8 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -267,8 +267,8 @@ static CNLiveEnvironmentManager *_instance = nil;
267 manager.kSdkAppId = @"1400051680"; 267 manager.kSdkAppId = @"1400051680";
268 manager.kSdkAccountType = @"19645"; 268 manager.kSdkAccountType = @"19645";
269 269
270 - manager.kNetAddTestUrlSchems = @"CNLiveNetAddUrlSchems";  
271 - manager.kNetAddTestUnionPaySchems = @"CNLiveNetAddUnionPaySchems"; 270 + manager.kNetAddUrlSchems = @"CNLiveNetAddUrlSchems";
  271 + manager.kNetAddUnionPaySchems = @"CNLiveNetAddUnionPaySchems";
272 272
273 } 273 }
274 break; 274 break;
@@ -335,8 +335,8 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -335,8 +335,8 @@ static CNLiveEnvironmentManager *_instance = nil;
335 manager.kSdkAppId = @"1400052101"; 335 manager.kSdkAppId = @"1400052101";
336 manager.kSdkAccountType = @"27313"; 336 manager.kSdkAccountType = @"27313";
337 337
338 - manager.kNetAddTestUrlSchems = @"CNLiveNetAddTestUrlSchems";  
339 - manager.kNetAddTestUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems"; 338 + manager.kNetAddUrlSchems = @"CNLiveNetAddTestUrlSchems";
  339 + manager.kNetAddUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems";
340 340
341 } 341 }
342 break; 342 break;
@@ -402,8 +402,8 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -402,8 +402,8 @@ static CNLiveEnvironmentManager *_instance = nil;
402 manager.kSdkAppId = @"1400051680"; 402 manager.kSdkAppId = @"1400051680";
403 manager.kSdkAccountType = @"19645"; 403 manager.kSdkAccountType = @"19645";
404 404
405 - manager.kNetAddTestUrlSchems = @"CNLiveNetAddUrlSchems";  
406 - manager.kNetAddTestUnionPaySchems = @"CNLiveNetAddUnionPaySchems"; 405 + manager.kNetAddUrlSchems = @"CNLiveNetAddUrlSchems";
  406 + manager.kNetAddUnionPaySchems = @"CNLiveNetAddUnionPaySchems";
407 407
408 } 408 }
409 break; 409 break;
Example/CNLiveEnvironment/XWAppDelegate.m
  View file @4d10e65
@@ -16,7 +16,8 @@ @@ -16,7 +16,8 @@
16 16
17 NSLog(@"%@",EnvironmentDesc); 17 NSLog(@"%@",EnvironmentDesc);
18 NSLog(@"%d",TestEnvironment); 18 NSLog(@"%d",TestEnvironment);
19 - 19 + NSLog(@"%@",CNCategoryGetChannelUrl);
  20 +
20 [CNLiveEnvironmentManager setEnvironment:CNLiveProductionInHouse]; 21 [CNLiveEnvironmentManager setEnvironment:CNLiveProductionInHouse];
21 22
22 NSLog(@"%@",EnvironmentDesc); 23 NSLog(@"%@",EnvironmentDesc);