SDK / GameSDK4-android

Browse Code »

Commit 43932caac25b48e18bbd9959df7a6f67b2d6396a

Authored by 赵康 2018-01-16 11:04:08 +0800

1 parent 2ce00205d6

Exists in master

update for UI,add login way of Line and Wechat

Showing 8 changed files with 67 additions and 30 deletions Inline Diff

GameSDK-release4.2.1.aar
GameSDK-release4.3.1.aar
GameSDKDemo/build.gradle
GameSDKDemo/libs/GameSDK-release4.2.1.aar
GameSDKDemo/libs/GameSDK-release4.3.1.aar
GameSDKDemo/src/main/AndroidManifest.xml
GameSDKDemo/src/main/java/com/gumptech/sdk/demo/MainActivity.java
IntegrationGuide.md

GameSDK-release4.2.1.aar

View file @ 43932ca

No preview for this file type

GameSDK-release4.3.1.aar

Diff comments View file @ 43932ca

No preview for this file type

GameSDKDemo/build.gradle

Diff comments View file @ 43932ca

 apply plugin: 'com.android.application'
-repositories{
+repositories {
-    flatDir{
+    flatDir {
         dirs 'libs'
     }
 }
 android {
     compileSdkVersion 22
-    buildToolsVersion "25.0.0"
+    buildToolsVersion "26.0.2"
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 22
         versionCode 5
         versionName "1.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    lintOptions{
+    lintOptions {
         abortOnError false
     }
 }
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:22.2.0'
+    //微信
+//    compile 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
 //    compile project(':GameSDK')
-    compile(name:'GameSDK-release4.2.1',ext:'aar')
+    compile(name: 'GameSDK-release4.3.1', ext: 'aar')
 }

GameSDKDemo/libs/GameSDK-release4.2.1.aar

View file @ 43932ca

No preview for this file type

GameSDKDemo/libs/GameSDK-release4.3.1.aar

Diff comments View file @ 43932ca

No preview for this file type

GameSDKDemo/src/main/AndroidManifest.xml

Diff comments View file @ 43932ca

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.gumptech.sdk.demo">
     <uses-sdk
         android:minSdkVersion="9"
         android:targetSdkVersion="20"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
     <!-- Danger Level permission-->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.SEND_SMS"/>
     <!-- VERY IMPORTANT! Don't forget this permission, or in-app billing won't work. -->
     <uses-permission android:name="com.android.vending.BILLING"/>
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name">
         <activity
             android:name="com.gumptech.sdk.demo.MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout"
             android:label="@string/app_name"
+            android:screenOrientation="landscape"
             >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity
             android:name="com.gumptech.sdk.ContainerActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout"
             android:launchMode="singleTask"
             android:theme="@style/Theme.TransparentWin"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
         </activity>
         <activity
             android:name="com.gumptech.sdk.PaymentActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout"
             android:launchMode="singleTask"
             android:theme="@android:style/Theme.Translucent.NoTitleBar">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT"/>
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
                 <data
                     android:host="com.gump.sdk"
                     android:scheme="gump10031"/>
             </intent-filter>
         </activity>
         <activity
             android:name="com.gumptech.sdk.ExchangeWindow"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout"
             android:theme="@style/Theme.WinForExchange">
         </activity>
         <service android:name="com.gumptech.sdk.PushService">
         </service>
         <!-- vk -->
         <!--         <activity android:name="com.vk.com.gumptech.sdk.VKOpenAuthActivity" /> -->
         <!--         <activity -->
         <!--             android:name="com.vk.com.gumptech.sdk.VKServiceActivity" -->
         <!--             android:label="ServiceActivity" -->
         <!--             android:theme="@style/VK.Transparent" /> -->
     </application>
 </manifest>

GameSDKDemo/src/main/java/com/gumptech/sdk/demo/MainActivity.java

Diff comments View file @ 43932ca

 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.PaymentVersion;
+import com.gumptech.sdk.SDKSettings;
 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.callback.ResultCallback;
 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 = "10022";
+    private String appId = "100";
-    private String appKey = "93a27b0bd99bac3e68a440b48aa421ab";
+    private String appKey = "f899139df5e1059396431415e770c6dd";
     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("product", "test2");
                 payInfo.putFloat("amount", 0.1f);
                 payInfo.putString("extraInfo", "This is demo!");
                 payInfo.putString("serverId", "100");
-                payInfo.putString("roleId","100123");
+                payInfo.putString("roleId", "100123");
                 payInfo.putString("sessionKey", sessionKey);
                 GumpSDK.pay(MainActivity.this, payInfo, MainActivity.this);
             }
         });
         findViewById(R.id.iap).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Bundle payInfo = new Bundle();
                 payInfo.putString("product", "180010");
                 payInfo.putFloat("amount", 0.1f);
                 payInfo.putString("extraInfo", "This is demo!");
                 payInfo.putString("serverId", "100");
