增加vk登录

修改ui布局

增加vk登录
修改ui布局
赵康
1 parent 312c33111f
Showing 85 changed files with 397 additions and 365 deletions Side-by-side Diff
android/GameSDKRelease/libs/GameSDK_v3.2.0_proguard.jar
android/GameSDKRelease/libs/GameSDK_v3.3.0_proguard.jar
android/GameSDKRelease/libs/android-support-v4.jar
android/GameSDKRelease/project.properties
android/GameSDKRelease/res/drawable-hdpi/arrow_tag.png
android/GameSDKRelease/res/drawable-hdpi/bottom_light_bg.png
android/GameSDKRelease/res/drawable-hdpi/btn_orange_normal.png
android/GameSDKRelease/res/drawable-hdpi/btn_orange_pressed.png
android/GameSDKRelease/res/drawable-hdpi/horizontal_line.png
android/GameSDKRelease/res/drawable-hdpi/ic_back_light.png
android/GameSDKRelease/res/drawable-hdpi/ic_cancel_dark.png
android/GameSDKRelease/res/drawable-hdpi/ic_fb.png
android/GameSDKRelease/res/drawable-hdpi/ic_pwd.png
android/GameSDKRelease/res/drawable-hdpi/ic_user.png
android/GameSDKRelease/res/drawable-hdpi/ic_vk.png
android/GameSDKRelease/res/drawable-hdpi/loading.png
android/GameSDKRelease/res/drawable-hdpi/logo.png
android/GameSDKRelease/res/drawable-hdpi/title_light_bg.png
android/GameSDKRelease/res/drawable-hdpi/utype_fb.png
android/GameSDKRelease/res/drawable-hdpi/utype_gump.png
@@ -11,6 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
  
 # Project target.
-target=android-18
+target=android-19
 android.library=true
-android.library.reference.1=../../../../../facebook
+android.library.reference.1=..\\..\\..\\..\\..\\facebook
+android.library.reference.2=../../../../../Project/vksdk_library
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+     <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="1.5dp" />
+
+            <solid android:color="@color/btn_green_pressed" />
+
+            <size android:height="30.5dp" />
+        </shape></item>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="1.5dp" />
+
+            <solid android:color="@color/btn_green_normal" />
+
+            <size android:height="30.5dp" />
+        </shape></item>
+    
+
+</selector>
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true"><shape>
-            <corners android:radius="3dp" />
-
-            <solid android:color="@color/dark_gray" />
-
-            <size android:height="30dp" />
-        </shape></item>
-    <item><shape>
-            <corners android:radius="3dp" />
-
-            <solid android:color="@color/light_gray" />
-
-            <size android:height="30dp" />
-        </shape></item>
-
-</selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    
-    <item android:state_pressed="true" android:drawable="@drawable/btn_orange_pressed"/>
-    <item android:drawable="@drawable/btn_orange_normal"/>
  
-<!--     <item android:state_pressed="true"> -->
-<!--         <shape android:shape="rectangle"> -->
-<!--             <corners android:radius="3dp" /> -->
+    <!-- <item android:state_pressed="true" android:drawable="@drawable/btn_orange_pressed"/> -->
+    <!-- <item android:drawable="@drawable/btn_orange_normal"/> -->
  
-<!--             <solid android:color="@color/orange_pressed" /> -->
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="1.5dp" />
  
-<!--             <size android:height="35dp" /> -->
-<!--         </shape> -->
-        
-<!--     </item> -->
-<!--     <item> -->
-<!--         <shape android:shape="rectangle"> -->
-<!--             <corners android:radius="3dp" /> -->
+            <solid android:color="@color/orange_pressed" />
  
-<!--             <solid android:color="@color/orange_normal" /> -->
+            <size android:height="30.5dp" />
+        </shape></item>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="1.5dp" />
  
