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/activity_power_stations_list.xml | 61 ++++++++++++++++++------------
1 files changed, 36 insertions(+), 25 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 2125986..f6f6304 100644
--- a/app/src/main/res/layout/activity_power_stations_list.xml
+++ b/app/src/main/res/layout/activity_power_stations_list.xml
@@ -4,48 +4,59 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_EDEFF2"
+ android:background="@color/text_FF000000"
tools:context=".ui.newC.PowerStationsListEdit">
- <include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_44" />
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ <include
+ android:id="@+id/toolbar_top_rl"
+ layout="@layout/toolbar_top_view_44"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_44"
+ android:layout_marginTop="@dimen/dp_38"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <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_10"
- app:layout_constraintBottom_toTopOf="@+id/add_power_station_tv"
+ app:layout_constraintBottom_toTopOf="@+id/add_power_station_rl"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fragment_house_srl_list_rc"
- android:layout_width="0dp"
- android:layout_height="0dp"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:clipToPadding="false"
- android:paddingBottom="@dimen/dp_16"
- app:layout_constraintBottom_toTopOf="@+id/add_power_station_tv"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl" />
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ android:paddingBottom="@dimen/dp_16" />
+ </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
- <TextView
- android:id="@+id/add_power_station_tv"
- android:layout_width="0dp"
- android:layout_height="52dp"
- android:layout_marginTop="44dp"
- android:background="@drawable/checked"
+ <RelativeLayout
+ android:id="@+id/add_power_station_rl"
+ android:layout_width="match_parent"
+ android:layout_height="82dp"
+ android:background="@color/text_00000000"
android:gravity="center"
- android:text="@string/add_power_station"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintStart_toStartOf="parent">
+
+ <TextView
+ android:id="@+id/add_power_station_tv"
+ android:layout_width="335dp"
+ android:layout_height="52dp"
+ android:background="@drawable/bj_ff39383d"
+ android:gravity="center"
+ android:text="@string/add_power_station"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="14sp" />
+ </RelativeLayout>
+
<!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
<include
--
Gitblit v1.8.0