From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/res/layout/item_message_c.xml | 87 +++++++++++++++++++++++--------------------
1 files changed, 47 insertions(+), 40 deletions(-)
diff --git a/app/src/main/res/layout/item_message_c.xml b/app/src/main/res/layout/item_message_c.xml
index 31befe1..235b356 100644
--- a/app/src/main/res/layout/item_message_c.xml
+++ b/app/src/main/res/layout/item_message_c.xml
@@ -2,14 +2,14 @@
<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_115">
+ android:layout_height="117.5dp">
<androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="99dp"
+ android:layout_width="0dp"
+ android:layout_height="107.5dp"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/house_list_line_parent_bg"
+ android:background="@drawable/bj_ff1c1c1e"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -17,62 +17,69 @@
<!--鏈鏍囩-->
<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_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <TextView
- android:id="@+id/item_content_tv"
- android:layout_width="0dp"
- android:layout_height="@dimen/dp_23"
- android:layout_marginStart="22dp"
- android:layout_marginTop="16dp"
- android:layout_marginEnd="@dimen/dp_5"
- android:ellipsize="end"
+
+ <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:singleLine="true"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_16"
- app:layout_constraintEnd_toStartOf="@+id/item_estate_tv"
+ android:orientation="horizontal"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent">
+
+ <TextView
+ android:id="@+id/item_estate_tv"
+ android:layout_width="7dp"
+ android:layout_height="7dp"
+ android:background="@drawable/device_state_ffb9b9b9" />
+
+ <TextView
+ android:id="@+id/item_content_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>
+
<TextView
android:id="@+id/item_home_name_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_17"
- android:layout_marginTop="@dimen/dp_6"
- android:textColor="@color/text_66000000"
+ android:layout_marginTop="14.5dp"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12"
- app:layout_constraintStart_toStartOf="@+id/item_content_tv"
- app:layout_constraintTop_toBottomOf="@+id/item_content_tv" />
+ app:layout_constraintStart_toStartOf="@+id/ll"
+ app:layout_constraintTop_toBottomOf="@+id/ll" />
<TextView
android:id="@+id/item_time_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_17"
- android:layout_marginTop="@dimen/dp_6"
+ android:layout_marginTop="@dimen/dp_8"
android:gravity="center_vertical"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12"
- app:layout_constraintStart_toStartOf="@+id/item_home_name_tv"
+ app:layout_constraintStart_toStartOf="@+id/ll"
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/message_alarm"
- 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