From f50e8e60e9da99e4f69d8ab76810dc7e5fb448bc Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 02 十二月 2024 10:29:09 +0800
Subject: [PATCH] 2024年12月02日10:29:05
---
app/src/main/res/layout/activity_message_info.xml | 90 ++++++++++++++++++++++++++++----------------
1 files changed, 57 insertions(+), 33 deletions(-)
diff --git a/app/src/main/res/layout/activity_message_info.xml b/app/src/main/res/layout/activity_message_info.xml
index 0d54dbd..2633758 100644
--- a/app/src/main/res/layout/activity_message_info.xml
+++ b/app/src/main/res/layout/activity_message_info.xml
@@ -22,31 +22,33 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar_top_in">
+
<TextView
- android:id="@+id/message_info_home_name_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_21"
+ android:id="@+id/message_info_alarm_state_tv"
+ android:layout_width="7dp"
+ android:layout_height="7dp"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_13"
- android:gravity="center"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_15"
+ 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_alarm_state_tv"
- android:layout_width="wrap_content"
- android:layout_height="32.5dp"
- android:background="@drawable/alarm_ffb300"
- android:gravity="center"
- android:paddingStart="@dimen/dp_12"
- android:paddingEnd="@dimen/dp_12"
- android:text="@string/message_alarm"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_12"
+ 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:gravity="center_vertical"
+ android:singleLine="true"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/message_info_alarm_state_tv"
app:layout_constraintTop_toTopOf="parent" />
+
<LinearLayout
android:layout_width="match_parent"
@@ -60,18 +62,33 @@
<include
android:id="@+id/message_info_alarm_content_in"
layout="@layout/line_message_info" />
-
- <View
+ <!--闅旈棿+闂撮殧绾柯�-->
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_33" />
+ 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_device_in"
layout="@layout/line_message_info" />
- <View
+ <!--闅旈棿+闂撮殧绾柯�-->
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_33" />
+ 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"
@@ -86,10 +103,17 @@
<include
android:id="@+id/message_info_power_station_location_in"
layout="@layout/line_message_info" />
-
- <View
+ <!--闅旈棿+闂撮殧绾柯�-->
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_33" />
+ 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"
@@ -97,7 +121,7 @@
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_18" />
+ android:layout_height="@dimen/dp_16" />
</LinearLayout>
@@ -108,7 +132,7 @@
android:id="@+id/message_info_work_out"
android:layout_width="match_parent"
android:layout_height="82dp"
- android:background="@color/ffffff"
+ android:background="@color/text_FF333738"
android:gravity="center"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_20"
@@ -122,11 +146,11 @@
android:id="@+id/message_info_back_tv"
android:layout_width="157.5dp"
android:layout_height="@dimen/dp_52"
- android:background="@drawable/fillet_line_00000000"
+ android:background="@drawable/bj_ff555859_no"
android:gravity="center"
android:text="@string/message_alarm_details_back"
- android:textColor="@color/text_FF245EC3"
- android:textSize="@dimen/text_18" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<View
android:layout_width="@dimen/dp_20"
@@ -136,11 +160,11 @@
android:id="@+id/message_info_solve_tv"
android:layout_width="157.5dp"
android:layout_height="@dimen/dp_52"
- android:background="@drawable/checked"
+ android:background="@drawable/bj_ff555859"
android:gravity="center"
android:text="@string/message_alarm_details_resolved"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_18" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
</LinearLayout>
--
Gitblit v1.8.0