From 9c67fc611daf6f9cb7c05f72d598543bff2d26f1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 25 十月 2024 11:23:17 +0800
Subject: [PATCH] s2024年10月25日11:23:14
---
app/src/main/res/layout/fragment_house_list.xml | 248 ++++++++++++++----------------------------------
1 files changed, 74 insertions(+), 174 deletions(-)
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 21bac17..053fc29 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -4,14 +4,15 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/house_list_parent"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="@drawable/bj">
<!--澶撮儴鏍囩-->
<RelativeLayout
android:id="@+id/title_cl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_31"
+ android:layout_height="@dimen/dp_44"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_44"
+ android:layout_marginTop="@dimen/dp_38"
android:layout_marginEnd="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -23,7 +24,7 @@
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:gravity="center_vertical"
- android:text="Power Station"
+ android:text="@string/power_station"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_20"
android:textStyle="bold" />
@@ -32,13 +33,11 @@
android:id="@+id/device_label"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_centerVertical="true"
- android:layout_marginStart="@dimen/dp_21"
- android:layout_marginEnd="@dimen/dp_4"
- android:layout_toStartOf="@+id/edit_iv"
+ android:layout_marginStart="17dp"
+ android:layout_marginEnd="-339dp"
android:layout_toEndOf="@+id/power_station_label"
android:gravity="start|center_vertical"
- android:text="Equipment"
+ android:text="@string/device"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_16"
@@ -51,14 +50,14 @@
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"
android:layout_width="@dimen/dp_31"
android:layout_height="@dimen/dp_31"
android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
android:src="@drawable/add" />
@@ -77,8 +76,8 @@
<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_21">
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_13">
<!--鎼滅储-->
<RelativeLayout
android:id="@+id/power_station_search_cl"
@@ -106,8 +105,7 @@
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_13"
- android:src="@drawable/search_path"
- />
+ android:src="@drawable/search_path" />
<TextView
android:id="@+id/power_station_search_tv"
@@ -116,10 +114,9 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/power_station_search_iv"
- android:text="Search the power station"
+ android:text="@string/search_station"
android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_14"
- />
+ android:textSize="@dimen/text_14" />
</RelativeLayout>
<ImageView
@@ -132,6 +129,7 @@
</RelativeLayout>
+
<!--鏉′欢绛涢��-->
<LinearLayout
android:id="@+id/screening_condition_ll"
@@ -145,139 +143,25 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl">
- <LinearLayout
- android:id="@+id/screening_condition_1"
- android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
- 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/screening_condition_number1_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
+ <include
+ android:id="@+id/power_station_faults_il"
+ layout="@layout/item_station" />
- <TextView
- android:id="@+id/screening_condition_text1_tv"
- android:layout_width="match_parent"
- android:layout_height="17dp"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="@string/message_all"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_14" />
+ <include
+ android:id="@+id/power_station_offline_il"
+ layout="@layout/item_station" />
- </LinearLayout>
-
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
- <LinearLayout
- android:id="@+id/screening_condition_2"
- android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
- android:background="@drawable/station_status_no_ffffff"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/screening_condition_number2_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/screening_condition_text2_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="@string/alarm_all_grade_malfunction"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_14" />
-
- </LinearLayout>
-
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
- <LinearLayout
- android:id="@+id/screening_condition_3"
- android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
- android:background="@drawable/station_status_no_ffffff"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/screening_condition_number3_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/screening_condition_text3_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="@string/my_power_station_off_line"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_14" />
-
- </LinearLayout>
-
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
- <LinearLayout
- android:id="@+id/screening_condition_4"
- android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
- android:background="@drawable/station_status_no_ffffff"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/screening_condition_number4_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/screening_condition_text4_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="@string/to_be_added"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_14" />
-
- </LinearLayout>
+ <include
+ android:id="@+id/power_station_connected_il"
+ layout="@layout/item_station" />
</LinearLayout>
+
+
<!--鍗囧簭闄嶅簭鍔熻兘-->
<LinearLayout
android:id="@+id/ascending_order_descending_order_parent_ll"
@@ -285,7 +169,6 @@
android:layout_height="@dimen/dp_17"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_21"
- android:layout_marginEnd="@dimen/dp_12"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -293,10 +176,8 @@
<RelativeLayout
android:id="@+id/station_name_rl"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center"
android:orientation="horizontal">
<TextView
@@ -306,7 +187,8 @@
android:text="@string/station_name"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12"
- android:textStyle="bold" />
+
+ />
<ImageView
android:id="@+id/station_name_iv"
@@ -314,15 +196,18 @@
android:layout_height="@dimen/dp_18"
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>
<RelativeLayout
android:id="@+id/station_power_rl"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center"
android:orientation="horizontal">
<TextView
@@ -331,8 +216,7 @@
android:layout_height="@dimen/dp_17"
android:text="@string/generated_power"
android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
+ android:textSize="@dimen/text_12" />
<ImageView
android:id="@+id/station_power_iv"
@@ -340,15 +224,18 @@
android:layout_height="@dimen/dp_18"
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>
<RelativeLayout
android:id="@+id/station_day_rl"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center"
android:orientation="horizontal">
<TextView
@@ -357,8 +244,7 @@
android:layout_height="@dimen/dp_17"
android:text="@string/day_power_generation"
android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
+ android:textSize="@dimen/text_12" />
<ImageView
android:id="@+id/station_day_iv"
@@ -366,15 +252,18 @@
android:layout_height="@dimen/dp_18"
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>
<RelativeLayout
android:id="@+id/station_month_rl"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center"
android:orientation="horizontal">
<TextView
@@ -383,8 +272,7 @@
android:layout_height="@dimen/dp_17"
android:text="@string/month_power_generation"
android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12"
- android:textStyle="bold" />
+ android:textSize="@dimen/text_12" />
<ImageView
android:id="@+id/station_month_iv"
@@ -403,6 +291,7 @@
android:id="@+id/fragment_house_srl"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/dp_21"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -411,9 +300,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fragment_house_srl_list_rc"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipToPadding="false"
- android:paddingBottom="@dimen/dp_16" />
+ android:layout_height="match_parent" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -435,7 +322,7 @@
android:id="@+id/device_label_top_cl"
android:layout_width="match_parent"
android:layout_height="40dp"
- android:layout_marginTop="@dimen/dp_21">
+ android:layout_marginTop="@dimen/dp_13">
<!--鎼滅储-->
<RelativeLayout
android:id="@+id/device_search_cl"
@@ -464,7 +351,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/device_search_iv"
- android:text="Search the power station"
+ android:text="@string/enter_the_device_sn_and_device_name"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -494,15 +381,28 @@
<!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
<include
- android:id="@+id/null_data_ic"
+ 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"
- app:layout_constraintTop_toTopOf="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>
--
Gitblit v1.8.0