From b22eb8216e6f9b1c17eb12c2aa296ed5b6885e14 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 27 八月 2025 11:32:19 +0800
Subject: [PATCH] 2025年08月27日11:32:16
---
app/src/main/res/layout/activity_message_info.xml | 151 ++++++++++++++++++++++++++------------------------
1 files changed, 79 insertions(+), 72 deletions(-)
diff --git a/app/src/main/res/layout/activity_message_info.xml b/app/src/main/res/layout/activity_message_info.xml
index a5321bf..8565815 100644
--- a/app/src/main/res/layout/activity_message_info.xml
+++ b/app/src/main/res/layout/activity_message_info.xml
@@ -17,90 +17,97 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_info_cl"
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_10"
- android:background="@color/text_FF1C1C1E"
+ android:overScrollMode="never"
+ app:layout_constraintBottom_toTopOf="@+id/message_info_work_out"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
- <LinearLayout
- android:id="@+id/ll"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_20"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_16"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
-
- <TextView
- android:id="@+id/message_info_alarm_state_tv"
- android:layout_width="7dp"
- android:layout_height="7dp"
- android:background="@drawable/device_state_ffb9b9b9" />
-
- <TextView
- android:id="@+id/message_info_home_name_tv"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:ellipsize="end"
- android:gravity="center_vertical|start"
- android:paddingStart="@dimen/dp_6"
- android:paddingEnd="@dimen/dp_20"
- android:singleLine="true"
- android:textColor="@color/text_FFACACAC"
- android:textSize="@dimen/text_16" />
- </LinearLayout>
-
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/message_info_cl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/dp_20"
- android:orientation="vertical"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/ll">
- <!--浜嬩欢鏍囬-->
- <include
- android:id="@+id/message_info_event_title_in"
- layout="@layout/line_message_info" />
- <!--浜嬩欢鍐呭-->
- <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" />
- <!--鐢电珯浣嶇疆-->
- <include
- android:id="@+id/message_info_power_station_location_in"
- layout="@layout/line_message_info" />
+ android:background="@color/text_FF1C1C1E">
- <!--鎶ヨ鏃堕棿-->
- <include
- android:id="@+id/message_info_alarm_time_in"
- layout="@layout/line_message_info" />
- <!--澶勭悊鏂规-->
- <include
- android:id="@+id/message_info_alarm_treatment_options_in"
- layout="@layout/line_message_info"
- android:visibility="gone" />
+ <LinearLayout
+ android:id="@+id/ll"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_16"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
- </LinearLayout>
+ <TextView
+ android:id="@+id/message_info_alarm_state_tv"
+ android:layout_width="7dp"
+ android:layout_height="7dp"
+ android:background="@drawable/device_state_ffb9b9b9" />
+
+ <TextView
+ android:id="@+id/message_info_home_name_tv"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:ellipsize="end"
+ android:gravity="center_vertical|start"
+ android:paddingStart="@dimen/dp_6"
+ android:paddingEnd="@dimen/dp_20"
+ android:singleLine="true"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_16" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_20"
+ android:orientation="vertical"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/ll">
+ <!--浜嬩欢鏍囬-->
+ <include
+ android:id="@+id/message_info_event_title_in"
+ layout="@layout/line_message_info" />
+ <!--浜嬩欢鍐呭-->
+ <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" />
+ <!--鐢电珯浣嶇疆-->
+ <include
+ android:id="@+id/message_info_power_station_location_in"
+ layout="@layout/line_message_info" />
+
+ <!--鎶ヨ鏃堕棿-->
+ <include
+ android:id="@+id/message_info_alarm_time_in"
+ layout="@layout/line_message_info" />
+ <!--澶勭悊鏂规-->
+ <include
+ android:id="@+id/message_info_alarm_treatment_options_in"
+ layout="@layout/line_message_info"
+ android:visibility="gone" />
+
+ </LinearLayout>
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </ScrollView>
<LinearLayout
android:id="@+id/message_info_work_out"
--
Gitblit v1.8.0