-<!--             <size android:height="35dp" /> -->
-<!--         </shape> -->
-        
-<!--     </item> -->
+            <solid android:color="@color/orange_normal" />
+
+            <size android:height="30.5dp" />
+        </shape></item>
  
 </selector>
 \ No newline at end of file
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <corners android:radius="3dp" />
-
-            <solid android:color="@color/btn_white_pressed" />
-
-            <size android:height="35dp" />
-
-            <stroke android:width="1dp" android:color="@color/line" />
-        </shape>
-        
-        </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:radius="3dp" />
-
-            <solid android:color="@color/btn_white_normal" />
-
-            <size android:height="35dp" />
-
-            <stroke android:width="1dp" android:color="@color/line" />
-        </shape>
-        
-        </item>
-
-</selector>
 \ No newline at end of file
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
-
-    <corners android:radius="3dp" />
-
-    <solid android:color="#f2efeb" />
-    <size android:height="35dp"/>
-
-</shape>
 \ No newline at end of file
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/com_facebook_button_blue_pressed" android:state_focused="true" android:state_pressed="true"/>
-    <item android:drawable="@drawable/com_facebook_button_blue_pressed" android:state_focused="false" android:state_pressed="true"/>
-    <item android:drawable="@drawable/com_facebook_button_blue_normal"/>
-
-</selector>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="line" >
-
-    <stroke
-        android:dashGap="2dp"
-        android:dashWidth="4dp"
-        android:color="@color/line" />
-
-</shape>
 \ No newline at end of file
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-    <corners android:radius="5dp"/>
-	<solid android:color="@android:color/white"/>
-</shape>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
-
-    <solid android:color="@android:color/white" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/line" />
-
-    <size android:height="35dp" />
-
-    <padding
-        android:bottom="2dp"
-        android:left="8dp"
-        android:right="8dp"
-        android:top="2dp" />
-
-    <corners android:radius="5dp" />
-
-</shape>
 \ No newline at end of file
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@color/orange_normal" android:state_pressed="true"/>
-    <item android:drawable="@android:color/white"/>
-
-</selector>
 \ No newline at end of file
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/loading"
+    android:pivotX="50%"  
+    android:pivotY="50%"
+    android:fromDegrees="0"
+    android:toDegrees="360" />
+
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/payment_bg_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/payment_bg_normal"/>
-
-</selector>
 \ No newline at end of file
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/r_bg_selected" android:state_checked="true"/>
-    <item android:drawable="@drawable/r_bg_normal"/>
-
-</selector>
 \ No newline at end of file
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:background="@drawable/dialog_bg"
-    android:orientation="vertical" >
-
-    <include layout="@layout/title" />
-
-    <LinearLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
-        
-    </LinearLayout>
-
-</LinearLayout>
 \ No newline at end of file
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical" >
+
+    <include layout="@layout/title" />
+
+    <LinearLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+    </LinearLayout>
+
+</LinearLayout>
 \ No newline at end of file
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/dialog_bg"
-        android:minWidth="293dp"
-        android:orientation="vertical" >
-
-        <EditText
-            android:id="@+id/username"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="13dp"
-            android:layout_marginRight="13dp"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/et_bg"
-            android:hint="@string/user_name_hint"
-            android:imeOptions="flagNoExtractUi"
-            android:textColor="@color/black_text" />
-
-        <EditText
-            android:id="@+id/password"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="13dp"
-            android:layout_marginRight="13dp"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/et_bg"
-            android:hint="@string/password_hint"
-            android:imeOptions="flagNoExtractUi"
-            android:inputType="textPassword"
-            android:textColor="@color/black_text" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:layout_marginTop="13dp"
-            android:gravity="center"
-            android:orientation="horizontal" >
-
-            <Button
-                android:id="@+id/login"
-                android:layout_width="100dp"
-                android:layout_height="wrap_content"
-                android:background="@drawable/btn_orange_bg"
-                android:padding="5dp"
-                android:text="@string/login"
-                android:textColor="@android:color/white"
-                android:textSize="16sp" />
-
-            <Button
-                android:id="@+id/sign_up"
-                android:layout_width="100dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="13dp"
-                android:background="@drawable/btn_white_bg"
-                android:padding="5dp"
-                android:text="@string/signup"
-                android:textColor="@color/black_text"
-                android:textSize="16sp" />
-        </LinearLayout>
-    </LinearLayout>
-
-</ScrollView>
 \ No newline at end of file
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@color/white_translucent"
+    android:minWidth="293dp"
+    android:orientation="vertical" >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="36dp" >
+
+        <TextView
+            android:id="@+id/switch_user"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="17dp"
+            android:text="@string/switch_user"
+            android:textColor="@color/black_text" />
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dp"
+            android:layout_alignParentBottom="true"
+            android:background="@color/light_gray" />
+    </RelativeLayout>
+
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginBottom="17dp"
+        android:layout_marginTop="23dp"
+        android:indeterminateBehavior="repeat"
+        android:indeterminateDrawable="@drawable/loading_progress"
+        android:indeterminateDuration="800"
+        android:indeterminateOnly="true" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="17dp"
+        android:text="@string/loging"
+        android:textColor="@color/black_text" />
+
+</LinearLayout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
     android:orientation="vertical" >
  
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="13dp"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal" >
+        android:background="@color/white_translucent"
+        android:orientation="vertical" >
  
