From ef0dba8548e2813beee2af8c8c3db72c3cb56da0 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 30 七月 2025 18:53:07 +0800
Subject: [PATCH] 2025年07月30日18:53:03
---
app/src/main/res/layout/activity_message_info.xml | 147 ++++++++++++++++++++-----------------------------
1 files changed, 60 insertions(+), 87 deletions(-)
diff --git a/app/src/main/res/layout/activity_message_info.xml b/app/src/main/res/layout/activity_message_info.xml
index 2633758..a5321bf 100644
--- a/app/src/main/res/layout/activity_message_info.xml
+++ b/app/src/main/res/layout/activity_message_info.xml
@@ -4,124 +4,98 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_FF161616"
+ android:background="@color/text_FF000000"
tools:context=".ui.message.MessageInfoActivity">
<include
-
- android:id="@+id/toolbar_top_in"
- layout="@layout/toolbar_top_view_52" />
+ android:id="@+id/toolbar_top_rl"
+ layout="@layout/toolbar_top_view_44"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_44"
+ android:layout_marginTop="@dimen/dp_38"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<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_10"
- android:background="@color/text_FF333738"
+ android:background="@color/text_FF1C1C1E"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_in">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
-
- <TextView
- android:id="@+id/message_info_alarm_state_tv"
- android:layout_width="7dp"
- android:layout_height="7dp"
+ <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="22.5dp"
- android:background="@drawable/device_state_ff38c494"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <TextView
- android:id="@+id/message_info_home_name_tv"
- android:layout_width="0dp"
- android:layout_height="22.5dp"
- android:layout_marginStart="6dp"
- android:layout_marginTop="16dp"
- android:layout_marginEnd="@dimen/dp_5"
- android:ellipsize="end"
+ android:layout_marginTop="@dimen/dp_16"
android:gravity="center_vertical"
- android:singleLine="true"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_16"
+ android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/message_info_alarm_state_tv"
- app:layout_constraintTop_toTopOf="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
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/dp_32"
+ android:layout_marginTop="@dimen/dp_20"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/message_info_alarm_state_tv">
-
+ 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>
@@ -132,7 +106,6 @@
android:id="@+id/message_info_work_out"
android:layout_width="match_parent"
android:layout_height="82dp"
- android:background="@color/text_FF333738"
android:gravity="center"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_20"
@@ -149,7 +122,7 @@
android:background="@drawable/bj_ff555859_no"
android:gravity="center"
android:text="@string/message_alarm_details_back"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -160,10 +133,10 @@
android:id="@+id/message_info_solve_tv"
android:layout_width="157.5dp"
android:layout_height="@dimen/dp_52"
- android:background="@drawable/bj_ff555859"
+ android:background="@drawable/bj_ff39383d"
android:gravity="center"
android:text="@string/message_alarm_details_resolved"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
--
Gitblit v1.8.0