Commit 135cc0db4bd3788ef6cc06dff5c3fab2c49c9022

Authored by alexYang
1 parent 730d2b7066
Exists in master

Google登录

Showing 10 changed files with 21 additions and 12 deletions Side-by-side Diff

... ... @@ -2,11 +2,11 @@
2 2  
3 3  
4 4 接入手册
5   -V 3.4.4
6   -2017年4月7日
  5 +V 3.4.6
  6 +2017年4月25日
7 7  
8 8 ## 概述
9   -#### 本SDK提供gump账号,fb账号,vk账号种账号登录,iap支付和第三方支付两种支付功能,其中gump账号登录和fb账号登录功能为必须接入,支付可根据需要选择性接入。
  9 +#### 本SDK提供gump账号,fb账号,vk账号,Google帐号四种账号登录,iap支付和第三方支付两种支付功能,其中gump账号登录和fb账号登录功能为必须接入,支付可根据需要选择性接入。
10 10  
11 11 ## 接入步骤
12 12 ### 1、添加Framework和资源文件
... ... @@ -66,7 +66,8 @@ Xcode 4: Open your Info.plist then add a new row URL Types. Set the URL identifi
66 66  
67 67 //隐藏fb登录
68 68 [LetsGameAPI disableFB:YES];
69   -
  69 + //隐藏Google登录
  70 + [LetsGameAPI disableGoogle:YES];
70 71 //隐藏gumptech的logo
71 72 [LetsGameAPI hiddenLogo:YES];
72 73  
ios/GameSDK.framework/Versions/A/GameSDK
No preview for this file type
ios/GameSDK.framework/Versions/A/Headers/LSGAccount.h
... ... @@ -5,10 +5,11 @@ typedef NS_ENUM(NSInteger, LSGAccountType) {
5 5 LSGAccountTypeFBRegist = 2,
6 6 LSGAccountTypeQuickRegist = 4,
7 7 LSGAccountTypeVKRegist = 8,
  8 + LSGAccountTypeGoogleRegist = 16,
8 9 };
9 10  
10 11 //判断是不是自动登录情况
11   -#define LSGAccountTypeBaseLogin 16
  12 +#define LSGAccountTypeBaseLogin 32
12 13  
13 14 @interface LSGAccount : NSObject
14 15  
ios/GameSDK.framework/Versions/A/Headers/LetsGameAPI.h
... ... @@ -11,9 +11,11 @@ static BOOL isDisableFB = NO;
11 11  
12 12 static BOOL isEnableVK = NO;
13 13  
  14 +static BOOL isDisableGoogle = NO;
  15 +
14 16 static BOOL hiddenLogo = NO;
15 17  
16   -static NSString *version = @"3.4.4";
  18 +static NSString *version = @"3.4.5";
17 19  
18 20 @interface LetsGameAPI : NSObject<UIApplicationDelegate>
19 21  
... ... @@ -34,8 +36,10 @@ static NSString *version = @&quot;3.4.4&quot;;
34 36 - (void)showLoginViewInView:(UIView *)view;
35 37  
36 38 +(void)disableFB:(BOOL)isDisable;
  39 ++(void)disableGoogle:(BOOL)isDisable;
37 40 +(BOOL)isFBDisable;
38 41 +(BOOL)isVKEnable;
  42 ++(BOOL)isGoogleDisable;
39 43 +(void)hiddenLogo:(BOOL)isHidden;
40 44 +(BOOL)isHiddenLogo;
41 45  
No preview for this file type
ios/GameSDKDemo/GameSDKDemo.xcodeproj/project.pbxproj
... ... @@ -218,6 +218,7 @@
218 218 TargetAttributes = {
219 219 9934F1AD19303DC6005EF4AB = {
220 220 DevelopmentTeam = TU2VD6BENZ;
  221 + ProvisioningStyle = Manual;
221 222 };
222 223 };
223 224 };
... ... @@ -385,7 +386,7 @@
385 386 PRIVATE_HEADERS_FOLDER_PATH = "";
386 387 PRODUCT_BUNDLE_IDENTIFIER = test.kang.purchase;
387 388 PRODUCT_NAME = GameSDKDemo;
388   - PROVISIONING_PROFILE = "9a16d1a8-62c4-4ddd-a173-5ea852773122";
  389 + PROVISIONING_PROFILE = "a71a526c-5343-4ed9-85d0-53b1678bef8f";