-        <ImageView
-            android:id="@+id/utype_tag"
-            android:layout_width="25dp"
-            android:layout_height="25dp"
-            android:layout_marginRight="8dp"
-            android:src="@drawable/utype_quick" />
-
-        <TextView
-            android:id="@+id/tv_nick"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="31dp"
+            android:layout_marginLeft="35dp"
+            android:layout_marginRight="35dp"
+            android:layout_marginTop="13dp"
+            android:background="@color/white" >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="9.5dp"
+                android:layout_marginRight="9.5dp"
+                android:src="@drawable/ic_user" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center_vertical"
+                android:background="@color/light_gray" />
+
+            <EditText
+                android:id="@+id/username"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/transparent"
+                android:hint="@string/user_name_hint"
+                android:paddingLeft="6dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="31dp"
+            android:layout_marginLeft="35dp"
+            android:layout_marginRight="35dp"
+            android:layout_marginTop="16dp"
+            android:background="@color/white"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="12.5dp"
+                android:layout_marginRight="12.5dp"
+                android:src="@drawable/ic_pwd" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center_vertical"
+                android:background="@color/light_gray" />
+
+            <EditText
+                android:id="@+id/pwd"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:hint="@string/password_hint"
+                android:inputType="textPassword"
+                android:paddingLeft="6dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="35dp"
+            android:layout_marginRight="35dp"
+            android:layout_marginTop="16dp"
+            android:orientation="horizontal" >
+
+            <Button
+                android:id="@+id/gump_reg"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:layout_weight="1"
+                android:background="@drawable/btn_green_bg"
+                android:text="@string/signup"
+                android:textColor="@color/white" />
+
+            <Button
+                android:id="@+id/gump_login"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="11dp"
+                android:layout_weight="1"
+                android:background="@drawable/btn_orange_bg"
+                android:gravity="center"
+                android:text="@string/login"
+                android:textColor="@android:color/white"
+                android:textSize="15sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/play"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:textColor="@color/black_text"
-            android:textSize="15sp"
+            android:layout_marginBottom="16dp"
+            android:layout_marginLeft="35dp"
+            android:layout_marginRight="35dp"
+            android:layout_marginTop="16dp"
+            android:background="@drawable/btn_orange_bg"
+            android:padding="5dp"
+            android:text="@string/quick_play"
+            android:textColor="@android:color/white"
+            android:textSize="16sp"
             android:textStyle="bold" />
+
+        <ImageView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="35dp"
+            android:layout_marginRight="35dp"
+            android:background="@drawable/horizontal_line" />
     </LinearLayout>
  
-    <Button
-        android:id="@+id/play"
-        android:layout_width="fill_parent"
-        android:layout_height="46dp"
-        android:layout_marginBottom="10dp"
-        android:layout_marginLeft="13dp"
-        android:layout_marginRight="13dp"
-        android:layout_marginTop="23dp"
-        android:background="@drawable/btn_orange_bg"
-        android:padding="5dp"
-        android:text="@string/quick_play"
-        android:textStyle="bold"
-        android:textColor="@android:color/white"
-        android:textSize="16sp" />
-
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="2dp"
-        android:background="@drawable/dash_line" />
-
-    <Button
-        android:id="@+id/fb_login"
-        android:layout_width="fill_parent"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="13dp"
-        android:layout_marginRight="13dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/com_facebook_button_blue"
-        android:text="@string/fb_login"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:textStyle="bold" />
-
-    <Button
-        android:id="@+id/gump_login"
-        android:layout_width="fill_parent"
-        android:layout_height="40dp"
-        android:layout_marginBottom="15dp"
-        android:layout_marginLeft="13dp"
-        android:layout_marginRight="13dp"
-        android:layout_marginTop="8dp"
-        android:background="@drawable/btn_light_gray_bg"
-        android:gravity="center"
-        android:text="@string/gump_login"
-        android:textColor="@android:color/white"
-        android:textSize="15sp"
-        android:textStyle="bold" />
+        android:background="@drawable/bottom_light_bg"
+        android:gravity="center_horizontal" >
+
+        <ImageView
+            android:id="@+id/fb_login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="5dp"
+            android:src="@drawable/ic_fb" />
+
+        <ImageView
+            android:id="@+id/vk_login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginLeft="5dp"
+            android:src="@drawable/ic_vk" />
+    </LinearLayout>
  
 </LinearLayout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:scrollbars="none" >
  
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/dialog_bg"
-        android:minWidth="293dp"
+        android:minWidth="292dp"
         android:orientation="vertical" >
  
