From db937c029a3f9dbaec86cbbc944ebbee3ece13be Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 14:49:17 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev
---
app/src/main/res/layout/activity_message_info.xml | 70 +++++++++--------------------------
1 files changed, 18 insertions(+), 52 deletions(-)
diff --git a/app/src/main/res/layout/activity_message_info.xml b/app/src/main/res/layout/activity_message_info.xml
index 7d2f933..a5321bf 100644
--- a/app/src/main/res/layout/activity_message_info.xml
+++ b/app/src/main/res/layout/activity_message_info.xml
@@ -66,70 +66,36 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll">
-
+ <!--浜嬩欢鏍囬-->
<include
- android:id="@+id/message_info_alarm_content_in"
+ android:id="@+id/message_info_event_title_in"
layout="@layout/line_message_info" />
- <!--闅旈棿+闂撮殧绾柯�-->
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_32"
- android:gravity="center">
-
- <View
- android:layout_width="match_parent"
- android:layout_height="0.5dp"
- android:background="@color/text_1AFFFFFF" />
- </LinearLayout>
-
+ <!--浜嬩欢鍐呭-->
+ <include
+ android:id="@+id/message_info_event_content_in"
+ layout="@layout/line_message_info" />
+ <!--澶囨敞-->
+ <include
+ android:id="@+id/message_info_remark_in"
+ layout="@layout/line_message_info" />
+ <!--鎶ヨ璁惧-->
<include
android:id="@+id/message_info_alarm_device_in"
layout="@layout/line_message_info" />
-
- <!--闅旈棿+闂撮殧绾柯�-->
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_32"
- android:gravity="center">
-
- <View
- android:layout_width="match_parent"
- android:layout_height="0.5dp"
- android:background="@color/text_1AFFFFFF" />
- </LinearLayout>
- <!--浜у搧璇寸‖浠舵病鍋� 闅愯棌鎺� 2024骞�05鏈�28鏃�13:46:53-->
- <include
- android:id="@+id/message_info_alarm_range_in"
- layout="@layout/line_message_info"
- android:visibility="gone" />
-
- <View
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_33"
- android:visibility="gone" />
-
+ <!--鐢电珯浣嶇疆-->
<include
android:id="@+id/message_info_power_station_location_in"
layout="@layout/line_message_info" />
- <!--闅旈棿+闂撮殧绾柯�-->
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_32"
- android:gravity="center">
- <View
- android:layout_width="match_parent"
- android:layout_height="0.5dp"
- android:background="@color/text_1AFFFFFF" />
- </LinearLayout>
-
+ <!--鎶ヨ鏃堕棿-->
<include
android:id="@+id/message_info_alarm_time_in"
layout="@layout/line_message_info" />
-
- <View
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_16" />
+ <!--澶勭悊鏂规-->
+ <include
+ android:id="@+id/message_info_alarm_treatment_options_in"
+ layout="@layout/line_message_info"
+ android:visibility="gone" />
</LinearLayout>
--
Gitblit v1.8.0