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_home_page.xml | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml index 6b82695..19b088c 100644 --- a/app/src/main/res/layout/fragment_home_page.xml +++ b/app/src/main/res/layout/fragment_home_page.xml @@ -37,8 +37,8 @@ android:src="@drawable/add" /> </RelativeLayout> - <androidx.swiperefreshlayout.widget.SwipeRefreshLayout - android:id="@+id/srl" + <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout + android:id="@+id/rsl" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginTop="@dimen/dp_10" @@ -51,7 +51,7 @@ android:id="@+id/sl" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="@dimen/dp_26"> + android:layout_marginTop="@dimen/dp_10"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" @@ -952,7 +952,21 @@ </ScrollView> - </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> + </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout> + +<!-- <androidx.constraintlayout.widget.Guideline--> +<!-- android:id="@+id/guideline2"--> +<!-- android:layout_width="wrap_content"--> +<!-- android:layout_height="wrap_content"--> +<!-- android:orientation="horizontal"--> +<!-- app:layout_constraintGuide_begin="20dp" />--> + +<!-- <androidx.constraintlayout.widget.Guideline--> +<!-- android:id="@+id/guideline3"--> +<!-- android:layout_width="wrap_content"--> +<!-- android:layout_height="wrap_content"--> +<!-- android:orientation="vertical"--> +<!-- app:layout_constraintGuide_begin="20dp" />--> </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file -- Gitblit v1.8.0