-        <EditText
-            android:id="@+id/username"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:background="@drawable/et_bg"
-            android:hint="@string/user_name_hint"
-            android:imeOptions="flagNoExtractUi"
-            android:textColor="@color/black_text" />
-
-        <EditText
-            android:id="@+id/pwd"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:background="@drawable/et_bg"
-            android:hint="@string/password_hint"
-            android:imeOptions="flagNoExtractUi"
-            android:inputType="textPassword"
-            android:textColor="@color/black_text" />
-
-        <Button
-            android:id="@+id/signup"
+            android:background="@color/white_translucent"
+            android:orientation="vertical" >
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/light_gray" />
+
+            <EditText
+                android:id="@+id/username"
+                android:layout_width="match_parent"
+                android:layout_height="31dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginLeft="35dp"
+                android:layout_marginRight="35dp"
+                android:layout_marginTop="15dp"
+                android:paddingLeft="8dp"
+                android:background="@color/white"
+                android:hint="@string/user_name_hint"
+                android:imeOptions="flagNoExtractUi"
+                android:textColor="@color/black_text" />
+
+            <EditText
+                android:id="@+id/pwd"
+                android:layout_width="match_parent"
+                android:layout_height="31dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginLeft="35dp"
+                android:layout_marginRight="35dp"
+                android:layout_marginTop="10dp"
+                android:paddingLeft="8dp"
+                android:background="@color/white"
+                android:hint="@string/password_hint"
+                android:imeOptions="flagNoExtractUi"
+                android:inputType="textPassword"
+                android:textColor="@color/black_text" />
+        </LinearLayout>
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:background="@drawable/btn_orange_bg"
-            android:padding="5dp"
-            android:text="@string/signup"
-            android:textColor="@android:color/white"
-            android:textSize="16sp" />
+            android:background="@drawable/bottom_light_bg" >
+
+            <Button
+                android:id="@+id/signup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="35dp"
+                android:layout_marginRight="35dp"
+                android:layout_marginTop="8dp"
+                android:background="@drawable/btn_orange_bg"
+                android:padding="5dp"
+                android:text="@string/signup"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
+        </LinearLayout>
     </LinearLayout>
  
 </ScrollView>
 \ No newline at end of file
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/login_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+</LinearLayout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="45dp"
-    android:background="@drawable/dialog_bg" >
+    android:layout_height="wrap_content"
+    android:background="@drawable/title_light_bg" >
  
     <ImageView
         android:id="@+id/btn_back"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
-        android:paddingLeft="10dp"
+        android:layout_marginLeft="10dp"
+        android:paddingLeft="20dp"
         android:paddingRight="10dp"
         android:src="@drawable/ic_back_dark" />
  
@@ -26,8 +27,9 @@
     <ImageView
         android:id="@+id/log"
         android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:layout_centerInParent="true"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="27dp"
+        android:layout_marginLeft="35dp"
         android:visibility="gone" />
  
     <TextView
@@ -38,19 +40,4 @@
         android:textColor="@android:color/black"
         android:textSize="18sp" />
  
-    <ImageView
-        android:id="@+id/btn_cancel"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:padding="10dp"
-        android:src="@drawable/ic_cancel_dark" />
-
-    <View
-        android:layout_width="fill_parent"
-        android:layout_height="1dp"
-        android:layout_alignParentBottom="true"
-        android:background="@color/line" />
-
 </RelativeLayout>
 \ No newline at end of file
@@ -2,10 +2,13 @@
  
     <string name="user_name_hint">Email</string>
     <string name="password_hint">Senha</string>
