SDK / GameSDK-ios-17

Download as
Browse Code »

Commit 44e1460f103fc44c995212f41e5bbf078c3695d8

Authored by alexYang
1 parent e8af757417
Exists in master and in 1 other branch dev

line login add,登录按钮布局排列优化

Showing 10 changed files with 110 additions and 87 deletions Side-by-side Diff

... ... @@ -2,8 +2,8 @@
2 2  
3 3  
4 4 接入手册
5   -V 3.4.9
6   -2017年6月13日
  5 +V 3.4.11
  6 +2017年12月29日
7 7  
8 8 ## 概述
9 9 #### 本SDK提供gump账号，fb账号，vk账号，Google帐号四种账号登录，iap支付和第三方支付两种支付功能，其中gump账号登录和fb账号登录功能为必须接入，支付可根据需要选择性接入。
ios/GameSDK.framework/Versions/A/GameSDK
Diff comments   View file @ 44e1460
No preview for this file type
ios/GameSDK.framework/Versions/A/Headers/LSGAccount.h
Diff comments   View file @ 44e1460
... ... @@ -7,10 +7,11 @@ typedef NS_ENUM(NSInteger, LSGAccountType) {
7 7 LSGAccountTypeVKRegist = 8,
8 8 LSGAccountTypeGoogleRegist = 16,
9 9 LSGAccountTypeWeChatRegist = 32,
  10 + LSGAccountTypeLineRegist = 64,
10 11 };
11 12  
12 13 //判断是不是自动登录情况
13   -#define LSGAccountTypeBaseLogin 64
  14 +#define LSGAccountTypeBaseLogin 128
14 15  
15 16 @interface LSGAccount : NSObject
16 17  
ios/GameSDK.framework/Versions/A/Headers/LetsGameAPI.h
Diff comments   View file @ 44e1460
... ... @@ -11,13 +11,15 @@ static BOOL isDisableFB = NO;
11 11  
12 12 static BOOL isEnableVK = NO;
13 13  
14   -static BOOL isEnableWeChat = YES;
  14 +static BOOL isDisableLine = NO;
  15 +
  16 +static BOOL isDisableWeChat = NO;
15 17  
16 18 static BOOL isDisableGoogle = NO;
17 19  
18 20 static BOOL hiddenLogo = NO;
19 21  
20   -static NSString *version = @"3.4.9";
  22 +static NSString *version = @"3.4.11";
21 23  
22 24 @interface LetsGameAPI : NSObject<UIApplicationDelegate>
23 25  
... ... @@ -39,10 +41,13 @@ static NSString *version = @&quot;3.4.9&quot;;
39 41  
40 42 +(void)disableFB:(BOOL)isDisable;
41 43 +(void)disableGoogle:(BOOL)isDisable;
  44 ++(void)disableWeChat:(BOOL)isDisable;
  45 ++(void)disableLine:(BOOL)isDissable;
42 46 +(BOOL)isFBDisable;
43 47 +(BOOL)isVKEnable;
44   -+(BOOL)isWeChatEnable;
  48 ++(BOOL)isWeChatDisable;
45 49 +(BOOL)isGoogleDisable;
  50 ++(BOOL)isLineDisable;
46 51 +(void)hiddenLogo:(BOOL)isHidden;
47 52 +(BOOL)isHiddenLogo;
48 53  
No preview for this file type
ios/GameSDKDemo/GameSDKDemo.xcodeproj/project.xcworkspace/xcuserdata/yanglele.xcuserdatad/UserInterfaceState.xcuserstate
Diff comments   View file @ 44e1460
No preview for this file type
ios/GameSDKDemo/GameSDKDemo.xcodeproj/xcuserdata/yanglele.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
Diff comments   View file @ 44e1460
... ... @@ -10,7 +10,7 @@
10 10 ignoreCount = "0"
11 11 continueAfterRunningActions = "No"
12 12 filePath = "../../../iosgamesdk/GameSDK/letsgame/service/httpService/LSGUserService.m"
13   - timestampString = "536050010.070926"
  13 + timestampString = "536217870.40553"
14 14 startingColumnNumber = "9223372036854775807"
15 15 endingColumnNumber = "9223372036854775807"
16 16 startingLineNumber = "594"
... ... @@ -25,28 +25,12 @@
25 25 shouldBeEnabled = "Yes"
26 26 ignoreCount = "0"
27 27 continueAfterRunningActions = "No"
28   - filePath = "../../../iosgamesdk/GameSDK/letsgame/registAndLogin/LSGUserBaseViewController.m"
29   - timestampString = "536046478.994249"
30   - startingColumnNumber = "9223372036854775807"
31   - endingColumnNumber = "9223372036854775807"
32   - startingLineNumber = "295"
33   - endingLineNumber = "295"
34   - landmarkName = "-onClickWeChatLogin"
35   - landmarkType = "7">
36   - </BreakpointContent>
37   - </BreakpointProxy>
38   - <BreakpointProxy
39   - BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
40   - <BreakpointContent
41   - shouldBeEnabled = "Yes"
42   - ignoreCount = "0"
43   - continueAfterRunningActions = "No"
44 28 filePath = "../../../iosgamesdk/GameSDK/letsgame/LetsGameAPI.m"
45   - timestampString = "536050715.666746"
  29 + timestampString = "536126823.106813"
