From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/layout/item_message.xml | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index fa6a0a9..d33a9d2 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -2,8 +2,7 @@
<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="@dimen/dp_115">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -12,6 +11,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 +23,18 @@
<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:textColor="@color/text_90000000"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="19dp"
+ android:layout_marginEnd="@dimen/dp_5"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:singleLine="true"
+ android:textStyle="bold"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_16"
+ app:layout_constraintEnd_toStartOf="@+id/item_estate_tv"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -36,8 +42,8 @@
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_marginTop="@dimen/dp_6"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12"
app:layout_constraintStart_toStartOf="@+id/item_content_tv"
app:layout_constraintTop_toBottomOf="@+id/item_content_tv" />
@@ -46,9 +52,9 @@
android:id="@+id/item_time_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/dp_14"
+ android:layout_marginTop="@dimen/dp_6"
android:gravity="center_vertical"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12"
app:layout_constraintStart_toStartOf="@+id/item_home_name_tv"
app:layout_constraintTop_toBottomOf="@+id/item_home_name_tv" />
@@ -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