From 4bda504ebac0a5c75592ed17ca51121147ad1a87 Mon Sep 17 00:00:00 2001
From: Martin <13046765170@163.com>
Date: Thu, 10 Oct 2024 15:15:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E9=BD=90=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/main/activity/EntryActivity.java   |   5 +-
 main/src/main/res/layout/activity_entry.xml   |  64 ++++++++++--------
 .../res/mipmap-xxxhdpi/login_twitter.webp     | Bin 2928 -> 2150 bytes
 3 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
index 163630fed..669f3f522 100644
--- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
@@ -91,6 +91,7 @@ import com.yunbao.common.manager.NoviceInstructorManager;
 import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.GoogleUtils;
+import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.http.LiveHttpUtil;
@@ -121,10 +122,10 @@ import java.util.TimerTask;
 public class EntryActivity extends AppCompatActivity {
 
     //private VideoView video_view;
-    private ImageView btn_line, btn_twitter;
+    private ImageView btn_line, btn_twitter,btn_phone;
     private TextView btn_tip, btn_tip1, tv_customer;
     private TwitterLoginButton tt_login_button;
-    private LinearLayout btn_google, googleLayout,btn_phone;
+    private LinearLayout btn_google, googleLayout;
     public static Activity activity;
     private static String mLoginType = Constants.MOB_PHONE;//登录方式
     public String mPromoCode = "", UserID = "",agent_code = "";//推广码
diff --git a/main/src/main/res/layout/activity_entry.xml b/main/src/main/res/layout/activity_entry.xml
index f60997e6b..9323eff15 100644
--- a/main/src/main/res/layout/activity_entry.xml
+++ b/main/src/main/res/layout/activity_entry.xml
@@ -35,7 +35,7 @@
             android:layout_marginBottom="21dp">
 
             <LinearLayout
-                android:visibility="gone"
+                android:visibility="visible"
                 android:id="@+id/lt_btn_facebook"
                 android:layout_width="match_parent"
                 android:layout_height="56dp"
@@ -94,7 +94,8 @@
             </LinearLayout>
         </LinearLayout>
 
-        <LinearLayout
+        <!--<LinearLayout
+            android:visibility="gone"
             android:id="@+id/phonelayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -125,7 +126,7 @@
                     android:textColor="@color/black1"
                     android:textSize="14sp" />
             </LinearLayout>
-        </LinearLayout>
+        </LinearLayout>-->
 
         <!--        <RelativeLayout-->
         <!--            android:layout_width="match_parent"-->
@@ -171,7 +172,6 @@
 
         <LinearLayout
             android:id="@+id/lt_login_other"
-            android:layout_marginTop="100dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="25dp"
@@ -194,6 +194,14 @@
                     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"
@@ -221,12 +229,11 @@
                     android:layout_gravity="center"
                     android:layout_weight="1"
                     android:src="@mipmap/login_line"
-                    android:visibility="gone" />
+                    android:visibility="visible" />
 
                 <RelativeLayout
                     android:id="@+id/lt_lyout_twitter"
                     android:layout_width="57dp"
-                    android:visibility="gone"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
 
@@ -251,6 +258,24 @@
                     </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="#ffb1b1b1"
+                    android:textSize="11sp" />
             </LinearLayout>
 
             <LinearLayout
@@ -259,14 +284,14 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="22dp"
-                android:layout_marginBottom="40dp"
+                android:layout_marginBottom="22dp"
                 android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="@string/next_step_is_consent"
-                    android:textColor="#FF999999"
+                    android:textColor="#ffb1b1b1"
                     android:textSize="10sp" />
 
 
@@ -276,7 +301,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
                     android:text="@string/user_protocol2"
-                    android:textColor="#FF000000"
+                    android:textColor="#ffb1b1b1"
                     android:textSize="10sp" />
 
                 <TextView
@@ -284,7 +309,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
                     android:text="@string/and"
-                    android:textColor="#FF999999"
+                    android:textColor="#ffb1b1b1"
                     android:textSize="10sp" />
 
                 <TextView
@@ -293,28 +318,11 @@
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
                     android:text="@string/privacy_terms"
-                    android:textColor="#FF000000"
+                    android:textColor="#ffb1b1b1"
                     android:textSize="10sp" />
 
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/lt_customer"
-                android:layout_marginBottom="20dp"
-                android:layout_width="match_parent"
-                android:visibility="gone"
-                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>
 
diff --git a/main/src/main/res/mipmap-xxxhdpi/login_twitter.webp b/main/src/main/res/mipmap-xxxhdpi/login_twitter.webp
index 9bad3eb6c492a4bbef05d01d89f056ae4e8b87c7..8f310a91f09c869ef83d760c8829961f69cbb45d 100644
GIT binary patch
literal 2150
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

literal 2928
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
azp8)5EqIh*#f6+|NDtJ1sjP)#U;qHFeVrTt