From 923c88c59523006f2a91ad6aa856ff55fd4f76a9 Mon Sep 17 00:00:00 2001
From: fengge <844143714@qq.com>
Date: Wed, 1 Jul 2026 09:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E5=B9=95=E5=88=86=E8=BE=A8=E7=8E=87?=
 =?UTF-8?q?=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_login.xml | 40 +++++++++++-----------
 app/src/main/res/values-h400dp/dimens.xml  | 20 +++++++++++
 app/src/main/res/values-h540dp/dimens.xml  | 20 +++++++++++
 app/src/main/res/values/dimens.xml         | 19 ++++++++++
 4 files changed, 79 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/res/values-h400dp/dimens.xml
 create mode 100644 app/src/main/res/values-h540dp/dimens.xml
 create mode 100644 app/src/main/res/values/dimens.xml

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index aa54474..4431416 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -22,7 +22,7 @@
         android:id="@+id/ll_header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="28dp"
+        android:layout_marginTop="@dimen/login_header_margin_top"
         android:gravity="center"
         android:orientation="vertical">
 
@@ -46,8 +46,8 @@
                 android:background="@drawable/shape_dot_accent" />
 
             <ImageView
-                android:layout_width="56dp"
-                android:layout_height="56dp"
+                android:layout_width="@dimen/login_logo_size"
+                android:layout_height="@dimen/login_logo_size"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:src="@drawable/ic_fire_logo"
@@ -73,7 +73,7 @@
             android:layout_marginTop="10dp"
             android:text="消防值守台"
             android:textColor="#00CFFF"
-            android:textSize="26sp"
+            android:textSize="@dimen/login_title_text_size"
             android:textStyle="bold"
             android:letterSpacing="0.15" />
 
@@ -84,7 +84,7 @@
             android:layout_marginTop="4dp"
             android:text="FIRE WATCH MONITORING PLATFORM"
             android:textColor="#2A6A8A"
-            android:textSize="10sp"
+            android:textSize="@dimen/login_subtitle_text_size"
             android:letterSpacing="0.1" />
     </LinearLayout>
 
@@ -102,7 +102,7 @@
             android:elevation="8dp"
             android:gravity="center_horizontal"
             android:orientation="vertical"
-            android:padding="28dp"
+            android:padding="@dimen/login_card_padding"
             app:layout_constraintWidth_max="450dp"
             app:layout_constraintWidth_default="percent"
             app:layout_constraintWidth_percent="0.88"
@@ -117,7 +117,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:layout_marginBottom="20dp">
+                android:layout_marginBottom="@dimen/login_card_title_margin_bottom">
 
                 <View
                     android:layout_width="0dp"
@@ -157,19 +157,19 @@
             </LinearLayout>
 
             <!-- 测试账号提示 -->
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:text="测试账号 test010  test011   密码: 123456"
-                android:textColor="#2A6A8A"
-                android:textSize="12sp" />
+<!--            <TextView-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginBottom="@dimen/login_card_tip_margin_bottom"-->
+<!--                android:text="测试账号 test010  test011   密码: 123456"-->
+<!--                android:textColor="#2A6A8A"-->
+<!--                android:textSize="12sp" />-->
 
             <!-- 用户名输入框 -->
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginBottom="14dp"
+                android:layout_height="@dimen/login_input_height"
+                android:layout_marginBottom="@dimen/login_input_margin_bottom"
                 android:background="@drawable/shape_edit_text">
 
                 <TextView
@@ -205,8 +205,8 @@
             <!-- 密码输入框 -->
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginBottom="14dp"
+                android:layout_height="@dimen/login_input_height"
+                android:layout_marginBottom="@dimen/login_input_margin_bottom"
                 android:background="@drawable/shape_edit_text">
 
                 <TextView
