From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/res/layout/fragment_house_list.xml | 329 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 233 insertions(+), 96 deletions(-)
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index e1db3e9..b504688 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="@drawable/bj">
+ android:background="@color/text_FF000000">
<!--澶撮儴鏍囩-->
<RelativeLayout
android:id="@+id/title_cl"
@@ -23,23 +23,22 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerVertical="true"
- android:gravity="center_vertical"
+ android:gravity="center"
android:text="@string/power_station"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_20"
- android:textStyle="bold" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_18" />
<TextView
android:id="@+id/device_label"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:layout_centerVertical="true"
android:layout_marginStart="17dp"
- android:layout_marginEnd="-339dp"
android:layout_toEndOf="@+id/power_station_label"
- android:gravity="start|center_vertical"
+ android:gravity="center"
android:text="@string/device"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_16"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14"
/>
@@ -63,7 +62,7 @@
</RelativeLayout>
<!--鐢电珯鏍囩-->
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/power_station_label_parent"
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -76,12 +75,15 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/power_station_label_top_cl"
android:layout_width="match_parent"
- android:layout_height="174dp"
- android:layout_marginTop="@dimen/dp_13">
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_13"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
<!--鎼滅储-->
<RelativeLayout
android:id="@+id/power_station_search_cl"
- android:layout_width="match_parent"
+ android:layout_width="0dp"
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
@@ -95,7 +97,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_ff05000000">
+ android:background="@drawable/search_bj_ff1c1c1e">
<ImageView
@@ -110,12 +112,12 @@
<TextView
android:id="@+id/power_station_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/power_station_search_iv"
android:text="@string/search_station"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -130,45 +132,171 @@
</RelativeLayout>
- <!--鏉′欢绛涢��-->
+ <!--鏉′欢绛涢�� 鍏ㄩ儴锛屾晠闅滐紝绂荤嚎锛屽緟鎺ュ叆-->
<LinearLayout
android:id="@+id/screening_condition_ll"
- android:layout_width="match_parent"
+ android:layout_width="0dp"
android:layout_height="@dimen/dp_56"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_21"
+ android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl">
+ <!--鍏ㄩ儴-->
+ <LinearLayout
+ android:id="@+id/all_ll"
+ android:layout_width="@dimen/dp_74"
+ android:layout_height="match_parent"
+ android:background="@drawable/station_status_no_ffffff"
+ android:orientation="vertical">
- <include
- android:id="@+id/power_station_all_il"
- layout="@layout/item_station" />
+ <TextView
+ android:id="@+id/all_total_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8.5dp"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="0"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
- <include
- android:id="@+id/power_station_faults_il"
- layout="@layout/item_station" />
+ <TextView
+ android:id="@+id/all_des_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="@string/message_all"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
- <include
- android:id="@+id/power_station_offline_il"
- layout="@layout/item_station" />
+ <View
+ android:id="@+id/v1"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+ <!--鏁呴殰-->
+ <LinearLayout
+ android:id="@+id/faults_ll"
+ android:layout_width="@dimen/dp_74"
+ android:layout_height="match_parent"
+ android:background="@drawable/station_status_no_ffffff"
+ android:orientation="vertical">
- <include
- android:id="@+id/power_station_connected_il"
- layout="@layout/item_station" />
+ <TextView
+ android:id="@+id/faults_total_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8.5dp"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="0"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
+
+ <TextView
+ android:id="@+id/faults_des_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="@string/my_power_station_malfunction"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/v2"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+ <!--绂荤嚎-->
+ <LinearLayout
+ android:id="@+id/offline_ll"
+ android:layout_width="@dimen/dp_74"
+ android:layout_height="match_parent"
+ android:background="@drawable/station_status_no_ffffff"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/offline_total_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8.5dp"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="0"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
+
+ <TextView
+ android:id="@+id/offline_des_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="@string/my_power_station_off_line"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/v3"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+ <!--寰呮帴鍏�-->
+ <LinearLayout
+ android:id="@+id/connected_ll"
+ android:layout_width="@dimen/dp_74"
+ android:layout_height="match_parent"
+ android:background="@drawable/station_status_no_ffffff"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/connected_total_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8.5dp"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="0"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
+
+ <TextView
+ android:id="@+id/connected_des_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="@string/to_be_added"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
</LinearLayout>
-
<!--鍗囧簭闄嶅簭鍔熻兘-->
<LinearLayout
android:id="@+id/ascending_order_descending_order_parent_ll"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_21"
+ android:layout_marginTop="@dimen/dp_19"
+ android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -178,15 +306,16 @@
android:id="@+id/station_name_rl"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:gravity="start"
android:orientation="horizontal">
<TextView
android:id="@+id/station_name_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="match_parent"
android:text="@string/station_name"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14"
/>
@@ -194,29 +323,32 @@
android:id="@+id/station_name_iv"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
+ android:layout_centerVertical="true"
android:layout_toEndOf="@+id/station_name_tv"
android:background="@drawable/ascending_descending_order_select" />
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent"
- android:layout_toEndOf="@+id/station_name_iv" />
+
</RelativeLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
<RelativeLayout
android:id="@+id/station_power_rl"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<TextView
android:id="@+id/station_power_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="match_parent"
android:text="@string/generated_power"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/station_power_iv"
@@ -225,26 +357,27 @@
android:layout_toEndOf="@+id/station_power_tv"
android:background="@drawable/ascending_descending_order_select" />
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent"
- android:layout_toEndOf="@+id/station_power_iv" />
</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="@dimen/dp_17"
+ android:layout_height="match_parent"
android:text="@string/day_power_generation"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/station_day_iv"
@@ -253,26 +386,28 @@
android:layout_toEndOf="@+id/station_day_tv"
android:background="@drawable/ascending_descending_order_select" />
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent"
- android:layout_toEndOf="@+id/station_day_iv" />
+
</RelativeLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
<RelativeLayout
android:id="@+id/station_month_rl"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:gravity="end"
android:orientation="horizontal">
<TextView
android:id="@+id/station_month_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="match_parent"
android:text="@string/month_power_generation"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/station_month_iv"
@@ -282,7 +417,6 @@
android:background="@drawable/ascending_descending_order_select" />
</RelativeLayout>
-
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -290,7 +424,8 @@
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/fragment_house_srl"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="0dp"
+ android:layout_marginTop="18.5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -299,15 +434,25 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fragment_house_srl_list_rc"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- />
+ android:layout_height="match_parent" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+ <include
+ android:id="@+id/home_null_data_ic"
+ layout="@layout/null_data_view"
+ android:layout_width="match_parent"
+ android:layout_height="224dp"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/power_station_label_top_cl" />
- </LinearLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
<!--璁惧鏍囩-->
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/device_label_parent"
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -322,7 +467,10 @@
android:id="@+id/device_label_top_cl"
android:layout_width="match_parent"
android:layout_height="40dp"
- android:layout_marginTop="@dimen/dp_13">
+ android:layout_marginTop="@dimen/dp_13"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
<!--鎼滅储-->
<RelativeLayout
android:id="@+id/device_search_cl"
@@ -330,7 +478,7 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/search_bj_ff1c1c1e"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -347,12 +495,12 @@
<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_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -362,46 +510,35 @@
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/fragment_device_srl"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/power_station_label_top_cl">
+ app:layout_constraintTop_toBottomOf="@+id/device_label_top_cl">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fragment_device_srl_list_rc"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
- android:paddingBottom="@dimen/dp_16" />
+ android:paddingBottom="@dimen/dp_10" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+ <include
+ android:id="@+id/device_null_data_ic"
+ layout="@layout/null_data_view"
+ android:layout_width="match_parent"
+ android:layout_height="224dp"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/device_label_top_cl"
- </LinearLayout>
+ />
- <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
- <include
- android:id="@+id/home_null_data_ic"
- layout="@layout/null_data_view"
- android:layout_width="match_parent"
- android:layout_height="224dp"
- android:layout_marginBottom="@dimen/dp_202"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
-
- <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
- <include
- android:id="@+id/device_null_data_ic"
- layout="@layout/null_data_view"
- android:layout_width="match_parent"
- android:layout_height="224dp"
- android:layout_marginBottom="229dp"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
--
Gitblit v1.8.0