version:4.2.0:增加Google登录

赵康
1 parent 983e266671
Showing 6 changed files with 8 additions and 4 deletions Side-by-side Diff
GameSDK-release4.1.7.aar
GameSDK-release4.2.0.aar
GameSDKDemo/build.gradle
GameSDKDemo/libs/GameSDK-release4.1.7.aar
GameSDKDemo/libs/GameSDK-release4.2.0.aar
GameSDKDemo/src/main/java/com/gumptech/sdk/demo/MainActivity.java
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 22
-        versionCode 4
-        versionName "1.2"
+        versionCode 5
+        versionName "1.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
  
@@ -34,6 +34,6 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:22.2.0'
 //    compile project(':GameSDK')
-    compile(name:'GameSDK-release4.1.6',ext:'aar')
+    compile(name:'GameSDK-release4.2.0',ext:'aar')
  
 }
@@ -31,7 +31,7 @@ public class MainActivity extends Activity implements PurchaseCallback {
     private Button btnLoginOrLogout;
  
     private String appId = "10022";
-    private String appKey = "c1aff6753244c6ee93d489992b51f012";
+    private String appKey = "93a27b0bd99bac3e68a440b48aa421ab";
     private String sessionKey;
  
  
@@ -91,6 +91,7 @@ public class MainActivity extends Activity implements PurchaseCallback {
          * 设置是否启用Vk登录
          */
         GumpSDK.getSettings().setVKEnable(false);
+
         /**
          * 设置屏幕方向
          */
@@ -127,6 +128,9 @@ public class MainActivity extends Activity implements PurchaseCallback {
                     case GumpPreference.ACCOUNT_TYPE_VK:
                         userType = "vk登录";
                         break;
+                    case GumpPreference.ACCOUNT_TYPE_GOOGLE:
+                        userType = "google 登录";
+                        break;
                 }
                 userInfo.setText(" Userid:" + user.getUid() + "\n accountType:(" + user.getAccountType() + ") " + userType + "\n sessionKey:" + user.getSessionKey());
                 btnLoginOrLogout.setText("Logout");
...	...	@@ -13,8 +13,8 @@ android {
13	13	defaultConfig {
14	14	minSdkVersion 9
15	15	targetSdkVersion 22
16		- versionCode 4
17		- versionName "1.2"
	16	+ versionCode 5
	17	+ versionName "1.3"
18	18	testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
19	19	}
20	20
...	...	@@ -34,6 +34,6 @@ dependencies {
34	34	testCompile 'junit:junit:4.12'
35	35	compile 'com.android.support:appcompat-v7:22.2.0'
36	36	// compile project(':GameSDK')
37		- compile(name:'GameSDK-release4.1.6',ext:'aar')
	37	+ compile(name:'GameSDK-release4.2.0',ext:'aar')
38	38
39	39	}
...	...	@@ -31,7 +31,7 @@ public class MainActivity extends Activity implements PurchaseCallback {
31	31	private Button btnLoginOrLogout;
32	32
33	33	private String appId = "10022";
34		- private String appKey = "c1aff6753244c6ee93d489992b51f012";
	34	+ private String appKey = "93a27b0bd99bac3e68a440b48aa421ab";
35	35	private String sessionKey;
36	36
37	37
...	...	@@ -91,6 +91,7 @@ public class MainActivity extends Activity implements PurchaseCallback {
91	91	* 设置是否启用Vk登录
92	92	*/
93	93	GumpSDK.getSettings().setVKEnable(false);
	94	+
94	95	/**
95	96	* 设置屏幕方向
96	97	*/
...	...	@@ -127,6 +128,9 @@ public class MainActivity extends Activity implements PurchaseCallback {
127	128	case GumpPreference.ACCOUNT_TYPE_VK:
128	129	userType = "vk登录";
129	130	break;
	131	+ case GumpPreference.ACCOUNT_TYPE_GOOGLE:
	132	+ userType = "google 登录";
	133	+ break;
130	134	}
131	135	userInfo.setText(" Userid:" + user.getUid() + "\n accountType:(" + user.getAccountType() + ") " + userType + "\n sessionKey:" + user.getSessionKey());
132	136	btnLoginOrLogout.setText("Logout");