389 390 PROVISIONING_PROFILE_SPECIFIER = testpurchaseDev;
390 391 PUBLIC_HEADERS_FOLDER_PATH = "";
391 392 WRAPPER_EXTENSION = app;
... ... @@ -400,7 +401,7 @@
400 401 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
401 402 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
402 403 CODE_SIGN_IDENTITY = "iPhone Developer";
403   - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
  404 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
404 405 DEVELOPMENT_TEAM = TU2VD6BENZ;
405 406 ENABLE_BITCODE = NO;
406 407 FRAMEWORK_SEARCH_PATHS = (
... ... @@ -422,8 +423,8 @@
422 423 PRIVATE_HEADERS_FOLDER_PATH = "";
423 424 PRODUCT_BUNDLE_IDENTIFIER = test.kang.purchase;
424 425 PRODUCT_NAME = GameSDKDemo;
425   - PROVISIONING_PROFILE = "7b28fefe-7c60-41a6-ac6c-b21726228700";
426   - PROVISIONING_PROFILE_SPECIFIER = testpurchasekang;
  426 + PROVISIONING_PROFILE = "a71a526c-5343-4ed9-85d0-53b1678bef8f";
  427 + PROVISIONING_PROFILE_SPECIFIER = testpurchaseDev;
427 428 PUBLIC_HEADERS_FOLDER_PATH = "";
428 429 WRAPPER_EXTENSION = app;
429 430 };
ios/GameSDKDemo/GameSDKDemo.xcodeproj/project.xcworkspace/xcuserdata/yanglele.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
ios/GameSDKDemo/letsgameDemo/LSGAppDelegate.m
... ... @@ -22,7 +22,6 @@
22 22  
23 23 self.window.backgroundColor = [UIColor whiteColor];
24 24 [self.window makeKeyAndVisible];
25   -
26 25 //显示是否侵权的接口
27 26 // [[LetsGameAPI instance] gameObtainSafeSetInfoWithAppId:@"10056" ChannelId:@"1000" handleCallBack:^(BOOL resultStatus) {
28 27 // if (resultStatus) {
ios/GameSDKDemo/letsgameDemo/LSGMainViewController.m
... ... @@ -85,7 +85,8 @@
85 85 [LetsGameAPI instance].appId = @"10056";//10047
86 86 [LetsGameAPI instance].appKey = @"b59c21a078fde074a6750e91ed19fb21";//eccd9f7dc92858b741132fda313130cf
87 87 [LetsGameAPI hiddenLogo:YES];
88   -// [LetsGameAPI disableFB:NO];
  88 + [LetsGameAPI disableFB:NO];
  89 + [LetsGameAPI disableGoogle:YES];
89 90 NSLog(@"sdk version:%@",[[LetsGameAPI instance] version]);
90 91 //启用vk登录
91 92 VKBridge *vkBridge = [[VKBridge alloc] initWithVKAppId:@"5029792"];
... ... @@ -127,6 +128,7 @@
127 128 }
128 129  
129 130 -(void)onIapTest{
  131 +
130 132 [LetsGameAPI instance].appId = @"10056";
131 133 [LetsGameAPI instance].appKey = @"b59c21a078fde074a6750e91ed19fb21";
132 134 NSMutableDictionary *payInfo = [NSMutableDictionary dictionary];
... ... @@ -139,6 +141,7 @@
139 141 [[LetsGameAPI instance] iap:payInfo forUser:@"" handleCallback:^(NSString* orderId){
140 142 NSLog(@"IAP completed orderId of Gumptech:%@",orderId);
141 143 }];
  144 +
142 145 }
143 146  
144 147  
ios/GameSDKResources.bundle/images/ic_gg@2x.png

4.98 KB