SDK / GameSDK4-android

Download as
Browse Code »

Commit 656f5f9fdd6c19eb1c4de09dede6691b04ed22b7

Authored by 赵康
1 parent 0ea573a866
Exists in master

merge payment v3 and v4 in one package

Showing 8 changed files with 42 additions and 15 deletions Side-by-side Diff

GameSDK-release4.1.2.aar
View file @ 656f5f9
No preview for this file type
GameSDK-release4.1.3.aar
Diff comments   View file @ 656f5f9
No preview for this file type
GameSDKDemo/GameSDKDemo.iml
Diff comments   View file @ 656f5f9
... ... @@ -66,14 +66,6 @@
66 66 <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
67 67 <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
68 68 <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
69   - <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
70   - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
71   - <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
72   - <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
73   - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
74   - <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
75   - <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
76   - <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
77 69 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
78 70 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
79 71 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
... ... @@ -82,16 +74,39 @@
82 74 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
83 75 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
84 76 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
  77 + <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
  78 + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
  79 + <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
  80 + <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
  81 + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
  82 + <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
  83 + <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
  84 + <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
  85 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
85 86 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
86   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/GameSDK-release4.1.1/jars" />
  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" />
87 90 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
88 91 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
89 92 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
  93 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
  94 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
  95 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
  96 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
  97 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
  98 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
  99 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
90 100 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
  101 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
91 102 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
  103 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
92 104 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
  105 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
93 106 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
  107 + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
94 108 <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
  109 + <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
95 110 </content>
96 111 <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
97 112 <orderEntry type="sourceFolder" forTests="false" />
... ... @@ -99,7 +114,9 @@
99 114 <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
100 115 <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
101 116 <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
102   - <orderEntry type="library" exported="" name="GameSDK-release4.1.1-" level="project" />
103 117 <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
  118 + <orderEntry type="module" module-name="GameSDK" exported="" />
  119 + <orderEntry type="library" exported="" name="image-cache" level="project" />
  120 + <orderEntry type="library" exported="" name="BluePay_3.6.2.0414pro" level="project" />
104 121 </component>
105 122 </module>
106 123 \ No newline at end of file
GameSDKDemo/build.gradle
Diff comments   View file @ 656f5f9
... ... @@ -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-release4.1.2',ext:'aar')
  36 + compile project(':GameSDK')
  37 +// compile(name:'GameSDK-release4.1.3',ext:'aar')
38 38 }
GameSDKDemo/libs/GameSDK-release4.1.2.aar
View file @ 656f5f9
No preview for this file type
GameSDKDemo/libs/GameSDK-release4.1.3.aar
Diff comments   View file @ 656f5f9
No preview for this file type
GameSDKDemo/src/main/java/com/gumptech/sdk/demo/MainActivity.java
Diff comments   View file @ 656f5f9
... ... @@ -12,6 +12,7 @@ import android.widget.Toast;
12 12  
13 13 import com.gumptech.sdk.GumpPreference;
14 14 import com.gumptech.sdk.GumpSDK;
  15 +import com.gumptech.sdk.PaymentVersion;
15 16 import com.gumptech.sdk.bean.GumpUser;
16 17 import com.gumptech.sdk.bean.PurchaseResult;
17 18 import com.gumptech.sdk.callback.InitializeCallback;
... ... @@ -54,7 +55,6 @@ public class MainActivity extends Activity implements PurchaseCallback{
54 55 @Override
55 56 public void onClick(View v) {
56 57 Bundle payInfo = new Bundle();
57   - payInfo.putString("nick", "thi");
58 58 payInfo.putString("product", "test2");
59 59 payInfo.putFloat("amount", 0.1f);
60 60 payInfo.putString("extraInfo", "This is demo!");
... ... @@ -79,6 +79,12 @@ public class MainActivity extends Activity implements PurchaseCallback{
79 79 * 设置屏幕方向
80 80 */
81 81 GumpSDK.getSettings().setScreenLandscape(true);
  82 +
  83 + /**
  84 + * 设置支付版本
  85 + */
  86 + GumpSDK.getSettings().setPaymentVersion(PaymentVersion.V4);
  87 +
82 88 /**
83 89 * 设置用户登录状态监听器
84 90 */
1 1 # Gump SDK 4 for Android接入文档
2 2  
3   -V4.1.0
4   -2016年11月09日
  3 +V4.1.3
  4 +2017年1月12日
5 5  
6 6 ## 版本概述
7 7  
... ... @@ -102,6 +102,10 @@ V4.1.0
102 102 GumpSDK.getSettings().setFBEnable(true);
103 103 GumpSDK.getSettings().setVKEnable(true);
104 104  
  105 +*若要使用V4版支付请设置
  106 +
  107 + GumpSDK.getSettings().setPaymentVersion(PaymentVersion.V4);
  108 +
105 109 #### 1.调用GumpSDK前需要执行初始化。
106 110  
107 111 若不需要分渠道