From 3624eb825cfc61d5e01402ce6dc4e3600015b75b Mon Sep 17 00:00:00 2001
From: wenfei <hwf452@163.com>
Date: Tue, 26 Aug 2025 11:18:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_login.xml | 55 ++++++++++++----------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 6e8478f..94316bb 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -14,9 +14,10 @@
         android:visibility="gone" />
 
     <TextView
+        android:id="@+id/tv_top"
         android:layout_width="match_parent"
-        android:layout_height="100px"
-        android:layout_marginTop="15dp"
+        android:layout_height="50dp"
+        android:layout_marginTop="30dp"
         android:gravity="center"
         android:text="珠电e办公"
         android:textSize="25sp"
@@ -24,37 +25,38 @@
 
     <ImageView
         android:id="@+id/iv_logo"
-        android:layout_width="300px"
-        android:layout_height="300px"
+        android:layout_width="130dp"
+        android:layout_height="130dp"
+        android:layout_below="@+id/tv_top"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="150px"
+        android:layout_marginTop="30dp"
         android:src="@drawable/logo" />
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="500px"
+        android:layout_height="260dp"
         android:layout_below="@id/iv_logo"
-        android:layout_marginLeft="60px"
-        android:layout_marginTop="20px"
-        android:layout_marginRight="60px"
+        android:layout_marginLeft="40dp"
+        android:layout_marginTop="30dp"
+        android:layout_marginRight="40dp"
         android:gravity="center"
         android:orientation="vertical">
 
         <com.rehome.zhdcoa.weiget.ClearEditText
             android:id="@+id/et_username"
             android:layout_width="match_parent"
-            android:layout_height="110px"
+            android:layout_height="60dp"
             android:background="@drawable/login_edit"
-            android:drawableLeft="@drawable/icon_user"
-            android:drawablePadding="20px"
+            android:drawableStart="@drawable/icon_user"
+            android:drawablePadding="10dp"
             android:hint="用户名"
-            android:paddingLeft="30px"
-            android:paddingRight="20px"
+            android:paddingStart="15dp"
+            android:paddingEnd="10dp"
             android:textColorHint="@color/gray" />
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="110px"
+            android:layout_height="60dp"
             android:background="@drawable/login_edit1"
             android:orientation="horizontal">
 
@@ -64,22 +66,22 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@null"
-                android:drawableLeft="@drawable/icon_pwd"
-                android:drawablePadding="20px"
+                android:drawableStart="@drawable/icon_pwd"
+                android:drawablePadding="10dp"
                 android:hint="密码"
                 android:inputType="textPassword"
-                android:paddingLeft="30px"
-                android:paddingRight="20px"
+                android:paddingStart="15dp"
+                android:paddingEnd="10dp"
                 android:textColorHint="@color/gray" />
 
             <Button
                 android:id="@+id/btn_login"
-                android:layout_width="130px"
+                android:layout_width="65dp"
                 android:layout_height="match_parent"
                 android:background="@drawable/btn_gray"
                 android:text="GO"
                 android:textColor="@color/white"
-                android:textSize="35px" />
+                android:textSize="20sp" />
 
 
         </LinearLayout>
@@ -97,7 +99,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:text=""
-                android:textSize="35px" />
+                android:textSize="16sp" />
 
             <TextView
                 style="@style/serviceAgreement"
@@ -138,7 +140,7 @@
             android:switchMinWidth="40dp"
             android:switchPadding="10dp"
             android:text="@string/remember_me"
-            android:textSize="14sp"
+            android:textSize="16sp"
             android:thumb="@drawable/thumb"
             android:track="@drawable/track"
             android:visibility="visible"
@@ -159,6 +161,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="10dp"
+                android:textSize="16sp"
                 android:text="内网" />
 
             <RadioButton
@@ -167,6 +170,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="10dp"
+                android:textSize="16sp"
                 android:checked="true"
                 android:text="外网" />
 
@@ -175,6 +179,7 @@
                 style="@style/Widget.AppCompat.CompoundButton.RadioButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:textSize="16sp"
                 android:checked="true"
                 android:text="aTrust" />
 
@@ -203,7 +208,7 @@
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"
                 android:gravity="center|start"
-                android:text="VPN注销>>"
+                android:text="aTrust注销>>"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="16sp" />
             <TextView
@@ -212,7 +217,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="15dp"
                 android:gravity="center"
-                android:text="VPN登录>>"
+                android:text="aTrust登录>>"
                 android:textColor="@color/colorPrimaryDark"
                 android:textSize="16sp" />
         </LinearLayout>