SDK / GameSDK-ios-17

Download as
Browse Code »

Commit 635b66127c704d4f874fcf4dcba107efea1c8c6f

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

1、自动登录部分修改，将自动登录部分的登录框取消，点击登录之后登陆过之后直接登录，在gump登陆过程中的对最短3秒登录时间取消，尽快登陆，取消延时，不再出现切换… 

…账号和修改密码的选项 2、修改第三方回调的名称 3、运营对侵权内容和非侵权内容显示要求的借口

Showing 11 changed files with 59 additions and 24 deletions Side-by-side Diff

... ... @@ -2,8 +2,8 @@
2 2  
3 3  
4 4 接入手册
5   -V 3.3.25
6   -2017年3月9日
  5 +V 3.4.2
  6 +2017年3月22日
7 7  
8 8 ## 概述
9 9 #### 本SDK提供gump账号，fb账号，vk账号三种账号登录，iap支付和第三方支付两种支付功能，其中gump账号登录和fb账号登录功能为必须接入，支付可根据需要选择性接入。
... ... @@ -145,3 +145,19 @@ FB登录之后会产生token并自动登录，需要如果需要token的话，
145 145 需要在 application:didFinishLaunchingWithOptions方法中添加:
146 146  
147 147 [[LetsGameAPI instance] decideWebPayVersion:1]
  148 +
  149 +
  150 +### 10、关于侵权还是侵权的接口显示
  151 +运营在后台配置此包名和版本在什么时候显示侵权内容还是不侵权内容，此接口调用需要在游戏才开始加载的时候调用，返回值是YES的时候显示侵权内容，在NO的时候显示不侵权内容。
  152 +
  153 +注意：关于运营配置的游戏的版本号，我们默认取的是Bulid版本号的值，请注意。
  154 +
  155 + [[LetsGameAPI instance] gameObtainSafeSetInfoWithAppId:@"10056" ChannelId:@"1000" handleCallBack:^(BOOL resultStatus) {
  156 + if (resultStatus) {
  157 + NSLog(@"YES 侵权");
  158 + }else{
  159 + NSLog(@"NO 不侵权");
  160 + }
  161 + }];
  162 +
  163 +
ios/GameSDK.framework/Versions/A/GameSDK
Diff comments   View file @ 635b661
No preview for this file type
ios/GameSDK.framework/Versions/A/Headers/LSGAccount.h
Diff comments   View file @ 635b661
... ... @@ -2,11 +2,14 @@
2 2  
3 3 typedef NS_ENUM(NSInteger, LSGAccountType) {
4 4 LSGAccountTypeRegist = 1,
5   - LSGAccountTypeFBRegist = 5,
  5 + LSGAccountTypeFBRegist = 2,
6 6 LSGAccountTypeQuickRegist = 4,
7   - LSGAccountTypeVKRegist = 6,
  7 + LSGAccountTypeVKRegist = 8,
8 8 };
9 9  
  10 +//判断是不是自动登录情况
  11 +#define LSGAccountTypeBaseLogin 16
  12 +