@@ -259,7 +259,7 @@
             <Button
                 android:id="@+id/btn_login"
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
+                android:layout_height="@dimen/login_btn_height"
                 android:layout_marginBottom="10dp"
                 android:background="@drawable/shape_button_login"
                 android:text="登  录"
@@ -272,7 +272,7 @@
             <Button
                 android:id="@+id/btn_exit"
                 android:layout_width="match_parent"
-                android:layout_height="36dp"
+                android:layout_height="@dimen/login_exit_btn_height"
                 android:background="@android:color/transparent"
                 android:text="退出应用"
                 android:textColor="#1A4A6B"
diff --git a/app/src/main/res/values-h400dp/dimens.xml b/app/src/main/res/values-h400dp/dimens.xml
new file mode 100644
index 0000000..0e4062c
--- /dev/null
+++ b/app/src/main/res/values-h400dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 1088x612 或极矮高度屏幕 (h400dp及以下) 适配尺寸 -->
+    <!-- 顶部 Header 边距与大小 -->
+    <dimen name="login_header_margin_top">8dp</dimen>
+    <dimen name="login_logo_size">36dp</dimen>
+    <dimen name="login_title_text_size">18sp</dimen>
+    <dimen name="login_subtitle_text_size">8sp</dimen>
+
+    <!-- 登录卡片容器属性 -->
+    <dimen name="login_card_padding">12dp</dimen>
+    <dimen name="login_card_title_margin_bottom">6dp</dimen>
+    <dimen name="login_card_tip_margin_bottom">6dp</dimen>
+
+    <!-- 输入框与按钮高度 -->
+    <dimen name="login_input_height">38dp</dimen>
+    <dimen name="login_input_margin_bottom">6dp</dimen>
+    <dimen name="login_btn_height">36dp</dimen>
+    <dimen name="login_exit_btn_height">24dp</dimen>
+</resources>
diff --git a/app/src/main/res/values-h540dp/dimens.xml b/app/src/main/res/values-h540dp/dimens.xml
new file mode 100644
index 0000000..d63f988
--- /dev/null
+++ b/app/src/main/res/values-h540dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 1280x720 或中等高度屏幕 (h540dp及以下) 适配尺寸 -->
+    <!-- 顶部 Header 边距与大小 -->
+    <dimen name="login_header_margin_top">16dp</dimen>
+    <dimen name="login_logo_size">48dp</dimen>
+    <dimen name="login_title_text_size">22sp</dimen>
+    <dimen name="login_subtitle_text_size">9sp</dimen>
+
+    <!-- 登录卡片容器属性 -->
+    <dimen name="login_card_padding">20dp</dimen>
+    <dimen name="login_card_title_margin_bottom">12dp</dimen>
+    <dimen name="login_card_tip_margin_bottom">10dp</dimen>
+
+    <!-- 输入框与按钮高度 -->
+    <dimen name="login_input_height">44dp</dimen>
+    <dimen name="login_input_margin_bottom">10dp</dimen>
+    <dimen name="login_btn_height">42dp</dimen>
+    <dimen name="login_exit_btn_height">30dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..e6ecdca
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 顶部 Header 边距与大小 -->
+    <dimen name="login_header_margin_top">28dp</dimen>
+    <dimen name="login_logo_size">56dp</dimen>
+    <dimen name="login_title_text_size">26sp</dimen>
+    <dimen name="login_subtitle_text_size">10sp</dimen>
+
+    <!-- 登录卡片容器属性 -->
+    <dimen name="login_card_padding">28dp</dimen>
+    <dimen name="login_card_title_margin_bottom">20dp</dimen>
+    <dimen name="login_card_tip_margin_bottom">16dp</dimen>
+
+    <!-- 输入框与按钮高度 -->
+    <dimen name="login_input_height">50dp</dimen>
+    <dimen name="login_input_margin_bottom">14dp</dimen>
+    <dimen name="login_btn_height">48dp</dimen>
+    <dimen name="login_exit_btn_height">36dp</dimen>
+</resources>