From 4598b51c90c695c9ccbe5350a84e4a46b9d8e587 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 20:19:02 +0800
Subject: [PATCH] 2024年05月22日20:18:54
---
app/src/main/res/layout/fragment_home_page.xml | 176 +++++++++++++---------------------------------------------
1 files changed, 39 insertions(+), 137 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 4cd5ea9..c6db385 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -45,147 +45,43 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginEnd="@dimen/dp_16">
+ android:layout_height="wrap_content">
- <RelativeLayout
+ <!--鏉′欢绛涢��-->
+ <LinearLayout
android:id="@+id/home_page_station_ll"
android:layout_width="0dp"
android:layout_height="@dimen/dp_56"
+ android:layout_marginStart="@dimen/dp_16"
+ android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
- <RelativeLayout
- android:id="@+id/station_status_all_rl"
- android:layout_width="74dp"
- android:layout_height="match_parent"
- android:background="@drawable/station_status_no_ffffff">
+ <include
+ android:id="@+id/home_all_il"
+ layout="@layout/item_station" />
- <TextView
- android:id="@+id/station_status_all_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:text="999"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
+ <include
+ android:id="@+id/home_faults_il"
+ layout="@layout/item_station" />
- <TextView
- android:id="@+id/station_status_number_all_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_below="@+id/station_status_all_tv"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="state"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_14" />
- </RelativeLayout>
+ <include
+ android:id="@+id/home_offline_il"
+ layout="@layout/item_station" />
- <RelativeLayout
- android:id="@+id/station_status_faults_rl"
- android:layout_width="74dp"
- android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_toEndOf="@+id/station_status_all_rl"
- android:background="@drawable/station_status_no_ffffff">
+ <include
+ android:id="@+id/home_connected_il"
+ layout="@layout/item_station" />
- <TextView
- android:id="@+id/station_status_faults_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:text="999"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/station_status_number_faults_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_below="@+id/station_status_faults_tv"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="state"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_14" />
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/station_status_off_rl"
- android:layout_width="74dp"
- android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_toEndOf="@+id/station_status_faults_rl"
- android:background="@drawable/station_status_no_ffffff">
-
- <TextView
- android:id="@+id/station_status_off_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:text="999"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/station_status_number_off_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_below="@+id/station_status_off_tv"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="state"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_14" />
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/station_status_connected_rl"
- android:layout_width="74dp"
- android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_toEndOf="@+id/station_status_off_rl"
- android:background="@drawable/station_status_no_ffffff">
-
- <TextView
- android:id="@+id/station_status_connected_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:text="999"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/station_status_number_connected_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_below="@+id/station_status_connected_tv"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="state"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_14" />
- </RelativeLayout>
-
-
- </RelativeLayout>
-
+ </LinearLayout>
+ <!--瑁呮満瀹归噺 鍙戠數鍔熺巼鏁版嵁鏄剧ず-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/home_page_station_info_cl"
android:layout_width="0dp"
android:layout_height="312dp"
+ 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_toBottomOf="@+id/home_page_station_ll">
@@ -207,11 +103,13 @@
<TextView
android:id="@+id/info_rl1_f_text1_tv"
- android:layout_width="56dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
+ android:layout_centerInParent="true"
+ android:layout_marginStart="@dimen/dp_6"
android:gravity="end|center_vertical"
android:text="88"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_26"
android:textStyle="bold" />
@@ -237,7 +135,7 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_21"
android:layout_toEndOf="@+id/home_page_station_info_rl1_f"
- android:text="33333333" />
+ android:text="0.00kW.h" />
<TextView
android:id="@+id/info_rl1_text2_tv"
@@ -257,7 +155,7 @@
android:layout_below="@+id/info_rl1_text2_tv"
android:layout_alignStart="@+id/info_rl1_text1_tv"
android:layout_marginTop="@dimen/dp_16"
- android:text="33333" />
+ android:text="0.00kW.h" />
<TextView
android:id="@+id/info_rl1_text4_tv"
@@ -350,6 +248,8 @@
android:id="@+id/home_page_station_data_cl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ 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_toBottomOf="@+id/home_page_station_info_cl">
@@ -537,7 +437,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
- android:text="PV power generation"
+ android:text="@string/pv_power"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12" />
@@ -559,12 +459,14 @@
/>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
-
+ <!--绀句細璐＄尞鏄剧ず-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/home_page_station_statistics_cl"
android:layout_width="match_parent"
android:layout_height="186dp"
+ android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_26"
+ android:layout_marginEnd="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_page_station_data_cl">
@@ -628,8 +530,8 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_35"
- android:text="ssss"
+ android:layout_marginTop="@dimen/dp_39"
+ android:text="@string/saving_standard_coal"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -684,8 +586,8 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_35"
- android:text="ssss"
+ android:layout_marginTop="@dimen/dp_39"
+ android:text="@string/co_reduction_rate"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -739,8 +641,8 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_35"
- android:text="ssss"
+ android:layout_marginTop="@dimen/dp_39"
+ android:text="@string/quantity_of_equivalent_values"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
--
Gitblit v1.8.0