From 4f12f1e3543fce41e71ae9e21a782f8d9cb41947 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 10:45:11 +0800
Subject: [PATCH] Merge branch '1.3.1' into dev
---
app/src/main/res/layout/activity_message_center_list.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 444d865..656eb26 100644
--- a/app/src/main/res/layout/activity_message_center_list.xml
+++ b/app/src/main/res/layout/activity_message_center_list.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/text_FF000000"
- tools:context=".ui.newC.MessageCenterList">
+ tools:context=".ui.newC.MessageCenterListActivity">
<include
android:id="@+id/toolbar_top_message_center_list_rl"
@@ -21,7 +21,8 @@
<RelativeLayout
android:id="@+id/message_rl"
android:layout_width="0dp"
- android:layout_height="@dimen/dp_60"
+ android:layout_height="@dimen/dp_22"
+ android:layout_marginTop="@dimen/dp_20"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar_top_message_center_list_rl">
@@ -129,10 +130,11 @@
</RelativeLayout>
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
android:id="@+id/message_content_srl"
android:layout_width="match_parent"
android:layout_height="0dp"
+ android:layout_marginTop="@dimen/dp_10"
app:layout_constraintBottom_toTopOf="@+id/message_bottom_cl"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -141,8 +143,10 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/message_content_rl"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ android:layout_height="match_parent"
+ android:clipToPadding="false"
+ android:paddingBottom="@dimen/dp_10" />
+ </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
<!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
<include
--
Gitblit v1.8.0