+    <string name="quick_play">jogo de hóspedes</string>
     <string name="login">Login</string>
     <string name="signup">Registrar</string>
     <string name="bind">Vincular ao email</string>
     <string name="loading">Carregando</string>
+    <string name="loging">Carregando</string>
+    <string name="switch_user">Contas de comutação</string>
     <!-- toast -->
     <string name="illegal_uname_tip">Email inválido</string>
     <string name="illegal_pwd_tip">Senha Inválida (6-20 caracteres)</string>
@@ -16,6 +19,8 @@
     <string name="login_fail">Login falhou</string>
     <string name="signup_fail">Registrar falhou</string>
     <string name="bind_fail">Vincular falhou</string>
+    <string name="gen_quick_acc_err">Entre falhou, por favor tente novamente</string>
+    <string name="quick_login_err">Entre falhou, por favor tente novamente</string>
     <!-- facebook id -->
  
 </resources>
 \ No newline at end of file
@@ -2,10 +2,13 @@
  
     <string name="user_name_hint">อีเมลล์</string>
     <string name="password_hint">พาสเวิร์ด</string>
+    <string name="quick_play">การเล่นของผู้เข้าพัก</string>
     <string name="login">ล็อกอิน</string>
     <string name="signup">ลงทะเบียน</string>
     <string name="bind">ผูกอีเมลล์</string>
     <string name="loading">กำลังโหลด</string>
+    <string name="loging">กำลังโหลด</string>
+    <string name="switch_user">การสลับบัญชี</string>
     <!-- toast -->
     <string name="illegal_uname_tip">อีเมลล์ไม่ถูกต้อง</string>
     <string name="illegal_pwd_tip">พาสเวิร์ดไม่ถูกต้อง(6-20 ตัวอักษร)</string>
@@ -35,5 +38,7 @@
     <string name="paypal_choice_tip">กรุณาเลือกยอดเติมเงิน</string>
     <!-- gp -->
     <string name="gp_choice_tip">กรุณาเลือกยอดเติมเงิน</string>
+    <string name="gen_quick_acc_err">เข้าสู่ระบบที่ล้มเหลวโปรดลองอีกครั้ง</string>
+    <string name="quick_login_err">เข้าสู่ระบบที่ล้มเหลวโปรดลองอีกครั้ง</string>
  
 </resources>
 \ No newline at end of file
@@ -6,6 +6,8 @@
     <string name="signup">註冊</string>
     <string name="bind">綁定郵箱</string>
     <string name="loading">加載中……</string>
+    <string name="loging">加載中……</string>
+    <string name="switch_user">切換賬戶</string>
     <!-- toast -->
     <string name="illegal_uname_tip">郵箱格式不正確</string>
     <string name="illegal_pwd_tip">密碼格式不正確 (6–20字符)</string>
@@ -34,5 +36,7 @@
     <string name="paypal_choice_tip">請選擇支付金額</string>
     <!-- gp -->
     <string name="gp_choice_tip">請選擇支付金額</string>
+    <string name="gen_quick_acc_err">登錄失敗，請重試</string>
+    <string name="quick_login_err">登錄失敗，請重試</string>
  
 </resources>
 \ No newline at end of file
@@ -2,10 +2,13 @@
  
     <string name="user_name_hint">邮箱</string>
     <string name="password_hint">密码</string>
+    <string name="quick_play">Guest Play</string>
     <string name="login">登录</string>
     <string name="signup">注册</string>
     <string name="bind">绑定邮箱</string>
     <string name="loading">加载中……</string>
+    <string name="loging">加载中……</string>
+    <string name="switch_user">切换用户</string>
     <!-- toast -->
     <string name="illegal_uname_tip">请输入正确的邮箱</string>
     <string name="illegal_pwd_tip">密码格式不正确 (6–20字符)</string>
@@ -34,5 +37,7 @@
     <string name="paypal_choice_tip">请选择支付金额</string>
     <!-- gp -->
     <string name="gp_choice_tip">请选择支付金额</string>
+    <string name="gen_quick_acc_err">登录失败，请重试</string>
+    <string name="quick_login_err">登录失败，请重试</string>
  
 </resources>
 \ No newline at end of file
@@ -2,14 +2,17 @@
 <resources>
  
     <color name="white">#FFFFFF</color>
