SDK / GameSDK4-android

Browse Code »

Commit 41d220c11efda8f6c14e7c4d5b19842d8ea4181b

Authored by 赵康 2016-11-11 14:47:39 +0800

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 Inline Diff

GameSDK-release4.1.0.aar
GameSDK-release4.1.1.aar
GameSDKDemo/GameSDKDemo.iml
GameSDKDemo/build.gradle
GameSDKDemo/libs/GameSDK-release4.1.0.aar
GameSDKDemo/libs/GameSDK-release4.1.1.aar
GameSDKDemo/src/main/java/com/gumptech/sdk/demo/MainActivity.java

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

 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id=":GameSDKDemo" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../../GameSDK_AS" external.system.id="GRADLE" external.system.module.group="GameSDK_AS" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":GameSDKDemo" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
           <task>generateDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/GameSDK-release4.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="GameSDK-release4.1.1-" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
-    <orderEntry type="module" module-name="GameSDK" exported="" />
-    <orderEntry type="library" exported="" name="image-cache" level="project" />

GameSDKDemo/build.gradle

Diff comments View file @ 41d220c

1	apply plugin: 'com.android.application'	1	apply plugin: 'com.android.application'
2		2
3	repositories{	3	repositories{
4	flatDir{	4	flatDir{
5	dirs 'libs'	5	dirs 'libs'
6	}	6	}
7	}	7	}
8		8
9	android {	9	android {
10	compileSdkVersion 22	10	compileSdkVersion 22
11	buildToolsVersion "22.0.0"	11	buildToolsVersion "22.0.0"
12		12
13		13
14	defaultConfig {	14	defaultConfig {
15	minSdkVersion 9	15	minSdkVersion 9
16	targetSdkVersion 22	16	targetSdkVersion 22
17	versionCode 1	17	versionCode 1
18	versionName "1.0"	18	versionName "1.0"
19	}	19	}
20		20
21	buildTypes {	21	buildTypes {
22	release {	22	release {
23	minifyEnabled false	23	minifyEnabled false
24	proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'	24	proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
25	}	25	}
26	}	26	}
27	lintOptions{	27	lintOptions{
28	abortOnError false	28	abortOnError false
29	}	29	}
30	}	30	}
31		31
32	dependencies {	32	dependencies {
33	compile fileTree(dir: 'libs', include: ['*.jar'])	33	compile fileTree(dir: 'libs', include: ['*.jar'])
34	testCompile 'junit:junit:4.12'	34	testCompile 'junit:junit:4.12'
35	compile 'com.android.support:appcompat-v7:22.2.0'	35	compile 'com.android.support:appcompat-v7:22.2.0'
36	compile project(':GameSDK')	36	// compile project(':GameSDK')
37	// compile(name:'GameSDK-release',ext:'aar')	37	compile(name:'GameSDK-release4.1.1',ext:'aar')
38	}	38	}
39		39

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

 package com.gumptech.sdk.demo;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.text.ClipboardManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.gumptech.sdk.GumpPreference;
 import com.gumptech.sdk.GumpSDK;
 import com.gumptech.sdk.bean.GumpUser;
 import com.gumptech.sdk.bean.PurchaseResult;
 import com.gumptech.sdk.callback.InitializeCallback;
 import com.gumptech.sdk.callback.LoginStateListener;
 import com.gumptech.sdk.callback.PurchaseCallback;
