iOS Team / CNLiveEnvironment · Commits

Commit 8af9039aeb3a4e10ad033d54c3d87530c4ed152d

Authored by zhangxiaowen
1 parent 3a28bdd8

no message

Inline Side-by-side
Showing 6 changed files with 34 additions and 16 deletions
CNLiveEnvironment.podspec
  View file @8af9039
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveEnvironment' 10 s.name = 'CNLiveEnvironment'
11 - s.version = '0.0.4' 11 + s.version = '0.0.5'
12 s.summary = '网家家环境.' 12 s.summary = '网家家环境.'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveEnvironment/Classes/CNLiveEnvironment.h
  View file @8af9039
@@ -95,6 +95,9 @@ @@ -95,6 +95,9 @@
95 #define SdkAppId [CNLiveEnvironmentManager manager].kSdkAppId 95 #define SdkAppId [CNLiveEnvironmentManager manager].kSdkAppId
96 #define SdkAccountType [CNLiveEnvironmentManager manager].kSdkAccountType 96 #define SdkAccountType [CNLiveEnvironmentManager manager].kSdkAccountType
97 97
  98 +// 友盟AppKey
  99 +#define UMengAppKey [CNLiveEnvironmentManager manager].kUMengAppKey
  100 +
98 // 支付宝支付Schems 101 // 支付宝支付Schems
99 #define CNLiveNetAddUrlSchems [CNLiveEnvironmentManager manager].kNetAddUrlSchems 102 #define CNLiveNetAddUrlSchems [CNLiveEnvironmentManager manager].kNetAddUrlSchems
100 103
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.h
  View file @8af9039