+    <color name="white_translucent">#D9FFFFFF</color>
     <color name="line">#e5e5e5</color>
     <color name="light_gray">#c9c9c9</color>
     <color name="dark_gray">#d9d9d9</color>
-    <color name="orange_normal">#fe5f27</color>
-    <color name="orange_pressed">#fe0000</color>
+    <color name="orange_normal">#f8b500</color>
+    <color name="orange_pressed">#ffc62c</color>
     <color name="black_text">#3f3c38</color>
-    <color name="btn_white_normal">#f8f7f4</color>
-    <color name="btn_white_pressed">#f8f7f4</color>
+<!--     <color name="btn_white_normal">#f8f7f4</color> -->
+<!--     <color name="btn_white_pressed">#f8f7f4</color> -->
+    <color name="btn_green_normal">#3eb370</color>
+    <color name="btn_green_pressed">#3cca79</color>
  
     <color name="common_gray">#ecf0f0</color>
     <color name="common_gray2">#e0e6e8</color>
@@ -3,11 +3,13 @@
     <string name="user_name_hint">Email</string>
     <string name="password_hint">Password</string>
     <string name="quick_login">Play(%sS)</string>
-    <string name="quick_play">Play</string>
+    <string name="quick_play">Guest Play</string>
     <string name="login">Login</string>
     <string name="signup">Signup</string>
     <string name="bind">Bound to email</string>
     <string name="loading">Loading</string>
+    <string name="loging">Loding...</string>
+    <string name="switch_user">Switching accounts</string>
     <!-- toast -->
     <string name="illegal_uname_tip">Invalid Email</string>
     <string name="illegal_pwd_tip">Invalid Password (6–20 characters).</string>
@@ -19,9 +21,12 @@
     <string name="signup_fail">Signup failed</string>
     <string name="bind_fail">Bound failed</string>
     <string name="net_error">Internet unavailable, please check</string>
-    <string name="gump_login">Login with Gumptech</string>
+    <string name="gump_login">Login</string>
+    <string name="vk_login">Login with VK</string>
     <string name="fb_login">Login with Facebook</string>
     <string name="signup_success">Sign Up Successfully</string>
+    <string name="gen_quick_acc_err">Login failed, please try again</string>
+    <string name="quick_login_err">Login failed, please try again</string>
     <!-- facebook -->
  
  
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
  
-    <style name="container_dialog" >
+    <style name="Theme.TransparentWin" parent="android:Theme">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowIsTranslucent">true</item>
@@ -11,7 +11,7 @@
         <item name="android:windowFullscreen">true</item>
     </style>
  
-    <style name="ex_win" parent="@style/container_dialog">
+    <style name="Theme.WinForExchange" parent="@style/Theme.TransparentWin">
         <item name="android:backgroundDimEnabled">true</item>
     </style>
  
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.loginsdk.sample"
+    package="com.gumpsdk.wuruid"
     android:versionCode="6"
     android:versionName="1.6" >
  
@@ -40,7 +40,8 @@
         <activity
             android:name="com.gumptech.sdk.ContainerActivity"
             android:configChanges="orientation|screenLayout"
-            android:theme="@style/container_dialog" >
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
+            android:theme="@style/Theme.TransparentWin" >
         </activity>
         <activity
             android:name="com.gumptech.sdk.PaymentActivity"
@@ -50,7 +51,7 @@
         <activity
             android:name="com.gumptech.sdk.ExchangeWindow"
             android:configChanges="orientation|screenLayout"
-            android:theme="@style/ex_win" >
+            android:theme="@style/Theme.WinForExchange" >
         </activity>
  
         <service android:name="com.gumptech.sdk.PushService" >
@@ -62,6 +63,12 @@
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             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" />
     </application>
  
 </manifest>
 \ No newline at end of file
@@ -12,5 +12,5 @@
  
 # Project target.
  
-target=android-19
+target=android-21
 android.library.reference.1=..\\GameSDKRelease
@@ -20,6 +20,7 @@
         android:id="@+id/login_or_logout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:enabled="false"
         android:text="Login" />
  
     <Button
 package com.gumptech.loginsdk.sample;
  
 import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -15,7 +14,7 @@ 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.loginsdk.sample.R;
