iOS Team / CNLiveEnvironment · Commits

Commit 500d6d270c32af35c98620bb7d68f39153eba32b

Authored by zhangxiaowen
1 parent 179e9509

no message

Inline Side-by-side
Showing 5 changed files with 38 additions and 3 deletions
CNLiveEnvironment/Classes/CNLiveEnvironment.h
  View file @500d6d2
@@ -79,6 +79,11 @@ @@ -79,6 +79,11 @@
79 #define QQShareAppId_Share [CNLiveEnvironmentManager manager].kQQShareAppId_Share 79 #define QQShareAppId_Share [CNLiveEnvironmentManager manager].kQQShareAppId_Share
80 #define QQShareAppSecret_Share [CNLiveEnvironmentManager manager].kQQShareAppSecret_Share 80 #define QQShareAppSecret_Share [CNLiveEnvironmentManager manager].kQQShareAppSecret_Share
81 81
  82 +/*新浪相关参数*/
  83 +#define WeiBoShareAppId_Share [CNLiveEnvironmentManager manager].kWeiBoShareAppId_Share
  84 +#define WeiBoShareAppSecret_Share [CNLiveEnvironmentManager manager].kWeiBoShareAppSecret_Share
  85 +#define WeiBoShareAppKey_Share [CNLiveEnvironmentManager manager].kWeiBoShareAppKey_Share
  86 +
82 /*ShareSDK相关参数*/ 87 /*ShareSDK相关参数*/
83 #define ShareSDKAppId_Share [CNLiveEnvironmentManager manager].kShareSDKAppId_Share 88 #define ShareSDKAppId_Share [CNLiveEnvironmentManager manager].kShareSDKAppId_Share
84 #define ShareSDKAppSecret_Share [CNLiveEnvironmentManager manager].kShareSDKAppSecret_Share 89 #define ShareSDKAppSecret_Share [CNLiveEnvironmentManager manager].kShareSDKAppSecret_Share
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.h
  View file @500d6d2
