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/fragment_message.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index f73f310..e181a31 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -53,7 +53,7 @@
<LinearLayout
android:id="@+id/message_cl"
android:layout_width="match_parent"
- android:layout_height="98dp"
+ android:layout_height="77dp"
android:layout_marginTop="@dimen/dp_10"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
@@ -105,8 +105,9 @@
<LinearLayout
android:id="@+id/message_tab_ll"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_62"
+ android:layout_height="@dimen/dp_22"
android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal">
<!--鍏ㄩ儴璁惧-->
@@ -205,10 +206,11 @@
</LinearLayout>
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
android:id="@+id/message_srl"
android:layout_width="match_parent"
android:layout_height="0dp"
+ android:layout_marginTop="@dimen/dp_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -221,8 +223,11 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/message_rcv"
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