修改首页登录UI

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

@@ -3,7 +3,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="30dp" />
-            <solid android:color="#ffffff" />
+            <solid android:color="#FFF4F4F4" />
         </shape>
     </item>
 </selector>

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

@@ -119,11 +119,11 @@ import java.util.TimerTask;
 @Route(path = RouteUtil.PATH_ENTRY)
 public class EntryActivity extends AppCompatActivity {
 
-    private VideoView video_view;
-    private ImageView btn_phone, btn_line, btn_twitter;
+    //private VideoView video_view;
+    private ImageView btn_line, btn_twitter;
     private TextView btn_tip, btn_tip1, tv_customer;
     private TwitterLoginButton tt_login_button;
-    private LinearLayout btn_google, googleLayout;
+    private LinearLayout btn_google, googleLayout,btn_phone;
     public static Activity activity;
     private static String mLoginType = Constants.MOB_PHONE;//登录方式
     public String mPromoCode = "", UserID = "";//推广码
@@ -287,7 +287,7 @@ public class EntryActivity extends AppCompatActivity {
 
         getPromoCode();
         getUuidDevice();
-        video_view = findViewById(R.id.video_view);
+        /*video_view = findViewById(R.id.video_view);
         video_view.setVideoPath(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.login_video) + "");
         video_view.start();
         video_view.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
@@ -306,7 +306,7 @@ public class EntryActivity extends AppCompatActivity {
                 video_view.setVisibility(View.GONE);
                 return false;
             }
-        });
+        });*/
 
         lt_btn_facebook.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -664,7 +664,7 @@ public class EntryActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        video_view.start();
+        //video_view.start();
 
     }
 

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

@@ -4,13 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     tools:context=".activity.EntryActivity">
 
-
-    <com.yunbao.main.views.CustomVideoView
+    <ImageView
         android:id="@+id/video_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="248dp"
+        android:background="@mipmap/entry_bg"
         android:layout_gravity="center" />
 
     <ImageView
@@ -36,23 +37,23 @@
             <LinearLayout
                 android:id="@+id/lt_btn_facebook"
                 android:layout_width="match_parent"
-                android:layout_height="54dp"
-                android:layout_marginLeft="42dp"
-                android:layout_marginRight="42dp"
+                android:layout_height="56dp"
+                android:layout_marginLeft="48dp"
+                android:layout_marginRight="48dp"
                 android:background="@drawable/background_227bef"
-                android:gravity="center|left">
+                android:gravity="center_vertical">
 
                 <ImageView
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
                     android:layout_gravity="center"
-                    android:layout_marginLeft="54dp"
+                    android:layout_marginLeft="20dp"
                     android:src="@mipmap/icon_facebook" />
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_marginStart="25dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="21dp"
                     android:text="@string/user_login_facebook"
                     android:textColor="@color/white"
                     android:textSize="14sp" />
@@ -69,29 +70,62 @@
             <LinearLayout
                 android:id="@+id/btn_google"
                 android:layout_width="match_parent"
-                android:layout_height="54dp"
-                android:layout_marginLeft="42dp"
-                android:layout_marginRight="42dp"
+                android:layout_height="56dp"
+                android:layout_marginLeft="48dp"
+                android:layout_marginRight="48dp"
                 android:background="@drawable/background_fff_d20"
-                android:gravity="center|left">
+                android:gravity="center_vertical">
 
                 <ImageView
-                    android:layout_width="45dp"
-                    android:layout_height="45dp"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
                     android:layout_gravity="center"
-                    android:layout_marginLeft="54dp"
+                    android:layout_marginLeft="20dp"
                     android:src="@mipmap/login_google" />
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="6dp"
+                    android:layout_marginLeft="25dp"
                     android:text="@string/user_login_google"
                     android:textColor="@color/black1"
                     android:textSize="14sp" />
             </LinearLayout>
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/phonelayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="21dp">
+
+            <LinearLayout
+                android:id="@+id/btn_phone"
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:layout_marginLeft="48dp"
+                android:layout_marginRight="48dp"
+                android:background="@drawable/background_fff_d20"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="20dp"
+                    android:src="@mipmap/entry_phone" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="使用手機號登錄"
+                    android:layout_marginLeft="25dp"
+                    android:textColor="@color/black1"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </LinearLayout>
+
         <!--        <RelativeLayout-->
         <!--            android:layout_width="match_parent"-->
         <!--            android:layout_height="wrap_content"-->
@@ -158,14 +192,6 @@
                     android:src="@mipmap/login_phone"
                     android:visibility="gone" />
 
-                <ImageView
-                    android:id="@+id/btn_phone"
-                    android:layout_width="57dp"
-                    android:layout_height="57dp"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:src="@mipmap/login_phone" />
-
                 <RelativeLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -193,11 +219,12 @@
                     android:layout_gravity="center"
                     android:layout_weight="1"
                     android:src="@mipmap/login_line"
-                    android:visibility="visible" />
+                    android:visibility="gone" />
 
                 <RelativeLayout
                     android:id="@+id/lt_lyout_twitter"
                     android:layout_width="57dp"
+                    android:visibility="gone"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
 
@@ -222,24 +249,6 @@
                     </LinearLayout>
                 </RelativeLayout>
 
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:id="@+id/lt_customer"
-                android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_marginTop="30dp"
-                android:gravity="center">
-
-                <TextView
-                    android:id="@+id/tv_customer"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/customer_service2"
-                    android:textColor="@color/white"
-                    android:textSize="11sp" />
             </LinearLayout>
 
             <LinearLayout
@@ -248,14 +257,14 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="22dp"
-                android:layout_marginBottom="22dp"
+                android:layout_marginBottom="8dp"
                 android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="@string/next_step_is_consent"
-                    android:textColor="#ffb1b1b1"
+                    android:textColor="#FF999999"
                     android:textSize="10sp" />
 
 
@@ -265,7 +274,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
                     android:text="@string/user_protocol2"
-                    android:textColor="#ffb1b1b1"
+                    android:textColor="#FF000000"
                     android:textSize="10sp" />
 
                 <TextView
@@ -273,7 +282,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
                     android:text="@string/and"
-                    android:textColor="#ffb1b1b1"
+                    android:textColor="#FF999999"
                     android:textSize="10sp" />
 
                 <TextView
@@ -282,11 +291,27 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
                     android:text="@string/privacy_terms"
-                    android:textColor="#ffb1b1b1"
+                    android:textColor="#FF000000"
                     android:textSize="10sp" />
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/lt_customer"
+                android:layout_marginBottom="20dp"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:gravity="center">
+
+                <TextView
+                    android:id="@+id/tv_customer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/customer_service2"
+                    android:textColor="#FF999999"
+                    android:textSize="11sp" />
+            </LinearLayout>
+
         </LinearLayout>
     </LinearLayout>
 
@@ -294,7 +319,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="80dp"
+        android:layout_marginTop="125dp"
         android:src="@mipmap/white_logo" />
 
     <androidx.constraintlayout.widget.ConstraintLayout