From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'
---
app/src/main/res/layout/activity_power_stations_list.xml | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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..b34e5e6 100644
--- a/app/src/main/res/layout/activity_power_stations_list.xml
+++ b/app/src/main/res/layout/activity_power_stations_list.xml
@@ -16,7 +16,7 @@
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_rl"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
@@ -29,6 +29,28 @@
android:paddingBottom="@dimen/dp_16" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ <RelativeLayout
+ android:id="@+id/add_power_station_rl"
+ android:layout_width="match_parent"
+ android:layout_height="82dp"
+ android:background="@color/text_FFFFFFFF"
+ 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