Commit 0a6d22fa0df82b92c327fb6080c33fbcead2ab3e

Authored by alexYang
1 parent 8dcc0d9c01
Exists in master

FB自动登录返回问题

Showing 9 changed files with 27 additions and 20 deletions Side-by-side Diff

... ... @@ -2,8 +2,8 @@
2 2  
3 3  
4 4 接入手册
5   -V 3.3.21
6   -2016年11月16日
  5 +V 3.3.22
  6 +2016年12月12日
7 7  
8 8 ## 概述
9 9 #### 本SDK提供gump账号,fb账号,vk账号三种账号登录,iap支付和第三方支付两种支付功能,其中gump账号登录和fb账号登录功能为必须接入,支付可根据需要选择性接入。
ios/GameSDK.framework/Versions/A/GameSDK
No preview for this file type
ios/GameSDK.framework/Versions/A/Headers/LetsGameAPI.h
... ... @@ -13,7 +13,7 @@ static BOOL isEnableVK = NO;
13 13  
14 14 static BOOL hiddenLogo = NO;
15 15  
16   -static NSString *version = @"3.3.21";
  16 +static NSString *version = @"3.3.22";
17 17  
18 18 @interface LetsGameAPI : NSObject<UIApplicationDelegate>
19 19  
No preview for this file type
ios/GameSDKDemo/GameSDKDemo.xcodeproj/project.pbxproj
... ... @@ -30,9 +30,9 @@
30 30 /* End PBXBuildFile section */
31 31  
32 32 /* Begin PBXContainerItemProxy section */
33   - 75B72CD31DAE41E200CFACFF /* PBXContainerItemProxy */ = {
  33 + 754D97351DFEA9B10075C7C1 /* PBXContainerItemProxy */ = {
34 34 isa = PBXContainerItemProxy;
35   - containerPortal = 75B72CCE1DAE41E200CFACFF /* GameSDK.xcodeproj */;
  35 + containerPortal = 754D97301DFEA9B10075C7C1 /* 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 + 754D97301DFEA9B10075C7C1 /* 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   - 75B72CCE1DAE41E200CFACFF /* GameSDK.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GameSDK.xcodeproj; path = ../../../releaseIosGameSDK/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   - 75B72CCE1DAE41E200CFACFF /* GameSDK.xcodeproj */,
  111 + 754D97301DFEA9B10075C7C1 /* GameSDK.xcodeproj */,
112 112 );
113 113 name = Dependencies;
114 114 sourceTree = "<group>";
115 115 };
116   - 75B72CCF1DAE41E200CFACFF /* Products */ = {
  116 + 754D97311DFEA9B10075C7C1 /* Products */ = {
117 117 isa = PBXGroup;
118 118 children = (
119   - 75B72CD41DAE41E200CFACFF /* libGameSDK.a */,
  119 + 754D97361DFEA9B10075C7C1 /* 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 = 75B72CCF1DAE41E200CFACFF /* Products */;
237   - ProjectRef = 75B72CCE1DAE41E200CFACFF /* GameSDK.xcodeproj */;
  236 + ProductGroup = 754D97311DFEA9B10075C7C1 /* Products */;
  237 + ProjectRef = 754D97301DFEA9B10075C7C1 /* 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   - 75B72CD41DAE41E200CFACFF /* libGameSDK.a */ = {
  248 + 754D97361DFEA9B10075C7C1 /* libGameSDK.a */ = {
249 249 isa = PBXReferenceProxy;
250 250 fileType = archive.ar;
251 251 path = libGameSDK.a;
252   - remoteRef = 75B72CD31DAE41E200CFACFF /* PBXContainerItemProxy */;
  252 + remoteRef = 754D97351DFEA9B10075C7C1 /* PBXContainerItemProxy */;
253 253 sourceTree = BUILT_PRODUCTS_DIR;
254 254 };
255 255 /* End PBXReferenceProxy section */
ios/GameSDKDemo/GameSDKDemo.xcodeproj/project.xcworkspace/xcshareddata/GameSDKDemo.xcscmblueprint
... ... @@ -14,7 +14,7 @@
14 14 "07E954432ED0A61BEECC8FB6AAE1417682E93D30" : "vkbridge\/",
15 15 "8A7E653E5A6F45691CAAAE0CEF6C9451763A2597" : "gumptech-document\/",
16 16 "D5E238D0ED0F802759CC8DDF3F39B0D0BFF728D8" : "gamesdk-iosrelease\/",
17   - "077D999F6C967446D3AED3B840BC4A4A39445F65" : "releaseIosGameSDK\/"
  17 + "077D999F6C967446D3AED3B840BC4A4A39445F65" : "GameSDKRelease\/"
18 18 },
19 19 "DVTSourceControlWorkspaceBlueprintNameKey" : "GameSDKDemo",
20 20 "DVTSourceControlWorkspaceBlueprintVersion" : 204,
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
... ... @@ -61,6 +61,13 @@
61 61 ReferencedContainer = "container:GameSDKDemo.xcodeproj">
62 62 </BuildableReference>
63 63 </BuildableProductRunnable>
  64 + <EnvironmentVariables>
  65 + <EnvironmentVariable
  66 + key = "OS_ACTIVITY_MODE"
  67 + value = "disable"
  68 + isEnabled = "YES">
  69 + </EnvironmentVariable>
  70 + </EnvironmentVariables>
64 71 <AdditionalOptions>
65 72 </AdditionalOptions>
66 73 </LaunchAction>
ios/GameSDKDemo/letsgameDemo/letsgameDemo-Info.plist
... ... @@ -2,11 +2,6 @@
2 2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 3 <plist version="1.0">
4 4 <dict>
5   - <key>NSAppTransportSecurity</key>
6   - <dict>
7   - <key>NSAllowsArbitraryLoads</key>
8   - <true/>
9   - </dict>
10 5 <key>CFBundleDevelopmentRegion</key>
11 6 <string>en</string>
12 7 <key>CFBundleDisplayName</key>
... ... @@ -50,6 +45,11 @@
50 45 <string>letsgameDemo</string>
51 46 <key>LSRequiresIPhoneOS</key>
52 47 <true/>
  48 + <key>NSAppTransportSecurity</key>
  49 + <dict>
  50 + <key>NSAllowsArbitraryLoads</key>
  51 + <true/>
  52 + </dict>
53 53 <key>UIRequiredDeviceCapabilities</key>
54 54 <array>
55 55 <string>armv7</string>
... ... @@ -58,8 +58,8 @@
58 58 <true/>
59 59 <key>UISupportedInterfaceOrientations</key>
60 60 <array>
61   - <string>UIInterfaceOrientationLandscapeRight</string>
62 61 <string>UIInterfaceOrientationLandscapeLeft</string>
  62 + <string>UIInterfaceOrientationLandscapeRight</string>
63 63 </array>
64 64 </dict>
65 65 </plist>