From 6266d263e91a6e90c64fb3e6f2be348146371cc8 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 17 五月 2024 16:17:03 +0800
Subject: [PATCH] 2024年05月17日16:17:01
---
app/src/main/res/layout/fragment_house_list.xml | 149 +++++--------------------------------------------
1 files changed, 17 insertions(+), 132 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..1b78380 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -106,8 +106,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"
@@ -118,8 +117,7 @@
android:layout_toEndOf="@+id/power_station_search_iv"
android:text="Search the power station"
android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_14"
- />
+ android:textSize="@dimen/text_14" />
</RelativeLayout>
<ImageView
@@ -132,6 +130,7 @@
</RelativeLayout>
+
<!--鏉′欢绛涢��-->
<LinearLayout
android:id="@+id/screening_condition_ll"
@@ -145,139 +144,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/hpower_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"
--
Gitblit v1.8.0