From d42a066802cdec2911b2b7c27c603b2580a579b4 Mon Sep 17 00:00:00 2001
From: King <king@gumptech.com>
Date: Thu, 20 Sep 2018 14:39:43 +0800
Subject: [PATCH] remove wechat login type,add initialize button

---
 GameSDKDemo/build.gradle                           |  4 +--
 GameSDKDemo/src/main/AndroidManifest.xml           | 12 --------
 .../java/com/gumptech/sdk/demo/MainActivity.java   | 33 ++++++++++++++++------
 .../gumptech/sdk/demo/wxapi/WXEntryActivity.java   | 18 ------------
 GameSDKDemo/src/main/res/layout/activity_main.xml  |  8 ++++++
 README.md                                          | 26 ++++-------------
 6 files changed, 39 insertions(+), 62 deletions(-)
 delete mode 100644 GameSDKDemo/src/main/java/com/gumptech/sdk/demo/wxapi/WXEntryActivity.java

diff --git a/GameSDKDemo/build.gradle b/GameSDKDemo/build.gradle
index 0eac48a..5ff2928 100644
--- a/GameSDKDemo/build.gradle
+++ b/GameSDKDemo/build.gradle
@@ -75,9 +75,9 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     implementation 'com.android.support:appcompat-v7:26.1.0'
     //微信
-        implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.1.4'
+    implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.1.4'
     //VK
     implementation 'com.gumptech:VKsdk:1.5.4'
 //        implementation project(':GameSDK')
-    implementation 'com.gumptech.sdk:GameSDK:4.5.6'
+    implementation 'com.gumptech.sdk:GameSDK:4.5.8'
 }
diff --git a/GameSDKDemo/src/main/AndroidManifest.xml b/GameSDKDemo/src/main/AndroidManifest.xml
index 661e8c1..6c8a08c 100644
--- a/GameSDKDemo/src/main/AndroidManifest.xml
+++ b/GameSDKDemo/src/main/AndroidManifest.xml
@@ -10,7 +10,6 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <!-- Danger Level permission-->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <!-- VERY IMPORTANT! Don't forget this permission, or in-app billing won't work. -->
     <uses-permission android:name="com.android.vending.BILLING"/>
@@ -54,19 +53,8 @@
                     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>
 
         <!--wechat-->
-        <activity
-            android:name=".wxapi.WXEntryActivity"
-            android:exported="true"></activity>
         <!-- vk -->
         <!--         <activity android:name="com.vk.com.gumptech.sdk.VKOpenAuthActivity" /> -->
         <!--         <activity -->
