v3.3.6

分离fb登录模块，设置禁用时，可不用导入fb sdk

v3.3.6
分离fb登录模块，设置禁用时，可不用导入fb sdk
赵康
1 parent f175cbeae7
Showing 6 changed files with 8 additions and 9 deletions Side-by-side Diff
android/GameSDKRelease/libs/GameSDK_v3.3.5_proguard.jar
android/GameSDKRelease/libs/GameSDK_v3.3.6_proguard.jar
android/GameSDKRelease/project.properties
android/GameSDKRelease/res/layout/fragment_sign_choice.xml
android/GameSDKSample/AndroidManifest.xml
android/GameSDKSample/src/com/gumptech/loginsdk/sample/MainActivity.java
@@ -13,5 +13,3 @@
 # Project target.
 target=android-21
 android.library=true
-android.library.reference.1=..\\..\\..\\..\\..\\facebook
-android.library.reference.2=../../../../../Project/vksdk_library
@@ -123,6 +123,7 @@
             android:textStyle="bold" />
  
         <ImageView
+            android:id="@+id/or_line"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="35dp"
@@ -64,11 +64,11 @@
             android:label="@string/app_name"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <!-- vk -->
-        <activity android:name="com.vk.sdk.VKOpenAuthActivity" />
-        <activity
-            android:name="com.vk.sdk.VKServiceActivity"
-            android:label="ServiceActivity"
-            android:theme="@style/VK.Transparent" />
+<!--         <activity android:name="com.vk.sdk.VKOpenAuthActivity" /> -->
+<!--         <activity -->
+<!--             android:name="com.vk.sdk.VKServiceActivity" -->
+<!--             android:label="ServiceActivity" -->
+<!--             android:theme="@style/VK.Transparent" /> -->
     </application>
  
 </manifest>
 \ No newline at end of file
@@ -70,11 +70,11 @@ public class MainActivity extends Activity  implements PurchaseCallback{
         /**
          * 设置是否启用facebook登录
          */
-        GumpSDK.setFBEnable(true);
+        GumpSDK.setFBEnable(false);
         /**
          * 设置是否启用Vk登录
          */
-        GumpSDK.setVKEnable(true);
+        GumpSDK.setVKEnable(false);
         /**
          * 设置屏幕方向
          */
...	...	@@ -13,5 +13,3 @@
13	13	# Project target.
14	14	target=android-21
15	15	android.library=true
16		-android.library.reference.1=..\\..\\..\\..\\..\\facebook
17		-android.library.reference.2=../../../../../Project/vksdk_library
...	...	@@ -123,6 +123,7 @@
123	123	android:textStyle="bold" />
124	124
125	125	<ImageView
	126	+ android:id="@+id/or_line"
126	127	android:layout_width="fill_parent"
127	128	android:layout_height="wrap_content"
128	129	android:layout_marginLeft="35dp"
...	...	@@ -64,11 +64,11 @@
64	64	android:label="@string/app_name"
65	65	android:theme="@android:style/Theme.Translucent.NoTitleBar" />
66	66	<!-- vk -->
67		- <activity android:name="com.vk.sdk.VKOpenAuthActivity" />
68		- <activity
69		- android:name="com.vk.sdk.VKServiceActivity"
70		- android:label="ServiceActivity"
71		- android:theme="@style/VK.Transparent" />
	67	+<!-- <activity android:name="com.vk.sdk.VKOpenAuthActivity" /> -->
	68	+<!-- <activity -->
	69	+<!-- android:name="com.vk.sdk.VKServiceActivity" -->
	70	+<!-- android:label="ServiceActivity" -->
	71	+<!-- android:theme="@style/VK.Transparent" /> -->
72	72	</application>
73	73
74	74	</manifest>
75	75	\ No newline at end of file
...	...	@@ -70,11 +70,11 @@ public class MainActivity extends Activity implements PurchaseCallback{
70	70	/**
71	71	* 设置是否启用facebook登录
72	72	*/
73		- GumpSDK.setFBEnable(true);
	73	+ GumpSDK.setFBEnable(false);
74	74	/**
75	75	* 设置是否启用Vk登录
76	76	*/
77		- GumpSDK.setVKEnable(true);
	77	+ GumpSDK.setVKEnable(false);
78	78	/**
79	79	* 设置屏幕方向
80	80	*/