@@ -71,6 +71,11 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) { @@ -71,6 +71,11 @@ typedef NS_ENUM(NSInteger, CNLiveEnvironmentType) {
71 @property (nonatomic, copy, readonly) NSString *kQQShareAppId_Share; 71 @property (nonatomic, copy, readonly) NSString *kQQShareAppId_Share;
72 @property (nonatomic, copy, readonly) NSString *kQQShareAppSecret_Share; 72 @property (nonatomic, copy, readonly) NSString *kQQShareAppSecret_Share;
73 73
  74 +/*新浪相关参数*/
  75 +@property (nonatomic, copy, readonly) NSString *kWeiBoShareAppId_Share;
  76 +@property (nonatomic, copy, readonly) NSString *kWeiBoShareAppSecret_Share;
  77 +@property (nonatomic, copy, readonly) NSString *kWeiBoShareAppKey_Share;
  78 +
74 /*ShareSDK相关参数*/ 79 /*ShareSDK相关参数*/
75 @property (nonatomic, copy, readonly) NSString *kShareSDKAppId_Share; 80 @property (nonatomic, copy, readonly) NSString *kShareSDKAppId_Share;
76 @property (nonatomic, copy, readonly) NSString *kShareSDKAppSecret_Share; 81 @property (nonatomic, copy, readonly) NSString *kShareSDKAppSecret_Share;
CNLiveEnvironment/Classes/CNLiveEnvironmentManager.m
  View file @500d6d2
@@ -59,6 +59,11 @@ @@ -59,6 +59,11 @@
59 @property (nonatomic, copy, readwrite) NSString *kQQShareAppId_Share; 59 @property (nonatomic, copy, readwrite) NSString *kQQShareAppId_Share;
60 @property (nonatomic, copy, readwrite) NSString *kQQShareAppSecret_Share; 60 @property (nonatomic, copy, readwrite) NSString *kQQShareAppSecret_Share;
61 61
  62 +/*新浪相关参数*/
  63 +@property (nonatomic, copy, readwrite) NSString *kWeiBoShareAppId_Share;
  64 +@property (nonatomic, copy, readwrite) NSString *kWeiBoShareAppSecret_Share;
  65 +@property (nonatomic, copy, readwrite) NSString *kWeiBoShareAppKey_Share;
  66 +
62 /*ShareSDK相关参数*/ 67 /*ShareSDK相关参数*/
63 @property (nonatomic, copy, readwrite) NSString *kShareSDKAppId_Share; 68 @property (nonatomic, copy, readwrite) NSString *kShareSDKAppId_Share;
64 @property (nonatomic, copy, readwrite) NSString *kShareSDKAppSecret_Share; 69 @property (nonatomic, copy, readwrite) NSString *kShareSDKAppSecret_Share;
@@ -189,7 +194,11 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -189,7 +194,11 @@ static CNLiveEnvironmentManager *_instance = nil;
189 194
190 manager.kQQShareAppId_Share = @"1106970445"; 195 manager.kQQShareAppId_Share = @"1106970445";
191 manager.kQQShareAppSecret_Share = @"4hxuJ1HIes4i4hqT"; 196 manager.kQQShareAppSecret_Share = @"4hxuJ1HIes4i4hqT";
192 - 197 +
  198 + manager.kWeiBoShareAppId_Share = @"1337575478";
  199 + manager.kWeiBoShareAppSecret_Share = @"1bff97cec7f760e64a37b2c6d6d7db86";
  200 + manager.kWeiBoShareAppKey_Share = @"3884700821";
  201 +
193 manager.kShareSDKAppId_Share = @"26192e9007048"; 202 manager.kShareSDKAppId_Share = @"26192e9007048";
194 manager.kShareSDKAppSecret_Share = @"f9d2fbf7f7827925c532a716340363c7"; 203 manager.kShareSDKAppSecret_Share = @"f9d2fbf7f7827925c532a716340363c7";
195 204
@@ -258,6 +267,10 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -258,6 +267,10 @@ static CNLiveEnvironmentManager *_instance = nil;
258 manager.kQQShareAppId_Share = @"1106691520"; 267 manager.kQQShareAppId_Share = @"1106691520";
259 manager.kQQShareAppSecret_Share = @"kLZ8CglGFjzrJFan"; 268 manager.kQQShareAppSecret_Share = @"kLZ8CglGFjzrJFan";
260 269
  270 + manager.kWeiBoShareAppId_Share = @"1337575478";
  271 + manager.kWeiBoShareAppSecret_Share = @"1bff97cec7f760e64a37b2c6d6d7db86";
  272 + manager.kWeiBoShareAppKey_Share = @"3884700821";
  273 +
261 manager.kShareSDKAppId_Share = @"24e4abeaa92d8"; 274 manager.kShareSDKAppId_Share = @"24e4abeaa92d8";
262 manager.kShareSDKAppSecret_Share = @"da94a6f881d404092c9a7108e4470e8f"; 275 manager.kShareSDKAppSecret_Share = @"da94a6f881d404092c9a7108e4470e8f";
263 276
@@ -326,6 +339,10 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -326,6 +339,10 @@ static CNLiveEnvironmentManager *_instance = nil;
326 manager.kQQShareAppId_Share = @"1106970445"; 339 manager.kQQShareAppId_Share = @"1106970445";
327 manager.kQQShareAppSecret_Share = @"4hxuJ1HIes4i4hqT"; 340 manager.kQQShareAppSecret_Share = @"4hxuJ1HIes4i4hqT";
328 341
  342 + manager.kWeiBoShareAppId_Share = @"1337575478";
  343 + manager.kWeiBoShareAppSecret_Share = @"1bff97cec7f760e64a37b2c6d6d7db86";
  344 + manager.kWeiBoShareAppKey_Share = @"3884700821";
  345 +
329 manager.kShareSDKAppId_Share = @"26192e9007048"; 346 manager.kShareSDKAppId_Share = @"26192e9007048";
330 manager.kShareSDKAppSecret_Share = @"f9d2fbf7f7827925c532a716340363c7"; 347 manager.kShareSDKAppSecret_Share = @"f9d2fbf7f7827925c532a716340363c7";
331 348
@@ -393,6 +410,10 @@ static CNLiveEnvironmentManager *_instance = nil; @@ -393,6 +410,10 @@ static CNLiveEnvironmentManager *_instance = nil;
393 manager.kQQShareAppId_Share = @"1106691520"; 410 manager.kQQShareAppId_Share = @"1106691520";
394 manager.kQQShareAppSecret_Share = @"kLZ8CglGFjzrJFan"; 411 manager.kQQShareAppSecret_Share = @"kLZ8CglGFjzrJFan";
395 412
  413 + manager.kWeiBoShareAppId_Share = @"1337575478";
  414 + manager.kWeiBoShareAppSecret_Share = @"1bff97cec7f760e64a37b2c6d6d7db86";
  415 + manager.kWeiBoShareAppKey_Share = @"3884700821";
  416 +
396 manager.kShareSDKAppId_Share = @"24e4abeaa92d8"; 417 manager.kShareSDKAppId_Share = @"24e4abeaa92d8";
397 manager.kShareSDKAppSecret_Share = @"da94a6f881d404092c9a7108e4470e8f"; 418 manager.kShareSDKAppSecret_Share = @"da94a6f881d404092c9a7108e4470e8f";
398 419
Example/CNLiveEnvironment/XWAppDelegate.m
  View file @500d6d2
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 NSLog(@"%@",EnvironmentDesc); 23 NSLog(@"%@",EnvironmentDesc);
24 NSLog(@"%d",TestEnvironment); 24 NSLog(@"%d",TestEnvironment);
25 25
  26 +
26 return YES; 27 return YES;
27 } 28 }
28 29
Example/CNLiveEnvironment/XWViewController.m
  View file @500d6d2
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 NSLog(@"%@",EnvironmentDesc); 22 NSLog(@"%@",EnvironmentDesc);
23 NSLog(@"%d",TestEnvironment); 23 NSLog(@"%d",TestEnvironment);
24 24
25 - [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore]; 25 +// [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
26 NSLog(@"%@",EnvironmentDesc); 26 NSLog(@"%@",EnvironmentDesc);
27 NSLog(@"%d",TestEnvironment); 27 NSLog(@"%d",TestEnvironment);
28 28
@@ -30,7 +30,10 @@ @@ -30,7 +30,10 @@
30 30
31 NSLog(@"%@",CNPayAudioAuthUrl); 31 NSLog(@"%@",CNPayAudioAuthUrl);
32 32
33 - 33 + NSLog(@"测试");
  34 + NSLog(@"id%@",WeiBoShareAppId_Share);
  35 + NSLog(@"key%@",WeiBoShareAppKey_Share);
  36 + NSLog(@"secret%@",WeiBoShareAppSecret_Share);
34 } 37 }
35 38
36 - (void)didReceiveMemoryWarning 39 - (void)didReceiveMemoryWarning