From 9f31f1246340da8b767853e905d04766627476f2 Mon Sep 17 00:00:00 2001
From: mxy6664 <2028180490@qq.com>
Date: Tue, 28 Jul 2026 10:35:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE=E5=9C=86?=
 =?UTF-8?q?=E8=A7=92=E5=80=BC=EF=BC=8C=E5=92=8C=E9=A2=9C=E8=89=B2=E5=B7=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../defense_device/login/LoginActivity.kt     |  4 +--
 app/src/main/res/drawable/rounded_blue_bg.xml |  2 +-
 .../res/drawable/send_code_btn_selector.xml   |  4 +--
 .../main/res/drawable/textinput_white_bg.xml  |  2 +-
 app/src/main/res/layout/activity_login.xml    | 34 ++++++++++---------
 .../res/layout/forget_password_activity.xml   | 20 ++++++-----
 app/src/main/res/layout/register_activity.xml | 24 +++++++------
 7 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt
index e47c037..f330fd1 100644
--- a/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt
+++ b/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt
@@ -77,7 +77,7 @@ class LoginActivity : AppCompatActivity() {
 
         binding.registerText.visibility = View.VISIBLE
         binding.forgetText.visibility = View.GONE
-        updateRegisterTextConstraints(center = false)
+        updateRegisterTextConstraints(center = true)
 
         //需要正确的方法名和参数
         updateLoginButtonTopConstraint(R.id.smsRowLayout)
@@ -102,7 +102,7 @@ class LoginActivity : AppCompatActivity() {
     private fun updateLoginButtonTopConstraint(topTargetId: Int) {
         val params = binding.loginBtn.layoutParams as ConstraintLayout.LayoutParams
         params.topToBottom = topTargetId
-        params.topMargin = 32
+        params.topMargin = 40
         binding.loginBtn.layoutParams = params
     }
 
diff --git a/app/src/main/res/drawable/rounded_blue_bg.xml b/app/src/main/res/drawable/rounded_blue_bg.xml
index 6dbb0ba..6401ca4 100644
--- a/app/src/main/res/drawable/rounded_blue_bg.xml
+++ b/app/src/main/res/drawable/rounded_blue_bg.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/green"/>
-    <corners android:radius="16dp"/>
+    <corners android:radius="4dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/send_code_btn_selector.xml b/app/src/main/res/drawable/send_code_btn_selector.xml
index 2fa0a86..226bf55 100644
--- a/app/src/main/res/drawable/send_code_btn_selector.xml
+++ b/app/src/main/res/drawable/send_code_btn_selector.xml
@@ -3,13 +3,13 @@
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
             <solid android:color="@color/gray"/>
-            <corners android:radius="16dp"/>
+            <corners android:radius="99dp"/>
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/green"/>
-            <corners android:radius="16dp"/>
+            <corners android:radius="99dp"/>
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/textinput_white_bg.xml b/app/src/main/res/drawable/textinput_white_bg.xml
index 4d3b37e..f8473e8 100644
--- a/app/src/main/res/drawable/textinput_white_bg.xml
+++ b/app/src/main/res/drawable/textinput_white_bg.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/white"/>
-    <corners android:radius="10dp"/>
+    <corners android:radius="99dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 5470c93..ce7eb05 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -77,7 +77,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/phoneRowLayout"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:background="@drawable/textinput_white_bg"
         app:layout_constraintTop_toBottomOf="@+id/tvSmsLogin"
         app:layout_constraintStart_toStartOf="parent"
@@ -99,6 +99,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
             android:hint="@string/phone_hint"
+            android:textSize="14dp"
             android:textColorHint="@color/gray"
             android:textColor="@android:color/black"
             android:background="@null"
@@ -116,7 +117,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/smsRowLayout"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:layout_marginTop="16dp"
         android:background="@drawable/textinput_white_bg"
         android:paddingStart="16dp"
@@ -146,12 +147,13 @@
             android:textColorHint="@color/gray"
             android:textColor="@android:color/black"
             android:background="@null"
-        android:inputType="number"
-        android:paddingVertical="16dp"
-        app:layout_constraintStart_toEndOf="@+id/ivSmsIcon"
-        app:layout_constraintEnd_toStartOf="@+id/sendCodeBtn"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent" />
+            android:textSize="14dp"
+            android:inputType="number"
+            android:paddingVertical="16dp"
+            app:layout_constraintStart_toEndOf="@+id/ivSmsIcon"
+            app:layout_constraintEnd_toStartOf="@+id/sendCodeBtn"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent" />
 
         <!-- 发送验证码按钮 -->
         <android.widget.Button
@@ -161,7 +163,7 @@
             android:minWidth="0dp"
             android:minHeight="0dp"
             android:text="@string/send_sms_code"
-            android:textSize="14sp"
+            android:textSize="14dp"
             android:textColor="@color/send_code_text_color"
             android:background="@drawable/send_code_btn_selector"
             android:elevation="0dp"
@@ -178,7 +180,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/passwordRowLayout"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:layout_marginTop="16dp"
         android:background="@drawable/textinput_white_bg"
         android:paddingStart="16dp"
@@ -202,11 +204,12 @@
         <EditText
             android:id="@+id/etPassword"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="50dp"
             android:layout_marginStart="12dp"
             android:hint="@string/password_hint"
             android:textColorHint="@color/gray"
             android:textColor="@android:color/black"
+            android:textSize="14dp"
             android:background="@null"
             android:inputType="textPassword"
             android:paddingVertical="16dp"
@@ -214,7 +217,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
@@ -222,15 +224,15 @@
     <android.widget.Button
         android:id="@+id/loginBtn"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="40dp"
+        android:layout_height="40dp"
         android:text="@string/login"
-        android:textSize="18sp"
+        android:textSize="14dp"
         android:elevation="0dp"
         android:stateListAnimator="@null"
         android:background="@drawable/rounded_blue_bg"
         android:textColor="@color/white"
         app:layout_constraintTop_toBottomOf="@+id/smsRowLayout"
+        android:layout_marginTop="40dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
@@ -240,7 +242,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/register"
-        android:textSize="14sp"
+        android:textSize="14dp"
         android:textColor="@color/green"
         android:padding="8dp"
         app:layout_constraintTop_toBottomOf="@+id/loginBtn"
diff --git a/app/src/main/res/layout/forget_password_activity.xml b/app/src/main/res/layout/forget_password_activity.xml
index 528d641..a631078 100644
--- a/app/src/main/res/layout/forget_password_activity.xml
+++ b/app/src/main/res/layout/forget_password_activity.xml
@@ -58,7 +58,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/phoneRowLayout"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:layout_marginTop="32dp"
         android:background="@drawable/textinput_white_bg"
         android:paddingStart="16dp"
@@ -88,7 +88,7 @@
             android:paddingVertical="16dp"
             android:textColor="@android:color/black"
             android:textColorHint="@color/gray"
-            android:textSize="16sp"
+            android:textSize="14dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/ivPhoneIcon"
@@ -100,7 +100,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/smsRowLayout"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:layout_marginTop="16dp"
         android:background="@drawable/textinput_white_bg"
         android:paddingStart="16dp"
@@ -131,6 +131,7 @@
             android:textColor="@android:color/black"
             android:background="@null"
             android:inputType="number"
+            android:textSize="14dp"
             android:paddingVertical="16dp"
             app:layout_constraintStart_toEndOf="@+id/ivSmsIcon"
             app:layout_constraintEnd_toStartOf="@+id/sendCodeBtn"
@@ -145,7 +146,7 @@
             android:minWidth="0dp"
             android:minHeight="0dp"
             android:text="@string/send_sms_code"
-            android:textSize="14sp"
+            android:textSize="14dp"
             android:textColor="@color/white"
             android:background="@drawable/send_code_btn_selector"
             android:elevation="0dp"
@@ -162,7 +163,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/passwordRowLayout"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:layout_marginTop="16dp"
         android:background="@drawable/textinput_white_bg"
         android:paddingStart="16dp"
@@ -192,6 +193,7 @@
             android:textColor="@android:color/black"
             android:background="@null"
             android:inputType="text"
+            android:textSize="14dp"
             android:paddingVertical="16dp"
             app:layout_constraintStart_toEndOf="@+id/ivPasswordIcon"
             app:layout_constraintEnd_toEndOf="parent"
@@ -205,7 +207,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/inviteRowLayout"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:layout_marginTop="16dp"
         android:background="@drawable/textinput_white_bg"
         android:paddingStart="16dp"
@@ -235,7 +237,7 @@
             android:paddingVertical="16dp"
             android:textColor="@android:color/black"
             android:textColorHint="@color/gray"
-            android:textSize="16sp"
+            android:textSize="14dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/ivInviteIcon"
@@ -247,11 +249,11 @@
     <android.widget.Button
         android:id="@+id/btnNext"
         android:layout_width="0dp"
-        android:layout_height="56dp"
+        android:layout_height="40dp"
         android:layout_marginTop="32dp"
         android:text="@string/determine"
         android:textAllCaps="false"
-        android:textSize="16sp"
+        android:textSize="16dp"
         app:cornerRadius="12dp"
         android:textColor="@color/white"
         android:elevation="0dp"
diff --git a/app/src/main/res/layout/register_activity.xml b/app/src/main/res/layout/register_activity.xml
index e4ba92a..ba0c7c8 100644
--- a/app/src/main/res/layout/register_activity.xml
+++ b/app/src/main/res/layout/register_activity.xml
@@ -59,7 +59,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/phoneRowLayout"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:layout_marginTop="32dp"
         android:background="@drawable/textinput_white_bg"
         android:paddingStart="16dp"
@@ -89,7 +89,7 @@
             android:paddingVertical="16dp"
             android:textColor="@android:color/black"
             android:textColorHint="@color/gray"
-            android:textSize="16sp"
+            android:textSize="14dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/ivPhoneIcon"
@@ -100,7 +100,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/smsRowLayout"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:layout_marginTop="16dp"
         android:background="@drawable/textinput_white_bg"
         android:paddingStart="16dp"
@@ -129,6 +129,7 @@
             android:hint="@string/sms_code_hint"
             android:textColorHint="@color/gray"
             android:textColor="@android:color/black"
+            android:textSize="14dp"
             android:background="@null"
             android:inputType="number"
             android:paddingVertical="16dp"
@@ -145,7 +146,7 @@
             android:minWidth="0dp"
             android:minHeight="0dp"
             android:text="@string/send_sms_code"
-            android:textSize="14sp"
+            android:textSize="14dp"
             android:textColor="@color/white"
             android:background="@drawable/send_code_btn_selector"
             android:elevation="0dp"
@@ -162,7 +163,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/idRowLayout"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:layout_marginTop="16dp"
         android:background="@drawable/textinput_white_bg"
         android:paddingStart="16dp"
@@ -192,7 +193,7 @@
             android:paddingVertical="16dp"
             android:textColor="@android:color/black"
             android:textColorHint="@color/gray"
-            android:textSize="16sp"
+            android:textSize="14dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/ivIdIcon"
@@ -204,7 +205,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/passwordRowLayout"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:layout_marginTop="16dp"
         android:background="@drawable/textinput_white_bg"
         android:paddingStart="16dp"
@@ -235,6 +236,7 @@
             android:background="@null"
             android:inputType="text"
             android:paddingVertical="16dp"
+            android:textSize="14dp"
             app:layout_constraintStart_toEndOf="@+id/ivPasswordIcon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -247,7 +249,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/inviteRowLayout"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:layout_marginTop="16dp"
         android:background="@drawable/textinput_white_bg"
         android:paddingStart="16dp"
@@ -277,7 +279,7 @@
             android:paddingVertical="16dp"
             android:textColor="@android:color/black"
             android:textColorHint="@color/gray"
-            android:textSize="16sp"
+            android:textSize="14dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/ivInviteIcon"
@@ -289,11 +291,11 @@
     <android.widget.Button
         android:id="@+id/btnNext"
         android:layout_width="0dp"
-        android:layout_height="56dp"
+        android:layout_height="40dp"
         android:layout_marginTop="32dp"
         android:text="@string/next_step"
         android:textAllCaps="false"
-        android:textSize="16sp"
+        android:textSize="16dp"
         app:cornerRadius="12dp"
         android:textColor="@color/white"
         android:elevation="0dp"