From 589d1dff2ce8554ee53b818a98db000df7fdf4e7 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 七月 2025 10:19:17 +0800
Subject: [PATCH] 2025年07月22日10:19:08
---
app/src/main/res/layout/fragment_house_list.xml | 138 +++++++++++++++++++++------------------------
1 files changed, 64 insertions(+), 74 deletions(-)
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 950a65a..1d87e30 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -5,7 +5,7 @@
android:id="@+id/house_list_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_FF161616">
+ android:background="@color/text_FF000000">
<!--澶撮儴鏍囩-->
<RelativeLayout
android:id="@+id/title_cl"
@@ -25,7 +25,7 @@
android:layout_centerVertical="true"
android:gravity="center"
android:text="@string/power_station"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18" />
<TextView
@@ -37,19 +37,11 @@
android:layout_toEndOf="@+id/power_station_label"
android:gravity="center"
android:text="@string/device"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
/>
- <ImageView
- android:id="@+id/edit_iv"
- android:layout_width="@dimen/dp_31"
- android:layout_height="@dimen/dp_31"
- android:layout_marginEnd="@dimen/dp_13"
- android:layout_toStartOf="@+id/add_iv"
- android:src="@drawable/edit"
- android:visibility="gone" />
<ImageView
android:id="@+id/add_iv"
@@ -97,7 +89,7 @@
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dp_17"
android:layout_toStartOf="@+id/power_station_default_condition_iv"
- android:background="@drawable/search_bj_ff333738">
+ android:background="@drawable/search_bj_ff1c1c1e">
<ImageView
@@ -117,7 +109,7 @@
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/power_station_search_iv"
android:text="@string/search_station"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -127,7 +119,7 @@
android:layout_height="@dimen/dp_31"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
- android:src="@drawable/default_condition" />
+ android:src="@drawable/condition_screening" />
</RelativeLayout>
@@ -161,7 +153,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -172,7 +164,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="@string/message_all"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -198,7 +190,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -209,7 +201,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="@string/my_power_station_malfunction"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -235,7 +227,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -246,7 +238,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="@string/my_power_station_off_line"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -272,7 +264,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -283,7 +275,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="@string/to_be_added"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -313,8 +305,8 @@
android:id="@+id/station_name_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="@string/station_name"
- android:textColor="@color/text_E6FFFFFF"
+ android:text="@string/pv"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
@@ -346,8 +338,8 @@
android:id="@+id/station_power_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="@string/generated_power"
- android:textColor="@color/text_E6FFFFFF"
+ android:text="@string/output"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<ImageView
@@ -356,36 +348,6 @@
android:layout_height="@dimen/dp_18"
android:layout_toEndOf="@+id/station_power_tv"
android:background="@drawable/ascending_descending_order_select" />
-
- </RelativeLayout>
-
- <View
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1" />
-
- <RelativeLayout
- android:id="@+id/station_day_rl"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center_horizontal"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/station_day_tv"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:text="@string/day_power_generation"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14" />
-
- <ImageView
- android:id="@+id/station_day_iv"
- android:layout_width="@dimen/dp_18"
- android:layout_height="@dimen/dp_18"
- android:layout_toEndOf="@+id/station_day_tv"
- android:background="@drawable/ascending_descending_order_select" />
-
</RelativeLayout>
@@ -405,8 +367,8 @@
android:id="@+id/station_month_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="@string/month_power_generation"
- android:textColor="@color/text_E6FFFFFF"
+ android:text="@string/battery_capacity_indicator"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<ImageView
@@ -417,15 +379,46 @@
android:background="@drawable/ascending_descending_order_select" />
</RelativeLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+
+ <RelativeLayout
+ android:id="@+id/station_day_rl"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_horizontal"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/station_day_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="@string/day_generation"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <ImageView
+ android:id="@+id/station_day_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_toEndOf="@+id/station_day_tv"
+ android:background="@drawable/ascending_descending_order_select" />
+
+
+ </RelativeLayout>
+
+
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
- <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="18.5dp"
+ android:layout_marginTop="10dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -434,8 +427,10 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fragment_house_srl_list_rc"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ android:layout_height="match_parent"
+ android:clipToPadding="false"
+ android:paddingBottom="@dimen/dp_10" />
+ </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
<!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
<include
android:id="@+id/home_null_data_ic"
@@ -478,7 +473,7 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/search_bj_ff333738"
+ android:background="@drawable/search_bj_ff1c1c1e"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -495,19 +490,19 @@
<TextView
android:id="@+id/device_search_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/device_search_iv"
android:text="@string/enter_the_device_sn_and_device_name"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
android:id="@+id/fragment_device_srl"
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -521,8 +516,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:paddingBottom="@dimen/dp_16" />
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ android:paddingBottom="@dimen/dp_10" />
+ </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
<!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
<include
@@ -541,9 +536,4 @@
</androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0