@@ -88,6 +88,9 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) { @@ -88,6 +88,9 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) {
88 @property (nonatomic, copy, readonly) NSString *kSdkAppId; 88 @property (nonatomic, copy, readonly) NSString *kSdkAppId;
89 @property (nonatomic, copy, readonly) NSString *kSdkAccountType; 89 @property (nonatomic, copy, readonly) NSString *kSdkAccountType;
90 90
  91 +// 友盟AppKey
  92 +@property (nonatomic, copy, readonly) NSString *kUMengAppKey;
  93 +
91 // 支付宝支付Schems 94 // 支付宝支付Schems
92 @property (nonatomic, copy, readonly) NSString *kNetAddUrlSchems; 95 @property (nonatomic, copy, readonly) NSString *kNetAddUrlSchems;
93 96
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.m
  View file @8af9039
@@ -74,6 +74,9 @@ @@ -74,6 +74,9 @@
74 @property (nonatomic, copy, readwrite) NSString *kSdkAppId; 74 @property (nonatomic, copy, readwrite) NSString *kSdkAppId;
75 @property (nonatomic, copy, readwrite) NSString *kSdkAccountType; 75 @property (nonatomic, copy, readwrite) NSString *kSdkAccountType;
76 76
  77 +// 友盟AppKey
  78 +@property (nonatomic, copy, readwrite) NSString *kUMengAppKey;
  79 +
77 // 支付宝支付Schems 80 // 支付宝支付Schems
78 @property (nonatomic, copy, readwrite) NSString *kNetAddUrlSchems; 81 @property (nonatomic, copy, readwrite) NSString *kNetAddUrlSchems;
79 82
@@ -207,6 +210,8 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -207,6 +210,8 @@ static CNLiveEnvironmentManager *_instance = nil;
207 manager.kWXAccount = @"wjj_app_test"; 210 manager.kWXAccount = @"wjj_app_test";
208 manager.kSdkAppId = @"1400052101"; 211 manager.kSdkAppId = @"1400052101";
209 manager.kSdkAccountType = @"27313"; 212 manager.kSdkAccountType = @"27313";
  213 +
  214 + manager.kUMengAppKey = @"5d78575f0cafb255e0000672";
210 215
211 manager.kNetAddUrlSchems = @"CNLiveNetAddTestUrlSchems"; 216 manager.kNetAddUrlSchems = @"CNLiveNetAddTestUrlSchems";
212 manager.kNetAddUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems"; 217 manager.kNetAddUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems";
@@ -280,6 +285,8 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -280,6 +285,8 @@ static CNLiveEnvironmentManager *_instance = nil;
280 manager.kSdkAppId = @"1400051680"; 285 manager.kSdkAppId = @"1400051680";
281 manager.kSdkAccountType = @"19645"; 286 manager.kSdkAccountType = @"19645";
282 287
  288 + manager.kUMengAppKey = @"5d7856830cafb270770000b2";
  289 +
283 manager.kNetAddUrlSchems = @"CNLiveNetAddUrlSchems"; 290 manager.kNetAddUrlSchems = @"CNLiveNetAddUrlSchems";
284 manager.kNetAddUnionPaySchems = @"CNLiveNetAddUnionPaySchems"; 291 manager.kNetAddUnionPaySchems = @"CNLiveNetAddUnionPaySchems";
285 292
@@ -352,6 +359,8 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -352,6 +359,8 @@ static CNLiveEnvironmentManager *_instance = nil;
352 manager.kSdkAppId = @"1400052101"; 359 manager.kSdkAppId = @"1400052101";
353 manager.kSdkAccountType = @"27313"; 360 manager.kSdkAccountType = @"27313";
354 361
  362 + manager.kUMengAppKey = @"5d78575f0cafb255e0000672";
  363 +
355 manager.kNetAddUrlSchems = @"CNLiveNetAddTestUrlSchems"; 364 manager.kNetAddUrlSchems = @"CNLiveNetAddTestUrlSchems";
356 manager.kNetAddUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems"; 365 manager.kNetAddUnionPaySchems = @"CNLiveNetAddTestUnionPaySchems";
357 366
@@ -423,6 +432,8 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -423,6 +432,8 @@ static CNLiveEnvironmentManager *_instance = nil;
423 manager.kSdkAppId = @"1400051680"; 432 manager.kSdkAppId = @"1400051680";
424 manager.kSdkAccountType = @"19645"; 433 manager.kSdkAccountType = @"19645";
425 434
  435 + manager.kUMengAppKey = @"5d7856830cafb270770000b2";
  436 +
426 manager.kNetAddUrlSchems = @"CNLiveNetAddUrlSchems"; 437 manager.kNetAddUrlSchems = @"CNLiveNetAddUrlSchems";
427 manager.kNetAddUnionPaySchems = @"CNLiveNetAddUnionPaySchems"; 438 manager.kNetAddUnionPaySchems = @"CNLiveNetAddUnionPaySchems";
428 439
Example/CNLiveEnvironment/XWAppDelegate.m
  View file @8af9039
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
22 22
23 NSLog(@"%@",EnvironmentDesc); 23 NSLog(@"%@",EnvironmentDesc);
24 NSLog(@"%d",TestEnvironment); 24 NSLog(@"%d",TestEnvironment);
  25 + NSLog(@"%@",UMengAppKey);
25 26
26 27
27 return YES; 28 return YES;
Example/CNLiveEnvironment/XWViewController.m
  View file @8af9039
@@ -19,21 +19,21 @@ @@ -19,21 +19,21 @@
19 { 19 {
20 [super viewDidLoad]; 20 [super viewDidLoad];
21 // Do any additional setup after loading the view, typically from a nib. 21 // Do any additional setup after loading the view, typically from a nib.
22 - NSLog(@"%@",EnvironmentDesc);  
23 - NSLog(@"%d",TestEnvironment);  
24 -  
25 -// [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];  
26 - NSLog(@"%@",EnvironmentDesc);  
27 - NSLog(@"%d",TestEnvironment);  
28 -  
29 - NSLog(@"%@",CNCategoryGetChannelUrl);  
30 -  
31 - NSLog(@"%@",CNPayAudioAuthUrl);  
32 -  
33 - NSLog(@"测试");  
34 - NSLog(@"id%@",WeiBoShareAppId_Share);  
35 - NSLog(@"key%@",WeiBoShareAppKey_Share);  
36 - NSLog(@"secret%@",WeiBoShareAppSecret_Share); 22 +// NSLog(@"%@",EnvironmentDesc);
  23 +// NSLog(@"%d",TestEnvironment);
  24 +//
  25 +//// [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
  26 +// NSLog(@"%@",EnvironmentDesc);
  27 +// NSLog(@"%d",TestEnvironment);
  28 +//
  29 +// NSLog(@"%@",CNCategoryGetChannelUrl);
  30 +//
  31 +// NSLog(@"%@",CNPayAudioAuthUrl);
  32 +//
  33 +// NSLog(@"测试");
  34 +// NSLog(@"id%@",WeiBoShareAppId_Share);
  35 +// NSLog(@"key%@",WeiBoShareAppKey_Share);
  36 +// NSLog(@"secret%@",WeiBoShareAppSecret_Share);
37 } 37 }
38 38
39 - (void)didReceiveMemoryWarning 39 - (void)didReceiveMemoryWarning