Commit d42a066802cdec2911b2b7c27c603b2580a579b4
1 parent
c51ca89cac
Exists in
master
remove wechat login type,add initialize button
Showing 6 changed files with 39 additions and 62 deletions Side-by-side Diff
GameSDKDemo/build.gradle
| ... | ... | @@ -75,9 +75,9 @@ dependencies { |
| 75 | 75 | testImplementation 'junit:junit:4.12' |
| 76 | 76 | implementation 'com.android.support:appcompat-v7:26.1.0' |
| 77 | 77 | //微信 |
| 78 | - implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.1.4' | |
| 78 | + implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.1.4' | |
| 79 | 79 | //VK |
| 80 | 80 | implementation 'com.gumptech:VKsdk:1.5.4' |
| 81 | 81 | // implementation project(':GameSDK') |
| 82 | - implementation 'com.gumptech.sdk:GameSDK:4.5.6' | |
| 82 | + implementation 'com.gumptech.sdk:GameSDK:4.5.8' | |
| 83 | 83 | } |
GameSDKDemo/src/main/AndroidManifest.xml
| ... | ... | @@ -10,7 +10,6 @@ |
| 10 | 10 | <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> |
| 11 | 11 | <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> |
| 12 | 12 | <!-- Danger Level permission--> |
| 13 | - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> | |
| 14 | 13 | |
| 15 | 14 | <!-- VERY IMPORTANT! Don't forget this permission, or in-app billing won't work. --> |
| 16 | 15 | <uses-permission android:name="com.android.vending.BILLING"/> |
| ... | ... | @@ -54,19 +53,8 @@ |
| 54 | 53 | android:scheme="gump10031"/> |
| 55 | 54 | </intent-filter> |
| 56 | 55 | </activity> |
| 57 | - <activity | |
| 58 | - android:name="com.gumptech.sdk.ExchangeWindow" | |
| 59 | - android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout" | |
| 60 | - android:theme="@style/Theme.WinForExchange"> | |
| 61 | - </activity> | |
| 62 | - | |
| 63 | - <service android:name="com.gumptech.sdk.PushService"> | |
| 64 | - </service> | |
| 65 | 56 | |
| 66 | 57 | <!--wechat--> |
| 67 | - <activity | |
| 68 | - android:name=".wxapi.WXEntryActivity" | |
| 69 | - android:exported="true"></activity> | |
| 70 | 58 | <!-- vk --> |
| 71 | 59 | <!-- <activity android:name="com.vk.com.gumptech.sdk.VKOpenAuthActivity" /> --> |
| 72 | 60 | <!-- <activity --> |
GameSDKDemo/src/main/java/com/gumptech/sdk/demo/MainActivity.java
| ... | ... | @@ -30,6 +30,7 @@ public class MainActivity extends Activity implements PurchaseCallback { |
| 30 | 30 | private TextView userInfo; |
| 31 | 31 | |
| 32 | 32 | private Button btnLoginOrLogout; |
| 33 | + private Button btnInit; | |
| 33 | 34 | |
| 34 | 35 | private String appId = "100"; |
| 35 | 36 | private String appKey = "f899139df5e1059396431415e770c6dd"; |
| ... | ... | @@ -44,6 +45,7 @@ public class MainActivity extends Activity implements PurchaseCallback { |
| 44 | 45 | tvVersion = findViewById(R.id.version); |
| 45 | 46 | userInfo = findViewById(R.id.user_info); |
| 46 | 47 | btnLoginOrLogout = findViewById(R.id.login_or_logout); |
| 48 | + btnInit = findViewById(R.id.init); | |
| 47 | 49 | btnLoginOrLogout.setOnClickListener(new View.OnClickListener() { |
| 48 | 50 | |
| 49 | 51 | @Override |
| ... | ... | @@ -54,6 +56,24 @@ public class MainActivity extends Activity implements PurchaseCallback { |
| 54 | 56 | GumpSDK.logout(MainActivity.this); |
| 55 | 57 | } |
| 56 | 58 | }); |
| 59 | + btnInit.setOnClickListener(new View.OnClickListener() { | |
| 60 | + @Override | |
| 61 | + public void onClick(View v) { | |
| 62 | + btnInit.setEnabled(false); | |
| 63 | + GumpSDK.init(getApplicationContext(), appId, appKey, "1000", new InitializeCallback() { | |
| 64 | + @Override | |
| 65 | + public void initComplete(int result) { | |
| 66 | + if (result == GumpSDK.CODE.OK) { | |
| 67 | + btnLoginOrLogout.setEnabled(true); | |
| 68 | + userInfo.setText("initialization has finished"); | |
| 69 | + } else { | |
| 70 | + btnInit.setEnabled(true); | |
| 71 | + userInfo.setText("initialization has error"); | |
| 72 | + } | |
| 73 | + } | |
| 74 | + }); | |
| 75 | + } | |
| 76 | + }); | |
| 57 | 77 | findViewById(R.id.pay).setOnClickListener(new View.OnClickListener() { |
| 58 | 78 | |
| 59 | 79 | @Override |
| ... | ... | @@ -98,11 +118,6 @@ public class MainActivity extends Activity implements PurchaseCallback { |
| 98 | 118 | */ |
| 99 | 119 | // GumpSDK.getSettings().requestThirdSupport(SDKSettings.THIRD_SUPPORT_VK); |
| 100 | 120 | |
| 101 | - /** | |
| 102 | - * 设置启用Wechat登录 | |
| 103 | - * | |
| 104 | - */ | |
| 105 | -// GumpSDK.getSettings().requestThirdSupport(SDKSettings.THIRD_SUPPORT_WECHAT); | |
| 106 | 121 | |
| 107 | 122 | /** |
| 108 | 123 | * 设置启用google登录 |
| ... | ... | @@ -150,9 +165,6 @@ public class MainActivity extends Activity implements PurchaseCallback { |
| 150 | 165 | case GumpPreference.ACCOUNT_TYPE_GOOGLE: |
| 151 | 166 | userType = "google 登录"; |
| 152 | 167 | break; |
| 153 | - case GumpPreference.ACCOUNT_TYPE_WECHAT: | |
| 154 | - userType = "微信登录"; | |
| 155 | - break; | |
| 156 | 168 | case GumpPreference.ACCOUNT_TYPE_LINE: |
| 157 | 169 | userType = "Line登录"; |
| 158 | 170 | break; |
| ... | ... | @@ -199,8 +211,11 @@ public class MainActivity extends Activity implements PurchaseCallback { |
| 199 | 211 | public void initComplete(int result) { |
| 200 | 212 | if (result == GumpSDK.CODE.OK) { |
| 201 | 213 | btnLoginOrLogout.setEnabled(true); |
| 202 | - | |
| 214 | + userInfo.setText("initialization has finished"); | |
| 203 | 215 | //checkRisk(); |
| 216 | + } else { | |
| 217 | + btnInit.setEnabled(true); | |
| 218 | + userInfo.setText("initialization has error"); | |
| 204 | 219 | } |
| 205 | 220 | } |
| 206 | 221 | }); |
GameSDKDemo/src/main/java/com/gumptech/sdk/demo/wxapi/WXEntryActivity.java
| ... | ... | @@ -1,18 +0,0 @@ |
| 1 | -package com.gumptech.sdk.demo.wxapi; | |
| 2 | - | |
| 3 | -import android.os.Bundle; | |
| 4 | -import android.support.annotation.Nullable; | |
| 5 | - | |
| 6 | -import com.gumptech.sdk.WXCallbackActivity; | |
| 7 | - | |
| 8 | -/** | |
| 9 | - * Created by King on 2018/2/7. | |
| 10 | - */ | |
| 11 | - | |
| 12 | -public class WXEntryActivity extends WXCallbackActivity { | |
| 13 | - | |
| 14 | - @Override | |
| 15 | - protected void onCreate(@Nullable Bundle bundle) { | |
| 16 | - super.onCreate(bundle); | |
| 17 | - } | |
| 18 | -} |
GameSDKDemo/src/main/res/layout/activity_main.xml
| ... | ... | @@ -19,6 +19,14 @@ |
| 19 | 19 | android:textColor="@android:color/black"/> |
| 20 | 20 | |
| 21 | 21 | <Button |
| 22 | + android:id="@+id/init" | |
| 23 | + android:layout_width="match_parent" | |
| 24 | + android:layout_height="wrap_content" | |
| 25 | + android:backgroundTint="@color/g_color" | |
| 26 | + android:enabled="false" | |
| 27 | + android:text="Initialize"/> | |
| 28 | + | |
| 29 | + <Button | |
| 22 | 30 | android:id="@+id/login_or_logout" |
| 23 | 31 | android:layout_width="match_parent" |
| 24 | 32 | android:layout_height="wrap_content" |
README.md
| 1 | 1 | # Gump SDK 4 for Android接入文档 |
| 2 | 2 | |
| 3 | -V4.5.6 | |
| 4 | -2018年9月18日 | |
| 3 | +V4.5.8 | |
| 4 | +2018年9月20日 | |
| 5 | 5 | |
| 6 | 6 | ## 版本概述 |
| 7 | 7 | |
| ... | ... | @@ -19,7 +19,7 @@ V4.5.6 |
| 19 | 19 | } |
| 20 | 20 | } |
| 21 | 21 | dependencies { |
| 22 | - implementation 'com.gumptech.sdk:GameSDK:4.5.6' | |
| 22 | + implementation 'com.gumptech.sdk:GameSDK:4.5.8' | |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
| ... | ... | @@ -37,7 +37,6 @@ V4.5.6 |
| 37 | 37 | <uses-permission android:name="android.permission.INTERNET" /> |
| 38 | 38 | <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> |
| 39 | 39 | <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> |
| 40 | - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> | |
| 41 | 40 | <!-- VERY IMPORTANT! Don't forget this permission, or in-app billing won't work. --> |
| 42 | 41 | <uses-permission android:name="com.android.vending.BILLING" /> |
| 43 | 42 | |
| ... | ... | @@ -64,13 +63,6 @@ V4.5.6 |
| 64 | 63 | android:scheme="gump+游戏的appId" /> |
| 65 | 64 | </intent-filter> |
| 66 | 65 | </activity> |
| 67 | - <activity | |
| 68 | - android:name="com.gumptech.sdk.ExchangeWindow" | |
| 69 | - android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout" | |
| 70 | - android:theme="@style/Theme.WinForExchange" > | |
| 71 | - </activity> | |
| 72 | - | |
| 73 | - <service android:name="com.gumptech.sdk.PushService" /> | |
| 74 | 66 | |
| 75 | 67 | <!-- vk登录使用,若不接入vk,不需配置 --> |
| 76 | 68 | <activity android:name="com.vk.sdk.VKOpenAuthActivity" /> |
| ... | ... | @@ -78,10 +70,6 @@ V4.5.6 |
| 78 | 70 | android:name="com.vk.sdk.VKServiceActivity" |
| 79 | 71 | android:label="ServiceActivity" |
| 80 | 72 | android:theme="@style/VK.Transparent" /> |
| 81 | - <!--wechat接入使用,不接入不需要配置--> | |
| 82 | - <activity | |
| 83 | - android:name=".wxapi.WXEntryActivity" | |
| 84 | - android:exported="true"></activity> | |
| 85 | 73 | |
| 86 | 74 | ### 3.向Gump平台索要游戏ID(AppID),完成代码接入 |
| 87 | 75 | 正式开始接入逻辑代码前,先介绍下一些附加设置,以方便代码接入 |
| ... | ... | @@ -153,10 +141,6 @@ InitializeCallback为初始化回调接口,此接口只有一个回调方法init |
| 153 | 141 | gumpUser.getAccountType();//用户类型,此类型数据可从GumpPreference常量获取 |
| 154 | 142 | gumpUser.getSessionKey();//登录的sessionKey对象,获取sessionKey字符串请使用此对象的getToken()方法 |
| 155 | 143 | |
| 156 | -***注意:若需要使用微信登录,需要在packageName.wxapi下增加一个名为WXEntryActivity并继承com.gumptech.sdk.WXCallbackActivity的Activity,并参考AndroidManifest.xml设置的说明,做相应的配置,packageName为应用的包名,此Activity不须任何实现。*** | |
| 157 | - | |
| 158 | -***以GumpSDKDemo为例,包名为com.gumptech.sdk.demo,则WXEntryActivity的完整包路径为:com.gumptech.sdk.demo.wxapi.WXEntryActivity*** | |
| 159 | - | |
| 160 | 144 | #### 3.支付功能 |
| 161 | 145 | 1)使用gump通行证登录,其中除nick外所有参数为必传参数 |
| 162 | 146 | |
| ... | ... | @@ -220,7 +204,7 @@ InitializeCallback为初始化回调接口,此接口只有一个回调方法init |
| 220 | 204 | |SDKSettings.THIRD_SUPPORT_GOOGLE| Google登录 | |
| 221 | 205 | |SDKSettings.THIRD_SUPPORT_LINE | Line登录 | |
| 222 | 206 | |SDKSettings.THIRD_SUPPORT_VK | VK登录 | |
| 223 | - |SDKSettings.THIRD_SUPPORT_WECHAT| 微信登录 | | |
| 207 | + | |
| 224 | 208 | ### 2.登录账户类型 |
| 225 | 209 | | 常量字段 | 说明 | |
| 226 | 210 | |-------------------------------------|--------------| |
| ... | ... | @@ -230,7 +214,7 @@ InitializeCallback为初始化回调接口,此接口只有一个回调方法init |
| 230 | 214 | |GumpPreference.ACCOUNT_TYPE_GOOGLE | Google用户 | |
| 231 | 215 | |GumpPreference.ACCOUNT_TYPE_LINE | Line用户 | |
| 232 | 216 | |GumpPreference.ACCOUNT_TYPE_VK | VK用户 | |
| 233 | - |GumpPreference.ACCOUNT_TYPE_WECHAT | 微信用户 | | |
| 217 | + | |
| 234 | 218 | |
| 235 | 219 | ## 第三章 常见问题 |
| 236 | 220 | ### 问题1: 如何避免混淆对SDK的影响? |