-                payInfo.putString("roleId","100123");
+                payInfo.putString("roleId", "100123");
                 GumpSDK.iap(MainActivity.this, payInfo, MainActivity.this);
             }
         });
         /**
          * 设置否是打印debug日志
          */
         GumpSDK.getSettings().enableDebugLogging(true);
         /**
-         * 设置是否启用facebook登录
+         * 设置启用facebook登录
          */
-        GumpSDK.getSettings().setFBEnable(true);
+        GumpSDK.getSettings().requestThirdSupport(SDKSettings.THIRD_SUPPORT_FB);
         /**
-         * 设置是否启用Vk登录
+         * 设置启用Vk登录
          */
-        GumpSDK.getSettings().setVKEnable(false);
+//        GumpSDK.getSettings().requestThirdSupport(SDKSettings.THIRD_SUPPORT_VK);
         /**
+         * 设置启用Wechat登录
+         *
+         */
+//        GumpSDK.getSettings().requestThirdSupport(SDKSettings.THIRD_SUPPORT_WECHAT);
+        /**
+         * 设置启用google登录
+         */
+        GumpSDK.getSettings().requestThirdSupport(SDKSettings.THIRD_SUPPORT_GOOGLE);
+        /**
+         * 设置启用Line登录
+         */
+        GumpSDK.getSettings().requestThirdSupport(SDKSettings.THIRD_SUPPORT_LINE);
+        /**
          * 设置屏幕方向
          */
         GumpSDK.getSettings().setScreenLandscape(true);
         /**
          * 设置支付版本
          */
         GumpSDK.getSettings().setPaymentVersion(PaymentVersion.V4);
         /**
          * 设置用户登录状态监听器
          */
         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;
                     case GumpPreference.ACCOUNT_TYPE_GOOGLE:
                         userType = "google 登录";
                         break;
+                    case GumpPreference.ACCOUNT_TYPE_WECHAT:
+                        userType = "微信登录";
+                        break;
+                    case GumpPreference.ACCOUNT_TYPE_LINE:
+                        userType = "Line登录";
+                        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);
                     //checkRisk();
                 }
             }
         });
         tvVersion.setText("SDK Version:" + GumpSDK.getVersion());
     }
-    private void checkRisk(){
+    private void checkRisk() {
         GumpSDK.checkRisk(this, new ResultCallback() {
             @Override
             public void onResult(boolean isRisk) {
-                Log.i(TAG,isRisk?"There is some risks":"Nothing is risk");
+                Log.i(TAG, isRisk ? "There is some risks" : "Nothing is risk");
             }
         });
     }
     @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");
     }
 }

IntegrationGuide.md

Diff comments View file @ 43932ca

 # Gump SDK 4 for Android接入文档
-V4.2.0
+V4.3.1
-2017年4月26日
+2018年1月16日
 ## 版本概述
