Commit 947ebdf6b22f224390c72014f6c08f11b4520eb7

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

sessionKey字段返回添加有效期,以及登录时新版本bug修改

Showing 8 changed files with 20 additions and 18 deletions Side-by-side Diff

ios/GameSDK.framework/Versions/A/GameSDK
No preview for this file type
ios/GameSDK.framework/Versions/A/Headers/LSGAccount.h
... ... @@ -16,12 +16,13 @@ typedef NS_ENUM(NSInteger, LSGAccountType) {
16 16 @interface LSGAccount : NSObject
17 17  
18 18 @property(nonatomic, assign) LSGAccountType type;
19   -@property(nonatomic, strong) NSString *username;
20   -@property(nonatomic, strong) NSString *nickName;
21   -@property(nonatomic, strong) NSString *password;
22   -@property(nonatomic, strong) NSString *userId;
23   -@property(nonatomic, strong) NSString *sessionKey;
24   -@property(nonatomic, strong) NSString *deviceId;
  19 +@property(nonatomic, copy) NSString *username;
  20 +@property(nonatomic, copy) NSString *nickName;
  21 +@property(nonatomic, copy) NSString *password;
  22 +@property(nonatomic, copy) NSString *userId;
  23 +@property(nonatomic, copy) NSString *sessionKey;
  24 +@property(nonatomic, copy) NSString *deviceId;
  25 +@property(nonatomic, copy) NSString *sessionInvalidT;
25 26  
26 27 + (void)saveAccount:(NSString *)service account:(LSGAccount *)account;
27 28  
ios/GameSDK.framework/Versions/A/Headers/LetsGameAPI.h
... ... @@ -22,7 +22,7 @@ static BOOL hiddenLogo = NO;
22 22 //默认横屏
23 23 static BOOL DeviceOrientationIsHorizontal = YES;
24 24  
25   -static NSString *version = @"3.4.19";
  25 +static NSString *version = @"3.5.3";
26 26  
27 27 @interface LetsGameAPI : NSObject<UIApplicationDelegate>
28 28  
ios/GameSDKDemo/GameSDKDemo.xcodeproj/project.xcworkspace/xcuserdata/yanglele.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
ios/GameSDKDemo/GameSDKDemo.xcodeproj/xcuserdata/yanglele.xcuserdatad/xcschemes/GameSDKDemo.xcscheme
... ... @@ -46,6 +46,7 @@
46 46 buildConfiguration = "Debug"
47 47 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
48 48 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
  49 + disableMainThreadChecker = "YES"
49 50 language = ""
50 51 launchStyle = "0"
51 52 useCustomWorkingDirectory = "NO"
ios/GameSDKDemo/letsgameDemo/LSGAppDelegate.m
... ... @@ -27,13 +27,13 @@
27 27 // [[LetsGameAPI instance] decideIsDebug:1];
28 28  
29 29 //显示是否侵权的接口
30   -// [[LetsGameAPI instance] gameObtainSafeSetInfoWithAppId:@"10056" ChannelId:@"1000" handleCallBack:^(BOOL resultStatus) {
31   -// if (resultStatus) {
32   -// NSLog(@"YES 侵权");
33   -// }else{
34   -// NSLog(@"NO 不侵权");
35   -// }
36   -// }];
  30 + [[LetsGameAPI instance] gameObtainSafeSetInfoWithAppId:@"10056" ChannelId:@"1000" handleCallBack:^(BOOL resultStatus) {
  31 + if (resultStatus) {
  32 + NSLog(@"YES 侵权");
  33 + }else{
  34 + NSLog(@"NO 不侵权");
  35 + }
  36 + }];
37 37  
38 38 //微信登陆
39 39 [[LetsGameAPI instance] registerAppWeChatWithAppId:@"100" appKey:@"f899139df5e1059396431415e770c6dd" Success:^{
ios/GameSDKDemo/letsgameDemo/LSGMainViewController.m
... ... @@ -82,8 +82,8 @@
82 82  
83 83 - (void)onClickTest {
84 84  
85   - [LetsGameAPI instance].appId = @"100";//@"100";//10047
86   - [LetsGameAPI instance].appKey = @"f899139df5e1059396431415e770c6dd";//@"f899139df5e1059396431415e770c6dd";//eccd9f7dc92858b741132fda313130cf
  85 + [LetsGameAPI instance].appId = @"100";//10047
  86 + [LetsGameAPI instance].appKey = @"f899139df5e1059396431415e770c6dd";//eccd9f7dc92858b741132fda313130cf
87 87 [LetsGameAPI instance].channelId = @"10010";
88 88 [LetsGameAPI hiddenLogo:YES];
89 89 // [LetsGameAPI disableFB:YES];
ios/GameSDKResources.bundle/Js.txt
... ... @@ -2,7 +2,7 @@
2 2 var messagingIframe,
3 3 bridge = 'sdk',
4 4 CUSTOM_PROTOCOL_SCHEME = 'jscall';
5   -var appId = '%@' ,deviceId='%@' ,channelId='%@';
  5 +var appId = '%@' ,deviceId='%@', channelId='%@';
6 6  
7 7  
8 8 if (window[bridge]) { return }
... ... @@ -46,4 +46,4 @@ _createQueueReadyIframe(document);
46 46 if(typeof(onInjectJsOver)=='function')
47 47 onInjectJsOver();
48 48  
49 49 -})();
  50 +})();
50 51 \ No newline at end of file