需求：修改登录页面

common/src/main/res/values-en/strings.xml

@@ -801,6 +801,7 @@
     <string name="user_task_but">Predecessors</string>
     <string name="user_login_facebook">Sign in with Facebook</string>
     <string name="user_login_twitter">Sign in with Twitter</string>
+    <string name="user_login_google">Sign in with Google</string>
 
     <string name="user_login_outtime">Request timed out, please try again later.</string>
 

common/src/main/res/values/strings.xml

@@ -826,6 +826,7 @@
 
     <string name="user_login_facebook">使用Facebook登录</string>
     <string name="user_login_twitter">使用Twitter登录</string>
+    <string name="user_login_google">使用Google登录</string>
 
     <string name="user_login_outtime">請求超時，請稍後再試。</string>
 

config.gradle

@@ -4,15 +4,16 @@ ext {
             buildToolsVersion: "28.0.3",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            versionCode      : 310,
+            versionCode      : 400,
-            versionName      : "6.4.6"
+
+            versionName      : "6.4.5"
     ]
     manifestPlaceholders = [
             //正式
 
-            //serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
 //            測試
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
             //腾讯地图
             txMapAppKey      : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
@@ -27,6 +28,6 @@ ext {
 //            true表示谷歌支付 false
             isGooglePlay     :  false,
             //是否上报异常日志
-            isUploadLog      :  false
+            isUploadLog      :  true
     ]
 }

live/src/main/res/drawable/background_fff_d20.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="30dp" />
+            <solid android:color="#ffffff" />
+        </shape>
+    </item>
+</selector>

main/src/main/java/com/yunbao/main/activity/EntryActivity.java

@@ -111,9 +111,10 @@ import java.util.TimerTask;
 public class EntryActivity extends AppCompatActivity {
 
     private VideoView video_view;
-    private ImageView btn_phone, btn_line, btn_google, btn_twitter;
+    private ImageView btn_phone, btn_line, btn_twitter;
     private TextView btn_tip, btn_tip1, tv_customer;
     private TwitterLoginButton tt_login_button;
+    private LinearLayout btn_google;
     public static Activity activity;
     private static String mLoginType = Constants.MOB_PHONE;//登录方式
     public String mPromoCode = "";//推广码

main/src/main/res/layout/activity_entry.xml

@@ -58,46 +58,80 @@
             </LinearLayout>
         </LinearLayout>
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginBottom="21dp"
+            android:layout_marginBottom="21dp">
-            android:orientation="vertical">
-
-            <com.twitter.sdk.android.core.identity.TwitterLoginButton
-                android:id="@+id/tt_login_button"
-                android:layout_width="match_parent"
-                android:layout_height="54dp"
-                android:layout_marginLeft="42dp"
-                android:layout_marginRight="42dp"
-                android:visibility="invisible" />
 
             <LinearLayout
-                android:id="@+id/lt_btn_twitter"
+                android:id="@+id/btn_google"
                 android:layout_width="match_parent"
                 android:layout_height="54dp"
                 android:layout_marginLeft="42dp"
                 android:layout_marginRight="42dp"
-                android:background="@drawable/background_32aae0"
+                android:background="@drawable/background_fff_d20"
                 android:gravity="center|left">
 
                 <ImageView
-                    android:layout_width="30dp"
+                    android:layout_width="45dp"
-                    android:layout_height="30dp"
+                    android:layout_height="45dp"
                     android:layout_gravity="center"
                     android:layout_marginLeft="54dp"
-                    android:src="@mipmap/icon_twitter" />
+                    android:src="@mipmap/login_google" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="21dp"
+                    android:layout_marginLeft="6dp"
-                    android:text="@string/user_login_twitter"
+                    android:text="@string/user_login_google"
-                    android:textColor="@color/white"
+                    android:textColor="@color/black1"
                     android:textSize="14sp" />
             </LinearLayout>
-        </RelativeLayout>
+        </LinearLayout>
+
+        <!--        <RelativeLayout-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_gravity="center"-->
+        <!--            android:layout_marginBottom="21dp"-->
+        <!--            android:orientation="vertical">-->
+
+        <!--                    <com.twitter.sdk.android.core.identity.TwitterLoginButton-->
+        <!--                        android:id="@+id/tt_login_button"-->
+        <!--                        android:layout_width="match_parent"-->
+        <!--                        android:layout_height="54dp"-->
+        <!--                        android:layout_marginLeft="42dp"-->
+        <!--                        android:layout_marginRight="42dp"-->
+        <!--                        android:visibility="invisible" />-->
+
+        <!--            <LinearLayout-->
+        <!--                android:id="@+id/lt_btn_twitter"-->
+        <!--                android:layout_width="match_parent"-->
+        <!--                android:layout_height="54dp"-->
+        <!--                android:layout_marginLeft="42dp"-->
+        <!--                android:layout_marginRight="42dp"-->
+        <!--                android:background="@drawable/background_32aae0"-->
+        <!--                android:gravity="center|left">-->
+
+        <!--                <ImageView-->
+        <!--                    android:layout_width="30dp"-->
+        <!--                    android:layout_height="30dp"-->
+        <!--                    android:layout_gravity="center"-->
+        <!--                    android:layout_marginLeft="54dp"-->
+        <!--                    android:src="@mipmap/icon_twitter" />-->
+
+        <!--                <TextView-->
+        <!--                    android:layout_width="wrap_content"-->
+        <!--                    android:layout_height="wrap_content"-->
+        <!--                    android:layout_marginLeft="21dp"-->
+        <!--                    android:text="@string/user_login_twitter"-->
+        <!--                    android:textColor="@color/white"-->
+        <!--                    android:textSize="14sp" />-->
+        <!--            </LinearLayout>-->
+        <!--        </RelativeLayout>-->
+
+
 
         <LinearLayout
             android:id="@+id/lt_login_other"
@@ -160,13 +194,33 @@
                     android:src="@mipmap/login_line"
                     android:visibility="visible" />
 
+                <RelativeLayout
+                    android:layout_width="@dimen/sight_record_icon_padding"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
+
+                    <com.twitter.sdk.android.core.identity.TwitterLoginButton
+                        android:id="@+id/tt_login_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="54dp"
+                        android:visibility="invisible" />
+
+                    <LinearLayout
+                        android:id="@+id/lt_btn_twitter"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
                         <ImageView
-                    android:id="@+id/btn_google"
                             android:layout_width="57dp"
                             android:layout_height="57dp"
                             android:layout_gravity="center"
                             android:layout_weight="1"
-                    android:src="@mipmap/login_google" />
+                            android:src="@mipmap/login_twitter"
+                            android:visibility="visible" />
+                    </LinearLayout>
+                </RelativeLayout>
+
+
             </LinearLayout>