From 8f5fe758de9464a5118bd306814c170b768fe695 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 21 十月 2024 09:29:14 +0800
Subject: [PATCH] Merge branch 'heads/v1.4.2'
---
app/src/main/res/layout/activity_message_center_list.xml | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/app/src/main/res/layout/activity_message_center_list.xml b/app/src/main/res/layout/activity_message_center_list.xml
index 8004210..49427e2 100644
--- a/app/src/main/res/layout/activity_message_center_list.xml
+++ b/app/src/main/res/layout/activity_message_center_list.xml
@@ -50,7 +50,7 @@
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_7"
- android:background="@drawable/up"
+ android:background="@drawable/down"
app:layout_constraintBottom_toBottomOf="@+id/all_device_title_tv"
app:layout_constraintStart_toEndOf="@+id/all_device_title_tv"
app:layout_constraintTop_toTopOf="@+id/all_device_title_tv" />
@@ -134,9 +134,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/message_content_rl"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipToPadding="false"
- android:paddingBottom="@dimen/dp_16" />
+ android:layout_height="match_parent" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
@@ -155,15 +153,15 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/message_bottom_cl"
android:layout_width="match_parent"
- android:layout_height="82dp"
- android:background="@color/text_FFFFFFFF"
+ android:layout_height="64dp"
+ android:background="@drawable/ffffff_18"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_49"
+ android:layout_height="@dimen/dp_47"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -183,7 +181,7 @@
android:gravity="center"
android:text="@string/alarm_device"
android:textColor="@color/text_191919"
- android:textSize="@dimen/text_14"
+ android:textSize="@dimen/text_16"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -191,9 +189,9 @@
<View
android:id="@+id/message_bottom_alarm_device_line_v"
- android:layout_width="0dp"
+ android:layout_width="18dp"
android:layout_height="3dp"
- android:layout_marginTop="@dimen/dp_11"
+ android:layout_marginTop="4.5dp"
android:background="@color/text_191919"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/message_bottom_alarm_device_title_tv"
@@ -216,7 +214,7 @@
android:gravity="center"
android:text="@string/alarm_record"
android:textColor="@color/text_191919"
- android:textSize="@dimen/text_14"
+ android:textSize="@dimen/text_16"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -224,9 +222,9 @@
<View
android:id="@+id/message_bottom_alarm_record_line_v"
- android:layout_width="0dp"
+ android:layout_width="@dimen/dp_18"
android:layout_height="3dp"
- android:layout_marginTop="@dimen/dp_11"
+ android:layout_marginTop="4.5dp"
android:background="@color/text_191919"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/message_bottom_alarm_record_title_tv"
--
Gitblit v1.8.0