From f21dcea3e5f6fc7bfc51b3ddc6ff9764fb93bfdb Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 11 十二月 2024 11:25:37 +0800
Subject: [PATCH] 2024年12月11日11:25:28
---
app/src/main/res/layout/activity_message_info.xml | 64 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 28 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..d36e7c7 100644
--- a/app/src/main/res/layout/activity_message_info.xml
+++ b/app/src/main/res/layout/activity_message_info.xml
@@ -8,9 +8,14 @@
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"
@@ -20,35 +25,38 @@
android:background="@color/text_FF333738"
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_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
+ </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
@@ -57,7 +65,7 @@
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"
--
Gitblit v1.8.0