Commit c4a5d1b8000721c5538fe09acb535cf4c1cd7f82

Authored by 赵康
1 parent 2bb1f96d24
Exists in master

update to version 4.4.0

Showing 6 changed files with 32 additions and 39 deletions Side-by-side Diff

GameSDK-release4.3.4.aar
No preview for this file type
GameSDKDemo/build.gradle
... ... @@ -26,14 +26,16 @@ if (keystoreFilepath) {
26 26 */
27 27  
28 28 repositories {
29   - flatDir {
30   - dirs 'libs'
  29 + maven{
  30 + url "http://117.50.8.198:8081/nexus/content/repositories/sdk"
31 31 }
  32 + jcenter()
  33 + google()
32 34 }
33 35  
34 36 android {
35 37 compileSdkVersion 22
36   - buildToolsVersion "26.0.2"
  38 + buildToolsVersion "27.0.3"
37 39  
38 40 signingConfigs {
39 41 release {
... ... @@ -45,7 +47,7 @@ android {
45 47 }
46 48  
47 49 defaultConfig {
48   - minSdkVersion 9
  50 + minSdkVersion 14
49 51 targetSdkVersion 22
50 52 versionCode 5
51 53 versionName "1.3"
... ... @@ -69,11 +71,13 @@ android {
69 71 }
70 72  
71 73 dependencies {
72   - compile fileTree(include: ['*.jar'], dir: 'libs')
73   - testCompile 'junit:junit:4.12'
74   - compile 'com.android.support:appcompat-v7:22.2.0'
  74 + implementation fileTree(include: ['*.jar'], dir: 'libs')
  75 + testImplementation 'junit:junit:4.12'
  76 + implementation 'com.android.support:appcompat-v7:22.2.0'
75 77 //微信
76   - compile 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
77   -// compile project(':GameSDK')
78   - compile(name: 'GameSDK-release4.3.4', ext: 'aar')
  78 + implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.1.4'
  79 + //VK
  80 +// implementation 'com.gumptech:VKsdk:1.5.4'
  81 +// implementation project(':GameSDK')
  82 + implementation 'com.gumptech.sdk:GameSDK:4.4.0'
79 83 }
GameSDKDemo/libs/GameSDK-release4.3.4.aar
No preview for this file type
GameSDKDemo/src/main/AndroidManifest.xml
... ... @@ -7,16 +7,11 @@
7 7 android:targetSdkVersion="20"/>
8 8  
9 9 <uses-permission android:name="android.permission.INTERNET"/>
10   - <uses-permission android:name="android.permission.BLUETOOTH"/>
11 10 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
12   - <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
13 11 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
14   - <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
15 12 <!-- Danger Level permission-->
16 13 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
17 14 <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
18   - <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
19   - <uses-permission android:name="android.permission.SEND_SMS"/>
20 15  
21 16 <!-- VERY IMPORTANT! Don't forget this permission, or in-app billing won't work. -->
22 17 <uses-permission android:name="com.android.vending.BILLING"/>
... ... @@ -24,7 +19,6 @@
24 19 <application
25 20 android:allowBackup="true"
26 21 android:icon="@drawable/ic_launcher"
27   -
28 22 android:label="@string/app_name">
29 23 <activity
30 24 android:name="com.gumptech.sdk.demo.MainActivity"
GameSDKDemo/src/main/java/com/gumptech/sdk/demo/MainActivity.java
1 1 package com.gumptech.sdk.demo;
2 2  
3 3 import android.app.Activity;
4   -import android.content.Context;
5 4 import android.os.Bundle;
6   -import android.text.ClipboardManager;
7 5 import android.util.Log;
8 6 import android.view.View;
9 7 import android.widget.Button;
... ... @@ -33,7 +31,7 @@ public class MainActivity extends Activity implements PurchaseCallback {
33 31  
34 32 private String appId = "100";
35 33 private String appKey = "f899139df5e1059396431415e770c6dd";
36   - private String sessionKey;
  34 + private GumpUser gumpUser;
37 35  
38 36  
39 37 @Override
... ... @@ -64,7 +62,7 @@ public class MainActivity extends Activity implements PurchaseCallback {
64 62 payInfo.putString("extraInfo", "This is demo!");
65 63 payInfo.putString("serverId", "100");
66 64 payInfo.putString("roleId", "100123");
67   - payInfo.putString("sessionKey", sessionKey);
  65 + payInfo.putString("sessionKey", gumpUser.getSessionKey().getToken());
68 66 GumpSDK.pay(MainActivity.this, payInfo, MainActivity.this);
69 67 }
70 68 });
... ... @@ -125,9 +123,9 @@ public class MainActivity extends Activity implements PurchaseCallback {
125 123 GumpSDK.setUserStateListener(new LoginStateListener() {
126 124 @Override
127 125 public void onLoginSuccess(GumpUser user) {
128   - ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
129   - cm.setText(user.getSessionKey());
130   - sessionKey = user.getSessionKey();
  126 +// ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
  127 +// cm.setText(user.getSessionKey());
  128 + gumpUser = user;
131 129 String userType = null;
132 130 switch (user.getAccountType()) {
133 131 case GumpPreference.ACCOUNT_TYPE_FB:
... ... @@ -154,7 +152,7 @@ public class MainActivity extends Activity implements PurchaseCallback {
154 152 userType = "Line登录";
155 153 break;
156 154 }
157   - userInfo.setText(" Userid:" + user.getUid() + "\n accountType:(" + user.getAccountType() + ") " + userType + "\n sessionKey:" + user.getSessionKey());
  155 + userInfo.setText(" Userid:" + user.getUid() + "\n accountType:(" + user.getAccountType() + ") " + userType + "\n sessionKey:" + user.getSessionKey().getToken());
158 156 btnLoginOrLogout.setText("Logout");
159 157 btnLoginOrLogout.setTag(1);
160 158 }
1 1 # Gump SDK 4 for Android接入文档
2 2  
3   -V4.3.3
4   -2018年2月08日
  3 +V4.4.0
  4 +2018年5月08日
5 5  
6 6 ## 版本概述
7 7  
8 8 此版本为使用AndroidStudio开发的版本,一改eclipse的工程依赖方式,使用aar的方式提供sdk接入包,除功能外,相对上一版本没有继承关系,请按此文档描述接入.
9 9  
10   -此SDK适用android2.3以上系统.
  10 +此SDK适用android4.0以上系统.
11 11  
12 12 ## 第一章 接入指南
13 13 ### 1.依赖导入
... ... @@ -15,36 +15,31 @@ V4.3.3
15 15 以下为必须项
16 16  
17 17 repositories{
18   - flatDir{
19   - dirs 'libs'
20   - }
  18 + maven{
  19 + url "http://117.50.8.198:8081/nexus/content/repositories/sdk"
  20 + }
21 21 }
22 22 dependencies {
23   - compile(name:'GameSDK-releaseXXX',ext:'aar')
  23 + implementation 'com.gumptech.sdk:GameSDK:4.4.0'
24 24 }
25 25  
26 26  
27 27 可选接入vk登录时,需要导入vkLibrary工程,并配置模块依赖,如下
28 28  
29   - compile project(':vksdk_library')
  29 + implementation 'com.gumptech:VKsdk:1.5.4'
30 30  
31 31 选择接入微信登录时,需要增加微信依赖,如下:
32 32  
33   - compile 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
  33 + implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.1.4'
34 34  
35 35 ### 2.修改AndroidManifest.xml文件
36 36 首先添加必要的权限,如下所示:
37 37  
38 38 <uses-permission android:name="android.permission.INTERNET" />
39   - <uses-permission android:name="android.permission.READ_PHONE_STATE" />
40   - <uses-permission android:name="android.permission.BLUETOOTH" />
41 39 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
42   - <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
43 40 <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
44 41 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
45 42 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
46   - <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
47   - <uses-permission android:name="android.permission.SEND_SMS"/>
48 43 <!-- VERY IMPORTANT! Don't forget this permission, or in-app billing won't work. -->
49 44 <uses-permission android:name="com.android.vending.BILLING" />
50 45  
... ... @@ -154,7 +149,7 @@ InitializeCallback为初始化回调接口,此接口只有一个回调方法init
154 149  
155 150 gumpUser.getUid();//获取用户的userid,此Id标识唯一用户!
156 151 gumpUser.getAccountType();//用户类型,此类型数据可从GumpPreference常量获取
157   - gumpUser.getSessionKey();//登录的sesionKey
  152 + gumpUser.getSessionKey();//登录的sessionKey对象,获取sessionKey字符串请使用此对象的getToken()方法
158 153  
159 154 ***注意:若需要使用微信登录,需要在packageName.wxapi下增加一个名为WXEntryActivity并继承com.gumptech.sdk.WXCallbackActivity的Activity,并参考AndroidManifest.xml设置的说明,做相应的配置,packageName为应用的包名,此Activity不须任何实现。***
160 155  
... ... @@ -223,6 +218,7 @@ InitializeCallback为初始化回调接口,此接口只有一个回调方法init
223 218 |SDKSettings.THIRD_SUPPORT_GOOGLE|Google登录 |
224 219 |SDKSettings.THIRD_SUPPORT_LINE |Line登录 |
225 220 |SDKSettings.THIRD_SUPPORT_VK |VK登录 |
  221 + |SDKSettings.THIRD_SUPPORT_WECHAT|微信登录 |
226 222 ### 2.登录账户类型
227 223 | 常量字段 | 说明 |
228 224 |-------------------------------------|-------------|
... ... @@ -232,6 +228,7 @@ InitializeCallback为初始化回调接口,此接口只有一个回调方法init
232 228 |GumpPreference.ACCOUNT_TYPE_GOOGLE |Google用户 |
233 229 |GumpPreference.ACCOUNT_TYPE_LINE |Line用户 |
234 230 |GumpPreference.ACCOUNT_TYPE_VK |VK用户 |
  231 + |GumpPreference.ACCOUNT_TYPE_WECHAT |微信用户 |
235 232  
236 233 ## 第三章 常见问题
237 234 ### 问题1: 如何避免混淆对SDK的影响?