From dc8ae12444d1d887394eb525e2b80dd120dc4c87 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 20 二月 2024 13:43:56 +0800
Subject: [PATCH] Merge branch 'wjc' into dev-hxb
---
app/src/main/res/layout/item_message.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index fa6a0a9..da1f0a5 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -12,6 +12,7 @@
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:background="@drawable/house_list_line_parent_bg">
+
<!--鏈鏍囩-->
<TextView
android:id="@+id/item_unread_message_tv"
@@ -23,12 +24,17 @@
<TextView
android:id="@+id/item_content_tv"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="@dimen/dp_23"
- android:layout_marginStart="@dimen/dp_22"
- android:layout_marginTop="@dimen/dp_17"
+ android:layout_marginStart="20dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="@dimen/dp_5"
+ android:gravity="center_vertical"
android:textColor="@color/text_90000000"
android:textSize="@dimen/text_16"
+ android:ellipsize="end"
+ android:singleLine="true"
+ app:layout_constraintEnd_toStartOf="@+id/item_estate_tv"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -61,7 +67,7 @@
android:gravity="center"
android:paddingStart="@dimen/dp_12"
android:paddingEnd="@dimen/dp_12"
- android:text="@string/my_power_station_connecting"
+ android:text="@string/message_alarm"
android:textColor="@color/text_FFFFFFFF"
android:textSize="@dimen/text_12"
app:layout_constraintEnd_toEndOf="parent"
--
Gitblit v1.8.0