diff --git a/GameSDKDemo/src/main/java/com/gumptech/sdk/demo/MainActivity.java b/GameSDKDemo/src/main/java/com/gumptech/sdk/demo/MainActivity.java
index cd3bfd4..5325b0f 100644
--- a/GameSDKDemo/src/main/java/com/gumptech/sdk/demo/MainActivity.java
+++ b/GameSDKDemo/src/main/java/com/gumptech/sdk/demo/MainActivity.java
@@ -30,6 +30,7 @@ public class MainActivity extends Activity implements PurchaseCallback {
     private TextView userInfo;
 
     private Button btnLoginOrLogout;
+    private Button btnInit;
 
     private String appId = "100";
     private String appKey = "f899139df5e1059396431415e770c6dd";
@@ -44,6 +45,7 @@ public class MainActivity extends Activity implements PurchaseCallback {
         tvVersion = findViewById(R.id.version);
         userInfo = findViewById(R.id.user_info);
         btnLoginOrLogout = findViewById(R.id.login_or_logout);
+        btnInit = findViewById(R.id.init);
         btnLoginOrLogout.setOnClickListener(new View.OnClickListener() {
 
             @Override
@@ -54,6 +56,24 @@ public class MainActivity extends Activity implements PurchaseCallback {
                     GumpSDK.logout(MainActivity.this);
             }
         });
+        btnInit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                btnInit.setEnabled(false);
+                GumpSDK.init(getApplicationContext(), appId, appKey, "1000", new InitializeCallback() {
+                    @Override
+                    public void initComplete(int result) {
+                        if (result == GumpSDK.CODE.OK) {
+                            btnLoginOrLogout.setEnabled(true);
+                            userInfo.setText("initialization has finished");
+                        } else {
+                            btnInit.setEnabled(true);
+                            userInfo.setText("initialization has error");
+                        }
+                    }
+                });
+            }
+        });
         findViewById(R.id.pay).setOnClickListener(new View.OnClickListener() {
 
             @Override
@@ -98,11 +118,6 @@ public class MainActivity extends Activity implements PurchaseCallback {
          */
 //        GumpSDK.getSettings().requestThirdSupport(SDKSettings.THIRD_SUPPORT_VK);
 
-        /**
-         * 设置启用Wechat登录
-         *
-         */
-//        GumpSDK.getSettings().requestThirdSupport(SDKSettings.THIRD_SUPPORT_WECHAT);
 
         /**
          * 设置启用google登录
@@ -150,9 +165,6 @@ public class MainActivity extends Activity implements PurchaseCallback {
                     case GumpPreference.ACCOUNT_TYPE_GOOGLE:
                         userType = "google 登录";
                         break;
-                    case GumpPreference.ACCOUNT_TYPE_WECHAT:
-                        userType = "微信登录";
-                        break;
                     case GumpPreference.ACCOUNT_TYPE_LINE:
                         userType = "Line登录";
                         break;
@@ -199,8 +211,11 @@ public class MainActivity extends Activity implements PurchaseCallback {
             public void initComplete(int result) {
                 if (result == GumpSDK.CODE.OK) {
                     btnLoginOrLogout.setEnabled(true);
-
+                    userInfo.setText("initialization has finished");
                     //checkRisk();
+                } else {
+                    btnInit.setEnabled(true);
+                    userInfo.setText("initialization has error");
                 }
             }
         });
diff --git a/GameSDKDemo/src/main/java/com/gumptech/sdk/demo/wxapi/WXEntryActivity.java b/GameSDKDemo/src/main/java/com/gumptech/sdk/demo/wxapi/WXEntryActivity.java
deleted file mode 100644
index 83e6151..0000000
--- a/GameSDKDemo/src/main/java/com/gumptech/sdk/demo/wxapi/WXEntryActivity.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.gumptech.sdk.demo.wxapi;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-
-import com.gumptech.sdk.WXCallbackActivity;
-
-/**
- * Created by King on 2018/2/7.
- */
-
-public class WXEntryActivity extends WXCallbackActivity {
-
-    @Override
-    protected void onCreate(@Nullable Bundle bundle) {
-        super.onCreate(bundle);
-    }
-}
diff --git a/GameSDKDemo/src/main/res/layout/activity_main.xml b/GameSDKDemo/src/main/res/layout/activity_main.xml
index e9ca526..8f49e12 100644
--- a/GameSDKDemo/src/main/res/layout/activity_main.xml
+++ b/GameSDKDemo/src/main/res/layout/activity_main.xml
@@ -19,6 +19,14 @@
         android:textColor="@android:color/black"/>
 
     <Button
+        android:id="@+id/init"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:backgroundTint="@color/g_color"
+        android:enabled="false"
+        android:text="Initialize"/>
+
+    <Button
         android:id="@+id/login_or_logout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/README.md b/README.md
index d26aeee..176f925 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Gump SDK 4 for Android接入文档
 
-V4.5.6       
-2018年9月18日
+V4.5.8       
+2018年9月20日
 
 ## 版本概述
 
@@ -19,7 +19,7 @@ V4.5.6
     	}
     }
     dependencies {
-        implementation 'com.gumptech.sdk:GameSDK:4.5.6'
+        implementation 'com.gumptech.sdk:GameSDK:4.5.8'
     }
     
      
@@ -37,7 +37,6 @@ V4.5.6
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <!-- VERY IMPORTANT! Don't forget this permission, or in-app billing won't work. -->
     <uses-permission android:name="com.android.vending.BILLING" />
     
@@ -64,13 +63,6 @@ V4.5.6
                 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" />
@@ -78,10 +70,6 @@ V4.5.6
         android:name="com.vk.sdk.VKServiceActivity"
         android:label="ServiceActivity"
         android:theme="@style/VK.Transparent" />
-     <!--wechat接入使用，不接入不需要配置-->
-     <activity
-        android:name=".wxapi.WXEntryActivity"
-        android:exported="true"></activity>
     
 ### 3.向Gump平台索要游戏ID（AppID），完成代码接入     
 正式开始接入逻辑代码前,先介绍下一些附加设置,以方便代码接入  
@@ -153,10 +141,6 @@ InitializeCallback为初始化回调接口,此接口只有一个回调方法init
     gumpUser.getAccountType();//用户类型,此类型数据可从GumpPreference常量获取  
     gumpUser.getSessionKey();//登录的sessionKey对象,获取sessionKey字符串请使用此对象的getToken()方法  
 
-***注意：若需要使用微信登录，需要在packageName.wxapi下增加一个名为WXEntryActivity并继承com.gumptech.sdk.WXCallbackActivity的Activity，并参考AndroidManifest.xml设置的说明，做相应的配置，packageName为应用的包名，此Activity不须任何实现。***
-
-***以GumpSDKDemo为例，包名为com.gumptech.sdk.demo，则WXEntryActivity的完整包路径为：com.gumptech.sdk.demo.wxapi.WXEntryActivity***
-
 #### 3.支付功能  
 1)使用gump通行证登录,其中除nick外所有参数为必传参数     
 
@@ -220,7 +204,7 @@ InitializeCallback为初始化回调接口,此接口只有一个回调方法init
 	|SDKSettings.THIRD_SUPPORT_GOOGLE| Google登录    |
 	|SDKSettings.THIRD_SUPPORT_LINE  | Line登录      |
 	|SDKSettings.THIRD_SUPPORT_VK    | VK登录        |
-	|SDKSettings.THIRD_SUPPORT_WECHAT| 微信登录      |
+
 ### 2.登录账户类型
 	|               常量字段               |      说明     |
 	|-------------------------------------|--------------|
@@ -230,7 +214,7 @@ InitializeCallback为初始化回调接口,此接口只有一个回调方法init
 	|GumpPreference.ACCOUNT_TYPE_GOOGLE   | Google用户    |
 	|GumpPreference.ACCOUNT_TYPE_LINE     | Line用户      |
 	|GumpPreference.ACCOUNT_TYPE_VK       | VK用户        |
-	|GumpPreference.ACCOUNT_TYPE_WECHAT   | 微信用户      |
+
 
 ## 第三章 常见问题      
 ### 问题1： 如何避免混淆对SDK的影响？       
-- 
2.0.0