-此版本为使用AndroidStudio开发的第一个版本,一改eclipse的工程依赖方式,使用aar的方式提供sdk接入包,除功能外,相对上一版本没有继承关系,请按此文档描述接入.
+此版本为使用AndroidStudio开发的版本,一改eclipse的工程依赖方式,使用aar的方式提供sdk接入包,除功能外,相对上一版本没有继承关系,请按此文档描述接入.
 此SDK适用android2.3以上系统.
 ## 第一章  接入指南
 ### 1.依赖导入
 将aar添加到libs目录下,然后配置gradle
 以下为必须项
     repositories{
         flatDir{
             dirs 'libs'
         }
     }
     dependencies {
         compile(name:'GameSDK-releaseXXX',ext:'aar')
     }
 可选接入vk登录时,需要导入vkLibrary工程,并配置模块依赖,如下
     compile project(':vksdk_library')
 ### 2.修改AndroidManifest.xml文件
 首先添加必要的权限，如下所示：
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
     <uses-permission android:name="android.permission.SEND_SMS"/>
     <!-- VERY IMPORTANT! Don't forget this permission, or in-app billing won't work. -->
     <uses-permission android:name="com.android.vending.BILLING" />
 其次注册相应的Activity，具体如下：
     <activity
         android:name="com.gumptech.sdk.ContainerActivity"
         android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout"
         android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
         android:launchMode="singleTask"
         android:theme="@style/Theme.TransparentWin" >
     </activity>
     <activity
         android:name="com.gumptech.sdk.PaymentActivity"
         android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout"
         android:launchMode="singleTask"
         android:theme="@android:style/Theme.Translucent.NoTitleBar" >
         <intent-filter>
             <category android:name="android.intent.category.DEFAULT" />
             <action android:name="android.intent.action.VIEW" />
             <category android:name="android.intent.category.BROWSABLE" />
             <data
                 android:host="com.gump.sdk"
                 android:scheme="gump+游戏的appId" />
         </intent-filter>
     </activity>
     <activity
         android:name="com.gumptech.sdk.ExchangeWindow"
         android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout"
         android:theme="@style/Theme.WinForExchange" >
     </activity>
     <service android:name="com.gumptech.sdk.PushService" />
     <!-- vk登录使用，若不接入vk，不需配置 -->
     <activity android:name="com.vk.sdk.VKOpenAuthActivity" />
     <activity
         android:name="com.vk.sdk.VKServiceActivity"
         android:label="ServiceActivity"
         android:theme="@style/VK.Transparent" />
 ### 3.向Gump平台索要游戏ID（AppID），完成代码接入
 正式开始接入逻辑代码前,先介绍下一些附加设置,以方便代码接入
 *是否打印debug日志
     GumpSDK.getSettings().enableDebugLogging(true);
-*Gump Logo隐藏
-    GumpSDK.getSettings().setLogoShow(false);
 *横竖屏控制,默认为横屏,参数为false即为竖屏
     GumpSDK.getSettings().setScreenLandscape(true);