46 30 startingColumnNumber = "9223372036854775807"
47 31 endingColumnNumber = "9223372036854775807"
48   - startingLineNumber = "269"
49   - endingLineNumber = "269"
  32 + startingLineNumber = "281"
  33 + endingLineNumber = "281"
50 34 landmarkName = "-registerAppWeChatWithAppId:appKey:Success:failure:"
51 35 landmarkType = "7">
52 36 <Locations>
... ... @@ -58,12 +42,12 @@
58 42 moduleName = "GameSDKDemo"
59 43 usesParentBreakpointCondition = "Yes"
60 44 urlString = "file:///Users/yanglele/workproject/project/GumpSDK/iosgamesdk/GameSDK/letsgame/LetsGameAPI.m"
61   - timestampString = "536048775.543027"
  45 + timestampString = "536212412.523702"
62 46 startingColumnNumber = "9223372036854775807"
63 47 endingColumnNumber = "9223372036854775807"
64   - startingLineNumber = "269"
65   - endingLineNumber = "269"
66   - offsetFromSymbolStart = "164">
  48 + startingLineNumber = "281"
  49 + endingLineNumber = "281"
  50 + offsetFromSymbolStart = "161">
67 51 </Location>
68 52 <Location
69 53 shouldBeEnabled = "Yes"
... ... @@ -73,12 +57,12 @@
73 57 moduleName = "GameSDKDemo"
74 58 usesParentBreakpointCondition = "Yes"
75 59 urlString = "file:///Users/yanglele/workproject/project/GumpSDK/iosgamesdk/GameSDK/letsgame/LetsGameAPI.m"
76   - timestampString = "536048775.545047"
  60 + timestampString = "536212412.526449"
77 61 startingColumnNumber = "9223372036854775807"
78 62 endingColumnNumber = "9223372036854775807"
79   - startingLineNumber = "269"
80   - endingLineNumber = "269"
81   - offsetFromSymbolStart = "16">
  63 + startingLineNumber = "281"
  64 + endingLineNumber = "281"
  65 + offsetFromSymbolStart = "19">
82 66 </Location>
83 67 </Locations>
84 68 </BreakpointContent>
... ... @@ -90,7 +74,7 @@
90 74 ignoreCount = "0"
91 75 continueAfterRunningActions = "No"
92 76 filePath = "../../../iosgamesdk/GameSDK/letsgame/registAndLogin/LSGWeChatViewController.m"
93   - timestampString = "536048532.37555"
  77 + timestampString = "536126480.108287"
94 78 startingColumnNumber = "9223372036854775807"
95 79 endingColumnNumber = "9223372036854775807"
96 80 startingLineNumber = "51"
... ... @@ -106,12 +90,12 @@
106 90 moduleName = "GameSDKDemo"
107 91 usesParentBreakpointCondition = "Yes"
108 92 urlString = "file:///Users/yanglele/workproject/project/GumpSDK/iosgamesdk/GameSDK/letsgame/registAndLogin/LSGWeChatViewController.m"
109   - timestampString = "536048775.551058"
  93 + timestampString = "536212412.554201"
110 94 startingColumnNumber = "9223372036854775807"
111 95 endingColumnNumber = "9223372036854775807"
112 96 startingLineNumber = "51"
113 97 endingLineNumber = "51"
114   - offsetFromSymbolStart = "224">
  98 + offsetFromSymbolStart = "201">
115 99 </Location>
116 100 <Location
117 101 shouldBeEnabled = "Yes"
... ... @@ -121,12 +105,12 @@
121 105 moduleName = "GameSDKDemo"
122 106 usesParentBreakpointCondition = "Yes"
123 107 urlString = "file:///Users/yanglele/workproject/project/GumpSDK/iosgamesdk/GameSDK/letsgame/registAndLogin/LSGWeChatViewController.m"
124   - timestampString = "536048775.553805"
  108 + timestampString = "536212412.557216"
125 109 startingColumnNumber = "9223372036854775807"
126 110 endingColumnNumber = "9223372036854775807"
127 111 startingLineNumber = "52"
128 112 endingLineNumber = "52"
129   - offsetFromSymbolStart = "64">
  113 + offsetFromSymbolStart = "44">
