SDK / GameSDK4-android

Download as
Browse Code »

Commit 41d220c11efda8f6c14e7c4d5b19842d8ea4181b

Authored by 赵康
1 parent d6bc71fcb5
Exists in master

update to 4.1.1:add a paramter to the url of the Web page that fb login

Showing 7 changed files with 26 additions and 7 deletions Side-by-side Diff

GameSDK-release4.1.0.aar
View file @ 41d220c
No preview for this file type
GameSDK-release4.1.1.aar
Diff comments   View file @ 41d220c
No preview for this file type
GameSDKDemo/GameSDKDemo.iml
Diff comments   View file @ 41d220c
... ... @@ -82,15 +82,33 @@
82 82 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
83 83 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
84 84 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
  85 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
85 86 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
  87 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
  88 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
  89 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
  90 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/GameSDK-release4.1.1/jars" />
86 91 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
87 92 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
88 93 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
  94 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
  95 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
  96 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
  97 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
  98 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
  99 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
  100 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
89 101 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
  102 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
  103 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
90 104 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
  105 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
91 106 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
  107 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
92 108 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
  109 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
93 110 <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
  111 + <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
94 112 </content>
95 113 <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
96 114 <orderEntry type="sourceFolder" forTests="false" />
... ... @@ -98,9 +116,7 @@
98 116 <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
99 117 <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
100 118 <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
  119 + <orderEntry type="library" exported="" name="GameSDK-release4.1.1-" level="project" />
101 120 <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
102   - <orderEntry type="module" module-name="GameSDK" exported="" />
103   - <orderEntry type="library" exported="" name="image-cache" level="project" />
104   - <orderEntry type="library" exported="" name="BluePay_3.6.2.0414pro" level="project" />
105 121 </component>
106 122 </module>
107 123 \ No newline at end of file
GameSDKDemo/build.gradle
Diff comments   View file @ 41d220c
... ... @@ -33,6 +33,6 @@ dependencies {
33 33 compile fileTree(dir: 'libs', include: ['*.jar'])
34 34 testCompile 'junit:junit:4.12'
35 35 compile 'com.android.support:appcompat-v7:22.2.0'
36   - compile project(':GameSDK')
37   -// compile(name:'GameSDK-release',ext:'aar')
  36 +// compile project(':GameSDK')
  37 + compile(name:'GameSDK-release4.1.1',ext:'aar')
38 38 }
GameSDKDemo/libs/GameSDK-release4.1.0.aar
View file @ 41d220c
No preview for this file type
GameSDKDemo/libs/GameSDK-release4.1.1.aar
Diff comments   View file @ 41d220c
No preview for this file type
GameSDKDemo/src/main/java/com/gumptech/sdk/demo/MainActivity.java
Diff comments   View file @ 41d220c
... ... @@ -17,6 +17,7 @@ import com.gumptech.sdk.bean.PurchaseResult;
17 17 import com.gumptech.sdk.callback.InitializeCallback;
18 18 import com.gumptech.sdk.callback.LoginStateListener;
19 19 import com.gumptech.sdk.callback.PurchaseCallback;
  20 +import com.gumptech.sdk.passport.fb.FBAccessToken;
20 21  
21 22 public class MainActivity extends Activity implements PurchaseCallback{
22 23  
... ... @@ -27,8 +28,8 @@ public class MainActivity extends Activity implements PurchaseCallback{
27 28  
28 29 private Button btnLoginOrLogout;
29 30  
30   - private String appId = "10056";
31   - private String appKey = "b59c21a078fde074a6750e91ed19fb21";
  31 + private String appId = "10022";
  32 + private String appKey = "93a27b0bd99bac3e68a440b48aa421ab";
32 33 private String sessionKey;
33 34  
34 35 @Override
... ... @@ -92,6 +93,8 @@ public class MainActivity extends Activity implements PurchaseCallback{
92 93 switch(user.getAccountType()){
93 94 case GumpPreference.ACCOUNT_TYPE_FB:
94 95 userType = "Facebook登录";
  96 + String fbToken = FBAccessToken.getCurrentAccessToken().getToken();
  97 + Log.d(TAG,"FBAccessToken:"+fbToken);
95 98 break;
96 99 case GumpPreference.ACCOUNT_TYPE_QUICK_REG:
97 100 userType = "快速登录";