From c660f059d4e07a1b784442a1bbb4a5109b82e837 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 25 六月 2024 09:51:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev
---
app/src/main/res/layout/activity_power_stations_list.xml | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 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 e6fc24c..996d0fe 100644
--- a/app/src/main/res/layout/activity_power_stations_list.xml
+++ b/app/src/main/res/layout/activity_power_stations_list.xml
@@ -16,19 +16,45 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_10"
- app:layout_constraintBottom_toBottomOf="parent"
+ 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.recyclerview.widget.RecyclerView
android:id="@+id/fragment_house_srl_list_rc"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:clipToPadding="false"
- android:paddingBottom="@dimen/dp_16" />
+ android:paddingBottom="@dimen/dp_16"
+ 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" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ <RelativeLayout
+ android:background="@color/text_FFFFFFFF"
+ android:id="@+id/add_power_station_rl"
+ android:layout_width="match_parent"
+ android:layout_height="82dp"
+ android:gravity="center"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="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/checked"
+ android:gravity="center"
+ android:text="@string/add_power_station"
+ android:textColor="@color/text_FFFFFFFF"
+ android:textSize="18sp" />
+ </RelativeLayout>
+
+
<!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
<include
android:id="@+id/null_data_ic"
--
Gitblit v1.8.0