+import com.gumpsdk.wuruid.R;
  
 public class MainActivity extends Activity  implements PurchaseCallback{
  
@@ -55,13 +54,29 @@ public class MainActivity extends Activity  implements PurchaseCallback{
                 payInfo.putString("product", "元宝");
                 payInfo.putFloat("amount", 0.0f);
                 payInfo.putString("extraInfo", "This is demo!");
-                payInfo.putString("serverId", "5001");
-                GumpSDK.pay(MainActivity.this, payInfo, "3332768", MainActivity.this);
+                payInfo.putString("serverId", "103");
+                GumpSDK.pay(MainActivity.this, payInfo, "6151046", MainActivity.this);
             }
         });
+        /**
+         * 设置否是开启debug模式
+         */
         GumpSDK.setDebugState(true);
-        GumpSDK.setLogoShow(true);
+        /**
+         * 设置是否启用facebook登录
+         */
+        GumpSDK.setFBEnable(true);
+        /**
+         * 设置是否启用Vk登录
+         */
+        GumpSDK.setVKEnable(true);
+        /**
+         * 设置屏幕方向
+         */
         GumpSDK.setScreenLandscape(false);
+        /**
+         * 设置用户登录状态监听器
+         */
         GumpSDK.setUserStateListener(new LoginStateListener() {
             @Override
             public void onLoginSuccess(GumpUser user) {
@@ -88,6 +103,9 @@ public class MainActivity extends Activity  implements PurchaseCallback{
                 userInfo.setText("User is logout");
             }
         });
+        /**
+         * 初始化sdk
+         */
         GumpSDK.init(getApplicationContext(), appId, appKey, "1000", new InitializeCallback() {
             @Override
             public void initComplete(int result) {
...	...	@@ -11,6 +11,7 @@
11	11	#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
12	12
13	13	# Project target.
14		-target=android-18
	14	+target=android-19
15	15	android.library=true
16		-android.library.reference.1=../../../../../facebook
	16	+android.library.reference.1=..\\..\\..\\..\\..\\facebook
	17	+android.library.reference.2=../../../../../Project/vksdk_library
...	...	@@ -0,0 +1,21 @@
	1	+<?xml version="1.0" encoding="utf-8"?>
	2	+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
	3	+ <item android:state_pressed="true">
	4	+ <shape android:shape="rectangle">
	5	+ <corners android:radius="1.5dp" />
	6	+
	7	+ <solid android:color="@color/btn_green_pressed" />
	8	+
	9	+ <size android:height="30.5dp" />
	10	+ </shape></item>
	11	+ <item>
	12	+ <shape android:shape="rectangle">
	13	+ <corners android:radius="1.5dp" />
	14	+
	15	+ <solid android:color="@color/btn_green_normal" />
	16	+
	17	+ <size android:height="30.5dp" />
	18	+ </shape></item>
	19	+
	20	+
	21	+</selector>
...	...	@@ -1,19 +0,0 @@
1		-<?xml version="1.0" encoding="utf-8"?>
2		-<selector xmlns:android="http://schemas.android.com/apk/res/android">
3		-
4		- <item android:state_pressed="true"><shape>
5		- <corners android:radius="3dp" />
6		-
7		- <solid android:color="@color/dark_gray" />
8		-
9		- <size android:height="30dp" />
10		- </shape></item>
11		- <item><shape>
12		- <corners android:radius="3dp" />
13		-
14		- <solid android:color="@color/light_gray" />
15		-
16		- <size android:height="30dp" />
17		- </shape></item>
18		-
19		-</selector>
20	0	\ No newline at end of file
1	1	<?xml version="1.0" encoding="utf-8"?>
2	2	<selector xmlns:android="http://schemas.android.com/apk/res/android">
3		-
4		- <item android:state_pressed="true" android:drawable="@drawable/btn_orange_pressed"/>
5		- <item android:drawable="@drawable/btn_orange_normal"/>
6	3
7		-<!-- <item android:state_pressed="true"> -->
8		-<!-- <shape android:shape="rectangle"> -->
9		-<!-- <corners android:radius="3dp" /> -->
	4	+ <!-- <item android:state_pressed="true" android:drawable="@drawable/btn_orange_pressed"/> -->
	5	+ <!-- <item android:drawable="@drawable/btn_orange_normal"/> -->
10	6
11		-<!-- <solid android:color="@color/orange_pressed" /> -->
	7	+ <item android:state_pressed="true">
	8	+ <shape android:shape="rectangle">
	9	+ <corners android:radius="1.5dp" />
12	10
13		-<!-- <size android:height="35dp" /> -->
14		-<!-- </shape> -->
15		-
16		-<!-- </item> -->
17		-<!-- <item> -->
18		-<!-- <shape android:shape="rectangle"> -->
19		-<!-- <corners android:radius="3dp" /> -->
	11	+ <solid android:color="@color/orange_pressed" />
20	12
21		-<!-- <solid android:color="@color/orange_normal" /> -->
	13	+ <size android:height="30.5dp" />
	14	+ </shape></item>
	15	+ <item>
	16	+ <shape android:shape="rectangle">
	17	+ <corners android:radius="1.5dp" />
22	18
23		-<!-- <size android:height="35dp" /> -->
24		-<!-- </shape> -->
25		-
26		-<!-- </item> -->
	19	+ <solid android:color="@color/orange_normal" />
	20	+
	21	+ <size android:height="30.5dp" />
	22	+ </shape></item>
27	23
28	24	</selector>
29	25	\ No newline at end of file
...	...	@@ -1,29 +0,0 @@
1		-<?xml version="1.0" encoding="utf-8"?>
2		-<selector xmlns:android="http://schemas.android.com/apk/res/android">
3		-
4		- <item android:state_pressed="true">
5		- <shape android:shape="rectangle">
6		- <corners android:radius="3dp" />
7		-
8		- <solid android:color="@color/btn_white_pressed" />
9		-
10		- <size android:height="35dp" />
11		-
12		- <stroke android:width="1dp" android:color="@color/line" />
13		- </shape>
14		-
15		- </item>
16		- <item>
17		- <shape android:shape="rectangle">
18		- <corners android:radius="3dp" />
19		-
20		- <solid android:color="@color/btn_white_normal" />
21		-
22		- <size android:height="35dp" />
23		-
24		- <stroke android:width="1dp" android:color="@color/line" />
25		- </shape>
26		-
27		- </item>
28		-
29		-</selector>
30	0	\ No newline at end of file
...	...	@@ -1,10 +0,0 @@
1		-<?xml version="1.0" encoding="utf-8"?>
2		-<shape xmlns:android="http://schemas.android.com/apk/res/android"
3		- android:shape="rectangle" >
4		-
5		- <corners android:radius="3dp" />
6		-
7		- <solid android:color="#f2efeb" />
8		- <size android:height="35dp"/>
9		-
10		-</shape>
11	0	\ No newline at end of file
...	...	@@ -1,8 +0,0 @@
1		-<?xml version="1.0" encoding="utf-8"?>
2		-<selector xmlns:android="http://schemas.android.com/apk/res/android">
3		-
4		- <item android:drawable="@drawable/com_facebook_button_blue_pressed" android:state_focused="true" android:state_pressed="true"/>
5		- <item android:drawable="@drawable/com_facebook_button_blue_pressed" android:state_focused="false" android:state_pressed="true"/>
6		- <item android:drawable="@drawable/com_facebook_button_blue_normal"/>
7		-
8		-</selector>
...	...	@@ -1,5 +0,0 @@
1		-<?xml version="1.0" encoding="utf-8"?>
2		-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
3		- <corners android:radius="5dp"/>
4		- <solid android:color="@android:color/white"/>
5		-</shape>
...	...	@@ -1,21 +0,0 @@
1		-<?xml version="1.0" encoding="utf-8"?>
2		-<shape xmlns:android="http://schemas.android.com/apk/res/android"
3		- android:shape="rectangle" >
4		-
5		- <solid android:color="@android:color/white" />
6		-
7		- <stroke
8		- android:width="1dp"
9		- android:color="@color/line" />
10		-
11		- <size android:height="35dp" />
12		-
13		- <padding
14		- android:bottom="2dp"
15		- android:left="8dp"
16		- android:right="8dp"
17		- android:top="2dp" />
18		-
19		- <corners android:radius="5dp" />
20		-
21		-</shape>
22	0	\ No newline at end of file
...	...	@@ -1,7 +0,0 @@
1		-<?xml version="1.0" encoding="utf-8"?>
2		-<selector xmlns:android="http://schemas.android.com/apk/res/android">
3		-
4		- <item android:drawable="@color/orange_normal" android:state_pressed="true"/>
5		- <item android:drawable="@android:color/white"/>
6		-
7		-</selector>
8	0	\ No newline at end of file