130 114 </Location>
131 115 </Locations>
132 116 </BreakpointContent>
... ... @@ -138,7 +122,7 @@
138 122 ignoreCount = "0"
139 123 continueAfterRunningActions = "No"
140 124 filePath = "../../../iosgamesdk/GameSDK/letsgame/registAndLogin/LSGWeChatViewController.m"
141   - timestampString = "536048532.37562"
  125 + timestampString = "536126480.108348"
142 126 startingColumnNumber = "9223372036854775807"
143 127 endingColumnNumber = "9223372036854775807"
144 128 startingLineNumber = "34"
... ... @@ -153,46 +137,78 @@
153 137 shouldBeEnabled = "Yes"
154 138 ignoreCount = "0"
155 139 continueAfterRunningActions = "No"
156   - filePath = "letsgameDemo/LSGAppDelegate.m"
157   - timestampString = "536050715.667074"
  140 + filePath = "../../../iosgamesdk/GameSDK/letsgame/registAndLogin/LSGFBLoginViewController.m"
  141 + timestampString = "536127479.611329"
158 142 startingColumnNumber = "9223372036854775807"
159 143 endingColumnNumber = "9223372036854775807"
160   - startingLineNumber = "38"
161   - endingLineNumber = "38"
162   - landmarkName = "-application:didFinishLaunchingWithOptions:"
  144 + startingLineNumber = "68"
  145 + endingLineNumber = "68"
  146 + landmarkName = "-injectJSObject"
  147 + landmarkType = "7">
  148 + </BreakpointContent>
  149 + </BreakpointProxy>
  150 + <BreakpointProxy
  151 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  152 + <BreakpointContent
  153 + shouldBeEnabled = "Yes"
  154 + ignoreCount = "0"
  155 + continueAfterRunningActions = "No"
  156 + filePath = "../../../iosgamesdk/GameSDK/letsgame/registAndLogin/LSGFBLoginViewController.m"
  157 + timestampString = "536127479.611763"
  158 + startingColumnNumber = "9223372036854775807"
  159 + endingColumnNumber = "9223372036854775807"
  160 + startingLineNumber = "31"
  161 + endingLineNumber = "31"
  162 + landmarkName = "-loadView"
  163 + landmarkType = "7">
  164 + </BreakpointContent>
  165 + </BreakpointProxy>
  166 + <BreakpointProxy
  167 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  168 + <BreakpointContent
  169 + shouldBeEnabled = "Yes"
  170 + ignoreCount = "0"
  171 + continueAfterRunningActions = "No"
  172 + filePath = "../../../iosgamesdk/GameSDK/letsgame/registAndLogin/LSGFBLoginViewController.m"
  173 + timestampString = "536127479.61203"
  174 + startingColumnNumber = "9223372036854775807"
  175 + endingColumnNumber = "9223372036854775807"
  176 + startingLineNumber = "93"
  177 + endingLineNumber = "93"
  178 + landmarkName = "-webViewDidFinishLoad:"
  179 + landmarkType = "7">
  180 + </BreakpointContent>
  181 + </BreakpointProxy>
  182 + <BreakpointProxy
  183 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  184 + <BreakpointContent
  185 + shouldBeEnabled = "Yes"
  186 + ignoreCount = "0"
  187 + continueAfterRunningActions = "No"
  188 + filePath = "../../../iosgamesdk/GameSDK/letsgame/registAndLogin/LSGFBLoginViewController.m"
  189 + timestampString = "536127479.61231"
  190 + startingColumnNumber = "9223372036854775807"
  191 + endingColumnNumber = "9223372036854775807"
  192 + startingLineNumber = "102"
  193 + endingLineNumber = "102"
  194 + landmarkName = "-webView:shouldStartLoadWithRequest:navigationType:"
  195 + landmarkType = "7">
  196 + </BreakpointContent>
  197 + </BreakpointProxy>
  198 + <BreakpointProxy
  199 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  200 + <BreakpointContent
  201 + shouldBeEnabled = "Yes"
  202 + ignoreCount = "0"
  203 + continueAfterRunningActions = "No"
  204 + filePath = "../../../iosgamesdk/GameSDK/letsgame/registAndLogin/LSGAutoLoginViewController.m"
  205 + timestampString = "536217870.406435"
  206 + startingColumnNumber = "9223372036854775807"
  207 + endingColumnNumber = "9223372036854775807"
  208 + startingLineNumber = "56"
  209 + endingLineNumber = "56"
  210 + landmarkName = "-viewDidLoad"
