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_power_stations_list.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/layout/activity_power_stations_list.xml b/app/src/main/res/layout/activity_power_stations_list.xml
index 37d6bed..d568217 100644
--- a/app/src/main/res/layout/activity_power_stations_list.xml
+++ b/app/src/main/res/layout/activity_power_stations_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.PowerStationsListEdit">
+ tools:context=".ui.newC.PowerStationsListActivity">
<include
@@ -18,11 +18,11 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
android:id="@+id/fragment_house_srl"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginTop="@dimen/dp_12"
+ android:layout_marginTop="@dimen/dp_10"
app:layout_constraintBottom_toTopOf="@+id/add_power_station_rl"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -34,7 +34,7 @@
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingBottom="@dimen/dp_16" />
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
<RelativeLayout
android:id="@+id/add_power_station_rl"
--
Gitblit v1.8.0