From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'
---
app/src/main/res/layout/fragment_house_list.xml | 473 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 366 insertions(+), 107 deletions(-)
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 0722160..72e15a0 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -4,144 +4,403 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/house_list_parent"
android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_52" />
-
+ android:layout_height="match_parent"
+ android:background="@drawable/bj">
+ <!--澶撮儴鏍囩-->
<RelativeLayout
- android:id="@+id/fragment_house_list_head_rl"
+ android:id="@+id/title_cl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_64"
- android:background="@color/text_F9FAFB"
- android:visibility="gone"
+ android:layout_height="@dimen/dp_31"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_44"
+ android:layout_marginEnd="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toTopOf="parent">
- <LinearLayout
- android:id="@+id/fragment_house_list_content_ll"
- android:layout_width="match_parent"
+ <TextView
+ android:id="@+id/power_station_label"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_20"
- android:orientation="horizontal">
+ android:layout_centerVertical="true"
+ android:gravity="center_vertical"
+ android:text="@string/power_station"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_20"
+ android:textStyle="bold" />
- <RelativeLayout
- android:id="@+id/fragment_house_list_content_title1_rl"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="3"
- android:gravity="center"
- android:orientation="horizontal">
+ <TextView
+ android:id="@+id/device_label"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginStart="19dp"
+ android:layout_marginEnd="7dp"
+ android:layout_toStartOf="@+id/edit_iv"
+ android:layout_toEndOf="@+id/power_station_label"
+ android:gravity="start|center_vertical"
+ android:text="@string/device"
+ android:textColor="@color/text_66000000"
+ android:textSize="@dimen/text_16"
- <TextView
- android:id="@+id/fragment_house_list_content_title1_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="@string/power_station_generated_power"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_14" />
+ />
- <ImageView
- android:id="@+id/fragment_house_list_content_title1_iv"
- android:layout_width="@dimen/dp_10"
- android:layout_height="@dimen/dp_6"
- android:layout_alignTop="@+id/fragment_house_list_content_title1_tv"
- android:layout_alignBottom="@+id/fragment_house_list_content_title1_tv"
- android:layout_marginStart="@dimen/dp_7"
- android:layout_toEndOf="@+id/fragment_house_list_content_title1_tv"
- android:src="@drawable/down" />
- </RelativeLayout>
+ <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"
- <RelativeLayout
- android:id="@+id/fragment_house_list_content_title2_rl"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="3"
- android:gravity="center"
- android:orientation="horizontal">
+ />
- <TextView
- android:id="@+id/fragment_house_list_content_title2_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="@string/power_station_Power_generation_today"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_14" />
+ <ImageView
+ android:id="@+id/add_iv"
+ android:layout_width="@dimen/dp_31"
+ android:layout_height="@dimen/dp_31"
+ android:layout_alignParentEnd="true"
+ android:src="@drawable/add" />
- <ImageView
- android:id="@+id/my_power_station_content_title2_iv"
- android:layout_width="@dimen/dp_10"
- android:layout_height="@dimen/dp_6"
- android:layout_alignTop="@+id/fragment_house_list_content_title2_tv"
- android:layout_alignBottom="@+id/fragment_house_list_content_title2_tv"
- android:layout_marginStart="@dimen/dp_7"
- android:layout_toEndOf="@+id/fragment_house_list_content_title2_tv"
- android:src="@drawable/down" />
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/fragment_house_list_content_title3_rl"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="3"
- android:gravity="center"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/fragment_house_list_content_title3_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="@string/power_station_creation_time"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_14" />
-
- <ImageView
- android:id="@+id/fragment_house_list_content_title3_iv"
- android:layout_width="@dimen/dp_10"
- android:layout_height="@dimen/dp_6"
- android:layout_alignTop="@+id/fragment_house_list_content_title3_tv"
- android:layout_alignBottom="@+id/fragment_house_list_content_title3_tv"
- android:layout_marginStart="@dimen/dp_7"
- android:layout_toEndOf="@+id/fragment_house_list_content_title3_tv"
- android:src="@drawable/down" />
- </RelativeLayout>
-
- </LinearLayout>
</RelativeLayout>
-
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
- android:id="@+id/fragment_house_srl"
+ <!--鐢电珯鏍囩-->
+ <LinearLayout
+ android:id="@+id/power_station_label_parent"
android:layout_width="match_parent"
android:layout_height="0dp"
+ android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/fragment_house_list_head_rl">
+ app:layout_constraintTop_toBottomOf="@+id/title_cl">
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/fragment_house_srl_list_rc"
+ <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">
+ <!--鎼滅储-->
+ <RelativeLayout
+ android:id="@+id/power_station_search_cl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_35"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <RelativeLayout
+ android:id="@+id/power_station_search_click_cl"
+ android:layout_width="match_parent"
+ 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">
+
+ <ImageView
+
+ android:id="@+id/power_station_search_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_13"
+ android:src="@drawable/search_path" />
+
+ <TextView
+ android:id="@+id/power_station_search_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_17"
+ 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:textSize="@dimen/text_14" />
+ </RelativeLayout>
+
+ <ImageView
+ android:id="@+id/power_station_default_condition_iv"
+ android:layout_width="@dimen/dp_31"
+ android:layout_height="@dimen/dp_31"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:src="@drawable/default_condition" />
+
+
+ </RelativeLayout>
+
+ <!--鏉′欢绛涢��-->
+ <LinearLayout
+ android:id="@+id/screening_condition_ll"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_56"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_21"
+ 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">
+
+ <include
+ android:id="@+id/power_station_all_il"
+ layout="@layout/item_station" />
+
+ <include
+ android:id="@+id/power_station_faults_il"
+ layout="@layout/item_station" />
+
+ <include
+ android:id="@+id/power_station_offline_il"
+ layout="@layout/item_station" />
+
+ <include
+ android:id="@+id/power_station_connected_il"
+ layout="@layout/item_station" />
+
+ </LinearLayout>
+
+
+ <!--鍗囧簭闄嶅簭鍔熻兘-->
+ <LinearLayout
+ android:id="@+id/ascending_order_descending_order_parent_ll"
+ android:layout_width="match_parent"
+ 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"
+ app:layout_constraintTop_toBottomOf="@+id/screening_condition_ll">
+
+ <RelativeLayout
+ android:id="@+id/station_name_rl"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/station_name_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_17"
+ 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"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_toEndOf="@+id/station_name_tv"
+ android:background="@drawable/ascending_descending_order_select" />
+ </RelativeLayout>
+
+
+ <RelativeLayout
+ android:id="@+id/station_power_rl"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/station_power_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_17"
+ android:text="@string/generated_power"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_12"
+ android:textStyle="bold" />
+
+ <ImageView
+ android:id="@+id/station_power_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_toEndOf="@+id/station_power_tv"
+ android:background="@drawable/ascending_descending_order_select" />
+ </RelativeLayout>
+
+
+ <RelativeLayout
+ android:id="@+id/station_day_rl"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/station_day_tv"
+ android:layout_width="wrap_content"
+ 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" />
+
+ <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>
+
+
+ <RelativeLayout
+ android:id="@+id/station_month_rl"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/station_month_tv"
+ android:layout_width="wrap_content"
+ 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" />
+
+ <ImageView
+ android:id="@+id/station_month_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_toEndOf="@+id/station_month_tv"
+ android:background="@drawable/ascending_descending_order_select" />
+ </RelativeLayout>
+
+
+ </LinearLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ android:id="@+id/fragment_house_srl"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:clipToPadding="false"
- android:paddingBottom="@dimen/dp_16" />
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ 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">
+
+ <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" />
+ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+
+ </LinearLayout>
+
+ <!--璁惧鏍囩-->
+ <LinearLayout
+ android:id="@+id/device_label_parent"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:orientation="vertical"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/title_cl">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/device_label_top_cl"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:layout_marginTop="@dimen/dp_21">
+ <!--鎼滅储-->
+ <RelativeLayout
+ android:id="@+id/device_search_cl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_35"
+ android:layout_marginStart="@dimen/dp_13"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:background="@drawable/search_bj_ff05000000"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/device_search_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_13"
+ android:src="@drawable/search_path" />
+
+ <TextView
+ android:id="@+id/device_search_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_17"
+ 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:textSize="@dimen/text_14" />
+ </RelativeLayout>
+
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ android:id="@+id/fragment_device_srl"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ 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">
+
+ <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" />
+ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+
+ </LinearLayout>
<!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
<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