From d0013a2c962f0725d2eb3a34e7a46d5b47484cb1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 12 七月 2024 18:36:13 +0800
Subject: [PATCH] 2024年07月12日18:36:10
---
app/src/main/res/layout/fragment_house_list.xml | 74 ++++++++++++++++++++++++-------------
1 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 1b78380..9dffdbe 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -4,7 +4,8 @@
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"
@@ -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,12 @@
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_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="Equipment"
+ android:text="@string/device"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_16"
@@ -51,6 +51,7 @@
android:layout_marginEnd="@dimen/dp_13"
android:layout_toStartOf="@+id/add_iv"
android:src="@drawable/edit"
+ android:visibility="gone"
/>
@@ -115,7 +116,7 @@
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" />
</RelativeLayout>
@@ -153,7 +154,7 @@
layout="@layout/item_station" />
<include
- android:id="@+id/hpower_station_offline_il"
+ android:id="@+id/power_station_offline_il"
layout="@layout/item_station" />
<include
@@ -170,7 +171,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"
@@ -178,10 +178,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
@@ -191,7 +189,9 @@
android:text="@string/station_name"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12"
- android:textStyle="bold" />
+ android:textStyle="bold"
+
+ />
<ImageView
android:id="@+id/station_name_iv"
@@ -199,15 +199,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
@@ -225,15 +228,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
@@ -251,15 +257,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
@@ -349,7 +358,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>
@@ -379,15 +388,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