From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/layout/activity_message_info.xml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/activity_message_info.xml b/app/src/main/res/layout/activity_message_info.xml
index 20613e5..988c9d4 100644
--- a/app/src/main/res/layout/activity_message_info.xml
+++ b/app/src/main/res/layout/activity_message_info.xml
@@ -28,7 +28,6 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_13"
android:gravity="center"
- android:text="鎴戠殑鐢电珯"
android:textColor="@color/text_030D1C"
android:textSize="@dimen/text_15"
app:layout_constraintStart_toStartOf="parent"
@@ -51,7 +50,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="18.5dp"
+ android:layout_marginTop="@dimen/dp_32"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -63,7 +62,7 @@
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_14" />
+ android:layout_height="@dimen/dp_31" />
<include
android:id="@+id/message_info_alarm_device_in"
@@ -71,7 +70,7 @@
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_14" />
+ android:layout_height="@dimen/dp_31" />
<include
android:id="@+id/message_info_alarm_range_in"
@@ -79,7 +78,7 @@
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_14" />
+ android:layout_height="@dimen/dp_31" />
<include
android:id="@+id/message_info_power_station_location_in"
@@ -87,7 +86,7 @@
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_14" />
+ android:layout_height="@dimen/dp_31" />
<include
android:id="@+id/message_info_alarm_time_in"
@@ -95,7 +94,7 @@
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_14" />
+ android:layout_height="@dimen/dp_31" />
</LinearLayout>
--
Gitblit v1.8.0