163 211 landmarkType = "7">
164   - <Locations>
165   - <Location
166   - shouldBeEnabled = "Yes"
167   - ignoreCount = "0"
168   - continueAfterRunningActions = "No"
169   - symbolName = "-[LSGAppDelegate application:didFinishLaunchingWithOptions:]"
170   - moduleName = "GameSDKDemo"
171   - usesParentBreakpointCondition = "Yes"
172   - urlString = "file:///Users/yanglele/workproject/project/GumpSDK/gamesdkNew/ios/GameSDKDemo/letsgameDemo/LSGAppDelegate.m"
173   - timestampString = "536048775.5657"
174   - startingColumnNumber = "9223372036854775807"
175   - endingColumnNumber = "9223372036854775807"
176   - startingLineNumber = "38"
177   - endingLineNumber = "38"
178   - offsetFromSymbolStart = "848">
179   - </Location>
180   - <Location
181   - shouldBeEnabled = "Yes"
182   - ignoreCount = "0"
183   - continueAfterRunningActions = "No"
184   - symbolName = "__60-[LSGAppDelegate application:didFinishLaunchingWithOptions:]_block_invoke"
185   - moduleName = "GameSDKDemo"
186   - usesParentBreakpointCondition = "Yes"
187   - urlString = "file:///Users/yanglele/workproject/project/GumpSDK/gamesdkNew/ios/GameSDKDemo/letsgameDemo/LSGAppDelegate.m"
188   - timestampString = "536048775.567968"
189   - startingColumnNumber = "9223372036854775807"
190   - endingColumnNumber = "9223372036854775807"
191   - startingLineNumber = "39"
192   - endingLineNumber = "39"
193   - offsetFromSymbolStart = "20">
194   - </Location>
195   - </Locations>
196 212 </BreakpointContent>
197 213 </BreakpointProxy>
198 214 </Breakpoints>
ios/GameSDKDemo/letsgameDemo/LSGAppDelegate.m
Diff comments   View file @ 44e1460
... ... @@ -23,7 +23,7 @@
23 23 self.window.backgroundColor = [UIColor whiteColor];
24 24 [self.window makeKeyAndVisible];
25 25  
26   - [[LetsGameAPI instance] decideIsDebug:1];
  26 +// [[LetsGameAPI instance] decideIsDebug:1];
27 27  
28 28 //显示是否侵权的接口
29 29 // [[LetsGameAPI instance] gameObtainSafeSetInfoWithAppId:@"10056" ChannelId:@"1000" handleCallBack:^(BOOL resultStatus) {
... ... @@ -35,11 +35,11 @@
35 35 // }];
36 36  
37 37 //微信登陆
38   - [[LetsGameAPI instance] registerAppWeChatWithAppId:@"100" appKey:@"f899139df5e1059396431415e770c6dd" Success:^{
39   - NSLog(@"注册成功");
40   - } failure:^{
41   - NSLog(@"注册失败");
42   - }];
  38 +// [[LetsGameAPI instance] registerAppWeChatWithAppId:@"100" appKey:@"f899139df5e1059396431415e770c6dd" Success:^{
  39 +// NSLog(@"注册成功");
  40 +// } failure:^{
  41 +// NSLog(@"注册失败");
  42 +// }];
43 43  
44 44 [[UIApplication sharedApplication] setStatusBarHidden:YES];
45 45 [[LetsGameAPI instance] registeIapObserver];
ios/GameSDKDemo/letsgameDemo/LSGMainViewController.m
Diff comments   View file @ 44e1460
... ... @@ -82,11 +82,12 @@
82 82  
83 83 - (void)onClickTest {
84 84  
85   - [LetsGameAPI instance].appId = @"10056";//10047
86   - [LetsGameAPI instance].appKey = @"b59c21a078fde074a6750e91ed19fb21";//eccd9f7dc92858b741132fda313130cf
  85 + [LetsGameAPI instance].appId = @"100";//@"100";//10047
  86 + [LetsGameAPI instance].appKey = @"b59c21a078fde074a6750e91ed19fb21";//@"f899139df5e1059396431415e770c6dd";//eccd9f7dc92858b741132fda313130cf
87 87 [LetsGameAPI hiddenLogo:YES];
88   -// [LetsGameAPI disableFB:YES];
89   -// [LetsGameAPI disableGoogle:YES];
  88 + [LetsGameAPI disableFB:YES];
  89 + [LetsGameAPI disableGoogle:YES];
  90 +// [LetsGameAPI disableLine:YES];
90 91 NSLog(@"sdk version:%@",[[LetsGameAPI instance] version]);
91 92 //启用vk登录
92 93 VKBridge *vkBridge = [[VKBridge alloc] initWithVKAppId:@"5029792"];
ios/GameSDKResources.bundle/images/ic_line@2x.png
Diff comments   View file @ 44e1460

11.7 KB