From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/res/layout/item_message_c.xml | 66 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/app/src/main/res/layout/item_message_c.xml b/app/src/main/res/layout/item_message_c.xml
index 3bdb4b5..5c137e5 100644
--- a/app/src/main/res/layout/item_message_c.xml
+++ b/app/src/main/res/layout/item_message_c.xml
@@ -8,8 +8,9 @@
android:layout_width="0dp"
android:layout_height="107.5dp"
android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/bj_ff333738"
+ android:background="@drawable/bj_ff1c1c1e"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -25,51 +26,58 @@
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="0dp"
+ <LinearLayout
+ android:id="@+id/ll"
+ android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
- android:layout_marginStart="6dp"
- android:layout_marginTop="16dp"
- android:layout_marginEnd="@dimen/dp_5"
- android:ellipsize="end"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_16"
android:gravity="center_vertical"
- android:singleLine="true"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
- app:layout_constraintStart_toEndOf="@+id/item_estate_tv"
+ android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintStart_toStartOf="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_FFACACAC"
+ 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_66FFFFFF"
+ android:layout_marginTop="14.5dp"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
- app:layout_constraintStart_toStartOf="@+id/item_estate_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_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
- app:layout_constraintStart_toStartOf="@+id/item_estate_tv"
+ app:layout_constraintStart_toStartOf="@+id/ll"
app:layout_constraintTop_toBottomOf="@+id/item_home_name_tv" />
--
Gitblit v1.8.0