+import com.gumptech.sdk.passport.fb.FBAccessToken;
 public class MainActivity extends Activity  implements PurchaseCallback{
     private static final String TAG = "MainActivity";
     private TextView tvVersion;
     private TextView userInfo;
     private Button btnLoginOrLogout;
-    private String appId = "10056";
+    private String appId = "10022";
-    private String appKey = "b59c21a078fde074a6750e91ed19fb21";
+    private String appKey = "93a27b0bd99bac3e68a440b48aa421ab";
     private String sessionKey;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         tvVersion = (TextView) findViewById(R.id.version);
         userInfo = (TextView) findViewById(R.id.user_info);
         btnLoginOrLogout = (Button) findViewById(R.id.login_or_logout);
         btnLoginOrLogout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (btnLoginOrLogout.getTag() == null || (Integer) btnLoginOrLogout.getTag() == 0)
                     GumpSDK.start(MainActivity.this);
                 else
                     GumpSDK.logout(MainActivity.this);
             }
         });
         findViewById(R.id.pay).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Bundle payInfo = new Bundle();
                 payInfo.putString("nick", "thi");
                 payInfo.putString("product", "test2");
                 payInfo.putFloat("amount", 0.1f);
                 payInfo.putString("extraInfo", "This is demo!");
                 payInfo.putString("serverId", "100");
                 payInfo.putString("sessionKey", sessionKey);
                 GumpSDK.pay(MainActivity.this, payInfo, MainActivity.this);
             }
         });
         /**
          * 设置否是打印debug日志
          */
         GumpSDK.getSettings().enableDebugLogging(true);
         /**
          * 设置是否启用facebook登录
          */
         GumpSDK.getSettings().setFBEnable(true);
         /**
          * 设置是否启用Vk登录
          */
         GumpSDK.getSettings().setVKEnable(false);
         /**
          * 设置屏幕方向
          */
         GumpSDK.getSettings().setScreenLandscape(true);
         /**
          * 设置用户登录状态监听器
          */
         GumpSDK.setUserStateListener(new LoginStateListener() {
             @Override
             public void onLoginSuccess(GumpUser user) {
             	ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
             	cm.setText(user.getSessionKey());
                 sessionKey = user.getSessionKey();
                 String userType=null;
                 switch(user.getAccountType()){
                 case GumpPreference.ACCOUNT_TYPE_FB:
                 	userType = "Facebook登录";
+                    String fbToken = FBAccessToken.getCurrentAccessToken().getToken();
+                    Log.d(TAG,"FBAccessToken:"+fbToken);
                 	break;
                 case GumpPreference.ACCOUNT_TYPE_QUICK_REG:
                 	userType = "快速登录";
                 	break;
                 case GumpPreference.ACCOUNT_TYPE_REG:
                 	userType = "gump注册用户";
                 	break;
                 case GumpPreference.ACCOUNT_TYPE_VK:
                 	userType = "vk登录";
                 	break;
                 }
                 userInfo.setText(" Userid:" + user.getUid() + "\n accountType:(" + user.getAccountType()+") "+userType + "\n sessionKey:" + user.getSessionKey());
                 btnLoginOrLogout.setText("Logout");
                 btnLoginOrLogout.setTag(1);
             }
             @Override
 			public void onLoginFailed(int code, String msg) {
                 userInfo.setText(msg);
                 Toast.makeText(MainActivity.this, "Login failed:code="+code+",message="+msg, Toast.LENGTH_SHORT).show();
             }
             @Override
             public void onLoginCanceled() {
                 Toast.makeText(MainActivity.this, "operate be canceled", Toast.LENGTH_SHORT).show();
             }
             @Override
             public void onLogout() {
                 btnLoginOrLogout.setText("Login");
                 btnLoginOrLogout.setTag(0);
                 userInfo.setText("User is logout");
             }
         });
         /**
          * 初始化sdk
          */
         GumpSDK.init(getApplicationContext(), appId, appKey, "1000", new InitializeCallback() {
             @Override
             public void initComplete(int result) {
                 if (result == GumpSDK.CODE.OK) {
                     btnLoginOrLogout.setEnabled(true);
                 }
             }
         });
         tvVersion.setText("SDK Version:" + GumpSDK.getVersion());
     }
     @Override
     public void onPurchaseCompleted(PurchaseResult result) {
         Log.i(TAG,"purchase completed");
     }
     @Override
     public void onPurchaseError(int code, String msg) {
         Log.i(TAG,"purchase error");
     }
     @Override
     public void onPurchaseCanceled() {
         Log.i(TAG,"purchase canceled");
     }
 }