-*设置是否启用Facebook登录和VK登录
+*设置需要启用的第三方登录，参数可选类型见第二章：<a href="#third_palt">第三方登录平台</a> 字段说明
-    GumpSDK.getSettings().setFBEnable(true);
-    GumpSDK.getSettings().setVKEnable(true);
-*设置是否启用GoogleD登录
-    GumpSDk.getSettings().setGoogleEnable(true);
+    GumpSDK.getSettings().requestThirdSupport(SDKSettings.THIRD_SUPPORT_*)；
 *若要使用V4版支付请设置
     GumpSDK.getSettings().setPaymentVersion(PaymentVersion.V4);
 #### 1.调用GumpSDK前需要执行初始化。
 若不需要分渠道
     GumpSDK.init(Context,Appid, Appkey,InitializeCallback);
 如果需要定义渠道,必须使用如下方法
     GumpSDK.init(Context,Appid, Appkey,ChannelId,InitializeCallback);
 InitializeCallback为初始化回调接口,此接口只有一个回调方法initComplete(int result) result标识是否初始化成功,当result等于GumpSDK.CODE.OK时为成功,其他为失败
 #### 2.调用GumpSDK的开始方法,将执行登录流程,需要一个Activity实例作参数
     GumpSDK.start(Activity);
 在此之前,开发者需要注册用户状态监听以接受用户的登录/登出通知,通常如下:
     GumpSDK.setUserStateListener(new LoginStateListener() {
             @Override
             public void onLoginSuccess(GumpUser gumpUser) {
                 //登录成功,用户信息包含在GumpUser对象里
             }
             @Override
             public void onLoginFailed(int code, String 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() {
                 //用户登出
             }
         });
 如上成功登录后收到的GumpUser对象包含以下信息
     gumpUser.getUid();//获取用户的userid,此Id标识唯一用户!
     gumpUser.getAccountType();//用户类型,此类型数据可从GumpPreference常量获取
     gumpUser.getSessionKey();//登录的sesionKey
 #### 3.支付功能
 1)使用gump通行证登录,其中除nick外所有参数为必传参数
     Bundle payInfo = new Bundle();
     payInfo.putString("nick", "thi");
     payInfo.putString("product", "元宝");
     payInfo.putFloat("amount", 40.0f);
     payInfo.putString("extraInfo", "This is demo!");
     payInfo.putString("serverId", "B4003");
     payInfo.putString("roleId", "10010");
     payInfo.putString("sessionKey","sessionkey");
     GumpSDK.pay(MainActivity.this, payInfo,PurchaseCallback);
 调用pay方法时,必须穿入一个bundle对象,包含如上字段,除nick外所有字段必须全部包含,其中sessionKey为登录时返回的sessionKey
 2)IAP支付
     Bundle payInfo = new Bundle();
     payInfo.putString("product", "gp_skuId");
     payInfo.putFloat("amount", 0.1f);
     payInfo.putString("extraInfo", "This is demo!");
     payInfo.putString("serverId", "100");
     payInfo.putString("roleId","100123");
     GumpSDK.iap(MainActivity.this, payInfo, PurchaseCallback);
 3)PurchaseCallback为支付状态回调接口,此接口含有3个方法
     @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");
     }
 #### 4.注销登录
     GumpSDK.logout(Activity);
 当此方法调用后,用户退出登录,并会通过LoginStateListener接口通知调用程序!为了便于用户切换登录账户,请在游戏内提供用户注销的触发按钮
 #### 5.运营开关接口，若需要接入，会有我方运营人员提出需求，否则不需要接入（若对此接口不知所云，即可认为不需要接入，请自行忽略）
     GumpSDK.checkRisk(this, new ResultCallback() {
             @Override
             public void onResult(boolean result) {
                 Log.i(TAG,result?"There is some risks":"Nothing is risk");
             }
         });
-## 第二章 常见问题
+## 第二章 常量字段与代码
+<a name="third_plat"> 1.第三方登录平台</a>
+	|  常量字段  |  说明  |
+	| -------- | -------- |
+	|SDKSettings.THIRD_SUPPORT_FB|Facebook登录|
+	|SDKSettings.THIRD_SUPPORT_GOOGLE|Google登录|
+	|SDKSettings.THIRD_SUPPORT_LINE|Line登录|
+	|SDKSettings.THIRD_SUPPORT_VK|VK登录|
+### 2.登录账户类型
+	| 常量字段  |  说明  |
+	| -------- | -------- |
+	|GumpPreference.ACCOUNT_TYPE_FB|Facebook用户|
+	|GumpPreference.ACCOUNT_TYPE_REG|Gump注册用户|
+	|GumpPreference.ACCOUNT_TYPE_QUICK_REG|快速注册用户|
+	|GumpPreference.ACCOUNT_TYPE_GOOGLE|Google用户|
+	|GumpPreference.ACCOUNT_TYPE_LINE|Line用户|
+	|GumpPreference.ACCOUNT_TYPE_VK|VK用户|
+## 第三章 常见问题
 ### 问题1： 如何避免混淆对SDK的影响？
 解答：有些开发者对接入了SDK的程序进行混淆时，有可能会覆盖某些java
 类，导致SDK无法正常工作，解决方法如下:
 Ø  请开发者在混淆配置文件proguard.cfg或proguard-project.txt的最后加上
     -keepattributes *Annotation*,InnerClasses,SourceFile,LineNumberTable