From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/res/layout/item_message.xml | 83 ++++++++++++++++++++++-------------------
1 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index fa6a0a9..a31dcc5 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -2,70 +2,77 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_150"
- android:background="@color/text_F5F7FA">
+ android:layout_height="117.5dp">
<androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_20"
- android:background="@drawable/house_list_line_parent_bg">
+ android:layout_width="0dp"
+ android:layout_height="107.5dp"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:background="@drawable/bj_ff1c1c1e"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
<!--鏈鏍囩-->
<TextView
android:id="@+id/item_unread_message_tv"
- android:layout_width="8dp"
- android:layout_height="8dp"
+ android:layout_width="9dp"
+ android:layout_height="9dp"
+ android:layout_marginTop="@dimen/dp_3"
+ android:layout_marginEnd="@dimen/dp_2"
android:background="@drawable/red_font"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/item_estate_tv"
+ android:layout_width="7dp"
+ android:layout_height="7dp"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="22.5dp"
+ android:background="@drawable/device_state_ffb9b9b9"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/item_content_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_23"
- android:layout_marginStart="@dimen/dp_22"
- android:layout_marginTop="@dimen/dp_17"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_16"
- app:layout_constraintStart_toStartOf="parent"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/dp_20"
+ 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_FFACACAC"
+ android:textSize="@dimen/text_14"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/item_estate_tv"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/item_home_name_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="@dimen/dp_24"
- android:textColor="@color/text_40000000"
+ android:layout_height="16.5dp"
+ android:layout_marginTop="14.5dp"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
- app:layout_constraintStart_toStartOf="@+id/item_content_tv"
+ app:layout_constraintStart_toStartOf="@+id/item_estate_tv"
app:layout_constraintTop_toBottomOf="@+id/item_content_tv" />
<TextView
android:id="@+id/item_time_tv"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/dp_14"
+ android:layout_height="16.5dp"
+ android:layout_marginTop="@dimen/dp_8"
android:gravity="center_vertical"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
- app:layout_constraintStart_toStartOf="@+id/item_home_name_tv"
+ app:layout_constraintStart_toStartOf="@+id/item_estate_tv"
app:layout_constraintTop_toBottomOf="@+id/item_home_name_tv" />
- <TextView
- android:id="@+id/item_estate_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_33"
- android:background="@drawable/state_ffb300"
- android:gravity="center"
- android:paddingStart="@dimen/dp_12"
- android:paddingEnd="@dimen/dp_12"
- android:text="@string/my_power_station_connecting"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_12"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0