10 13 @interface LSGAccount : NSObject
11 14  
12 15 @property(nonatomic, assign) LSGAccountType type;
... ... @@ -23,4 +26,4 @@ typedef NS_ENUM(NSInteger, LSGAccountType) {
23 26  
24 27 + (void)deleteAccount:(NSString *)service;
25 28  
26   -@end
27 29 \ No newline at end of file
  30 +@end
ios/GameSDK.framework/Versions/A/Headers/LetsGameAPI.h
Diff comments   View file @ 635b661
... ... @@ -13,7 +13,7 @@ static BOOL isEnableVK = NO;
13 13  
14 14 static BOOL hiddenLogo = NO;
15 15  
16   -static NSString *version = @"3.3.25";
  16 +static NSString *version = @"3.4.2";
17 17  
18 18 @interface LetsGameAPI : NSObject<UIApplicationDelegate>
19 19  
... ... @@ -46,7 +46,7 @@ static NSString *version = @&quot;3.3.25&quot;;
46 46 - (BOOL)handleOpenURL:(NSURL *)url
47 47 sourceApplication:(NSString *)sourceApplication;
48 48  
49   --(void)pay:(NSDictionary*) payInfo handleCallBack:(void (^)()) paySuccessCallback;
  49 +-(void)pay:(NSDictionary*) payInfo handleCallBack:(void (^)()) payAccomplistCallback;
50 50  
51 51 -(void)iap:(NSDictionary*) payInfo forUser:(NSString*) uid handleCallback:(void (^)(NSString* orderId)) callback;
52 52  
... ... @@ -58,4 +58,9 @@ static NSString *version = @&quot;3.3.25&quot;;
58 58  
59 59 -(void)obtainAccessTokenSuccess:(void (^)(NSString *tokenString, NSString *refreshTime, NSString *expirationTime))success
60 60 failure:(void (^)(NSString *errorString))failure;
  61 +
  62 +//获取是否展示安全页面,YES展示侵权页面，NO展示非侵权页面
  63 +-(void)gameObtainSafeSetInfoWithAppId:(NSString *)appId
  64 + ChannelId:(NSString *)channelId
  65 + handleCallBack:(void (^)(BOOL resultStatus))callBack;
61 66 @end
No preview for this file type
ios/GameSDKDemo/GameSDKDemo.xcodeproj/project.pbxproj
Diff comments   View file @ 635b661
... ... @@ -30,9 +30,9 @@
30 30 /* End PBXBuildFile section */
31 31  
32 32 /* Begin PBXContainerItemProxy section */
33   - 75D3C90D1E71461E003AD81B /* PBXContainerItemProxy */ = {
  33 + 75843E401E779780002EC23F /* PBXContainerItemProxy */ = {
34 34 isa = PBXContainerItemProxy;
35   - containerPortal = 75D3C9081E71461E003AD81B /* GameSDK.xcodeproj */;
  35 + containerPortal = 75843E3B1E779780002EC23F /* GameSDK.xcodeproj */;
36 36 proxyType = 2;
37 37 remoteGlobalIDString = 99626194192D9649004FF2E3;
38 38 remoteInfo = GameSDK;
... ... @@ -50,10 +50,10 @@
50 50 3CD53D9C1B81F37900E1B01A /* VKSdkResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = VKSdkResources.bundle; sourceTree = "<group>"; };
51 51 752A5F411CDC826A00C36131 /* GameSDKResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = GameSDKResources.bundle; path = ../../GameSDKResources.bundle; sourceTree = "<group>"; };
52 52 752A5F491CDC8B3200C36131 /* GameSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameSDK.framework; path = ../GameSDK.framework; sourceTree = "<group>"; };
  53 + 75843E3B1E779780002EC23F /* GameSDK.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GameSDK.xcodeproj; path = ../../../GameSDKRelease/GameSDK/GameSDK.xcodeproj; sourceTree = "<group>"; };
53 54 75B72C8E1DAA422000CFACFF /* CoreBlue.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBlue.framework; path = ../CoreBlue.framework; sourceTree = "<group>"; };
54 55 75B72C901DAA422C00CFACFF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
55 56 75B72C921DAA423500CFACFF /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
56   - 75D3C9081E71461E003AD81B /* GameSDK.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GameSDK.xcodeproj; path = ../../../GameSDKRelease/GameSDK/GameSDK.xcodeproj; sourceTree = "<group>"; };
57 57 9934F1AE19303DC6005EF4AB /* GameSDKDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GameSDKDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
58 58 9934F1B119303DC6005EF4AB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
59 59 9934F1B319303DC6005EF4AB /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
... ... @@ -108,15 +108,15 @@
108 108 27019DCE1A208B2300DA560D /* Dependencies */ = {
109 109 isa = PBXGroup;
110 110 children = (
111   - 75D3C9081E71461E003AD81B /* GameSDK.xcodeproj */,
  111 + 75843E3B1E779780002EC23F /* GameSDK.xcodeproj */,
112 112 );
113 113 name = Dependencies;
114 114 sourceTree = "<group>";
115 115 };
116   - 75D3C9091E71461E003AD81B /* Products */ = {
  116 + 75843E3C1E779780002EC23F /* Products */ = {
117 117 isa = PBXGroup;
118 118 children = (
119   - 75D3C90E1E71461E003AD81B /* libGameSDK.a */,
  119 + 75843E411E779780002EC23F /* libGameSDK.a */,
120 120 );
121 121 name = Products;
122 122 sourceTree = "<group>";
... ... @@ -233,8 +233,8 @@
233 233 projectDirPath = "";
234 234 projectReferences = (
235 235 {
236   - ProductGroup = 75D3C9091E71461E003AD81B /* Products */;
237   - ProjectRef = 75D3C9081E71461E003AD81B /* GameSDK.xcodeproj */;
  236 + ProductGroup = 75843E3C1E779780002EC23F /* Products */;
  237 + ProjectRef = 75843E3B1E779780002EC23F /* GameSDK.xcodeproj */;
238 238 },
239 239 );
240 240 projectRoot = "";
... ... @@ -245,11 +245,11 @@
245 245 /* End PBXProject section */
246 246  
247 247 /* Begin PBXReferenceProxy section */
248   - 75D3C90E1E71461E003AD81B /* libGameSDK.a */ = {
  248 + 75843E411E779780002EC23F /* libGameSDK.a */ = {
249 249 isa = PBXReferenceProxy;
250 250 fileType = archive.ar;
251 251 path = libGameSDK.a;
252   - remoteRef = 75D3C90D1E71461E003AD81B /* PBXContainerItemProxy */;
  252 + remoteRef = 75843E401E779780002EC23F /* PBXContainerItemProxy */;
253 253 sourceTree = BUILT_PRODUCTS_DIR;
254 254 };
255 255 /* End PBXReferenceProxy section */
ios/GameSDKDemo/GameSDKDemo.xcodeproj/project.xcworkspace/xcshareddata/GameSDKDemo.xcscmblueprint
Diff comments   View file @ 635b661
... ... @@ -13,7 +13,7 @@
13 13 "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
14 14 "07E954432ED0A61BEECC8FB6AAE1417682E93D30" : "vkbridge\/",
15 15 "8A7E653E5A6F45691CAAAE0CEF6C9451763A2597" : "gumptech-document\/",
16   - "D5E238D0ED0F802759CC8DDF3F39B0D0BFF728D8" : "gumpGameDemo\/",
  16 + "D5E238D0ED0F802759CC8DDF3F39B0D0BFF728D8" : "gamesdk-iosrelease\/",
17 17 "077D999F6C967446D3AED3B840BC4A4A39445F65" : "GameSDKRelease\/"
18 18 },
19 19 "DVTSourceControlWorkspaceBlueprintNameKey" : "GameSDKDemo",
ios/GameSDKDemo/GameSDKDemo.xcodeproj/project.xcworkspace/xcuserdata/yanglele.xcuserdatad/UserInterfaceState.xcuserstate
Diff comments   View file @ 635b661
No preview for this file type
ios/GameSDKDemo/letsgameDemo/LSGAppDelegate.m
Diff comments   View file @ 635b661
... ... @@ -22,9 +22,21 @@
22 22  
23 23 self.window.backgroundColor = [UIColor whiteColor];
24 24 [self.window makeKeyAndVisible];
  25 +
  26 + //显示是否侵权的接口
  27 + [[LetsGameAPI instance] decideIsDebug:1];
  28 + [[LetsGameAPI instance] gameObtainSafeSetInfoWithAppId:@"10056" ChannelId:@"1000" handleCallBack:^(BOOL resultStatus) {
  29 + if (resultStatus) {
  30 + NSLog(@"YES 侵权");
  31 + }else{
  32 + NSLog(@"NO 不侵权");
  33 + }
  34 + }];
  35 +
25 36 [[UIApplication sharedApplication] setStatusBarHidden:YES];
26 37 [[LetsGameAPI instance] registeIapObserver];
27 38  
  39 +
28 40 return YES;
29 41 }
30 42  
ios/GameSDKDemo/letsgameDemo/LSGMainViewController.m
Diff comments   View file @ 635b661
... ... @@ -61,8 +61,7 @@
61 61 iapBtn.titleLabel.font = [UIFont systemFontOfSize:15];
62 62 [iapBtn addTarget:self action:@selector(onIapTest) forControlEvents:UIControlEventTouchUpInside];
63 63 [self.view addSubview:iapBtn];
64   -
65   -
  64 +
66 65 }
67 66  
68 67 - (UILabel *)resultLabel {
... ... @@ -128,8 +127,8 @@
128 127 }
129 128  
130 129 -(void)onIapTest{
131   - [LetsGameAPI instance].appId = @"10022";
132   - [LetsGameAPI instance].appKey = @"93a27b0bd99bac3e68a440b48aa421ab";
  130 + [LetsGameAPI instance].appId = @"10056";
  131 + [LetsGameAPI instance].appKey = @"b59c21a078fde074a6750e91ed19fb21";
133 132 NSMutableDictionary *payInfo = [NSMutableDictionary dictionary];
134 133 [payInfo setValue:@"5001" forKey:@"serverId"];
135 134 [payInfo setValue:@"10010" forKey:@"roleId"];
ios/GameSDKDemo/letsgameDemo/letsgameDemo-Info.plist
Diff comments   View file @ 635b661
... ... @@ -17,7 +17,7 @@
17 17 <key>CFBundlePackageType</key>
18 18 <string>APPL</string>
19 19 <key>CFBundleShortVersionString</key>
20   - <string>1.0</string>
  20 + <string>1.0.1</string>
21 21 <key>CFBundleSignature</key>
22 22 <string>????</string>
23 23 <key>CFBundleURLTypes</key>
... ... @@ -38,7 +38,7 @@
38 38 </dict>
39 39 </array>
40 40 <key>CFBundleVersion</key>
41   - <string>1</string>
  41 + <string>1.1.1</string>
42 42 <key>FacebookAppID</key>
43 43 <string>1401636950118536</string>
44 44 <key>FacebookDisplayName</key>