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/fragment_house_list.xml | 124 +++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 60 deletions(-)
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 0042957..46fc52c 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -25,7 +25,7 @@
android:layout_centerVertical="true"
android:gravity="center"
android:text="@string/power_station"
- android:textColor="@color/text_FFACACAC"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_18" />
<TextView
@@ -37,11 +37,19 @@
android:layout_toEndOf="@+id/power_station_label"
android:gravity="center"
android:text="@string/device"
- android:textColor="@color/text_FF5B5B5B"
+ android:textColor="@color/text_66FFFFFF"
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"
@@ -109,7 +117,7 @@
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/power_station_search_iv"
android:text="@string/search_station"
- android:textColor="@color/text_FF5B5B5B"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -153,7 +161,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="0"
- android:textColor="@color/text_FFACACAC"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_16" />
<TextView
@@ -164,7 +172,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="@string/message_all"
- android:textColor="@color/text_FF5B5B5B"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -190,7 +198,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="0"
- android:textColor="@color/text_FFACACAC"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_16" />
<TextView
@@ -201,7 +209,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="@string/my_power_station_malfunction"
- android:textColor="@color/text_FF5B5B5B"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -227,7 +235,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="0"
- android:textColor="@color/text_FFACACAC"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_16" />
<TextView
@@ -238,7 +246,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="@string/my_power_station_off_line"
- android:textColor="@color/text_FF5B5B5B"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -264,7 +272,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="0"
- android:textColor="@color/text_FFACACAC"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_16" />
<TextView
@@ -275,7 +283,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="@string/to_be_added"
- android:textColor="@color/text_FF5B5B5B"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -305,8 +313,8 @@
android:id="@+id/station_name_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="@string/pv"
- android:textColor="@color/text_FFACACAC"
+ android:text="@string/station_name"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
/>
@@ -338,8 +346,8 @@
android:id="@+id/station_power_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="@string/output"
- android:textColor="@color/text_FFACACAC"
+ android:text="@string/generated_power"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
<ImageView
@@ -348,6 +356,36 @@
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>
@@ -368,7 +406,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/battery_capacity_indicator"
- android:textColor="@color/text_FFACACAC"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
<ImageView
@@ -379,46 +417,15 @@
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"
@@ -427,8 +434,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"
@@ -493,14 +502,14 @@
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_FF5B5B5B"
+ android:textColor="@color/text_66FFFFFF"
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"
@@ -515,7 +524,7 @@
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingBottom="@dimen/dp_10" />
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
<!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
<include
@@ -534,9 +543,4 @@
</androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0