From 73919e36e6c84a665a2c4352fa3b22d1b2e9e6bb Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 18 六月 2024 13:08:19 +0800
Subject: [PATCH] 2024年06月18日13:08:14
---
app/src/main/res/layout/fragment_home_page.xml | 252 +++++++++++++++----------------------------------
1 files changed, 78 insertions(+), 174 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 998fe5f..9d227d0 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -4,16 +4,17 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@drawable/bj"
tools:context=".ui.home.HomePageFragment">
<TextView
android:id="@+id/home_page_title_tv"
style="@style/Text20Style"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_24"
+ android:layout_height="@dimen/dp_26"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="58dp"
- android:text="@string/power_shome_page"
+ android:text="@string/summarize"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -29,7 +30,7 @@
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/srl"
- android:layout_width="0dp"
+ android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_26"
app:layout_constraintBottom_toBottomOf="parent"
@@ -39,157 +40,49 @@
<ScrollView
android:id="@+id/sl"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_marginTop="@dimen/dp_26"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/home_page_title_tv">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/dp_26">
<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_90000000"
- 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_40000000"
- 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_90000000"
- 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_40000000"
- 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_90000000"
- 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_40000000"
- 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_90000000"
- 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_40000000"
- 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">
@@ -211,11 +104,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" />
@@ -241,7 +136,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.00kWp" />
<TextView
android:id="@+id/info_rl1_text2_tv"
@@ -251,7 +146,7 @@
android:layout_below="@+id/info_rl1_text1_tv"
android:layout_alignStart="@+id/info_rl1_text1_tv"
android:layout_marginTop="3dp"
- android:text="@string/installed_capacity" />
+ android:text="@string/string_capacity" />
<TextView
android:id="@+id/info_rl1_text3_tv"
@@ -261,7 +156,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" />
<TextView
android:id="@+id/info_rl1_text4_tv"
@@ -279,7 +174,7 @@
android:id="@+id/home_page_station_info_rl2"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_166"
- android:background="@drawable/bj_13_ffffff"
+ android:background="@drawable/page_station_generating_bj"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_rl1">
@@ -349,11 +244,13 @@
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
-
+ <!--鏃ユ湡-->
<androidx.constraintlayout.widget.ConstraintLayout
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">
@@ -364,7 +261,7 @@
android:layout_height="18dp"
android:layout_marginTop="@dimen/dp_25"
android:text="@string/energy_generation_statistics"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_14"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -477,7 +374,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="2024/03/07"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_16"
android:textStyle="bold" />
@@ -524,7 +421,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentStart="true"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
<TextView
@@ -541,27 +438,36 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
- android:text="PV power generation"
- android:textColor="@color/text_90000000"
+ android:text="@string/pv_power"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12" />
</RelativeLayout>
- <com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartView
- android:id="@+id/AAChartView"
+ <FrameLayout
android:layout_width="0dp"
android:layout_height="284dp"
android:layout_marginTop="@dimen/dp_18"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/chart_title_rl" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ app:layout_constraintTop_toBottomOf="@+id/chart_title_rl">
+ <com.hdl.photovoltaic.ui.home.AutoSizeMyAAChart
+ android:id="@+id/autoSizeMyAAChart"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+
+ />
+ </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">
@@ -571,7 +477,7 @@
android:layout_width="wrap_content"
android:layout_height="17dp"
android:text="@string/social_contribution"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_14"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -600,7 +506,7 @@
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_16"
android:text="13.14"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
android:textStyle="bold" />
@@ -611,8 +517,8 @@
android:layout_alignBottom="@+id/social_contribution_data_1_tv"
android:layout_marginStart="@dimen/dp_2"
android:layout_toEndOf="@+id/social_contribution_data_1_tv"
- android:text="(T)"
- android:textColor="@color/text_90000000"
+ android:text="@string/t"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12"
@@ -625,9 +531,9 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_35"
- android:text="ssss"
- android:textColor="@color/text_40000000"
+ android:layout_marginTop="@dimen/dp_39"
+ android:text="@string/saving_standard_coal"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -657,7 +563,7 @@
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_16"
android:text="13.14"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
android:textStyle="bold" />
@@ -668,8 +574,8 @@
android:layout_alignBottom="@+id/social_contribution_data_2_tv"
android:layout_marginStart="@dimen/dp_2"
android:layout_toEndOf="@+id/social_contribution_data_2_tv"
- android:text="(T)"
- android:textColor="@color/text_90000000"
+ android:text="@string/t"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12"
/>
@@ -681,9 +587,9 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_35"
- android:text="ssss"
- android:textColor="@color/text_40000000"
+ android:layout_marginTop="@dimen/dp_39"
+ android:text="@string/co_reduction_rate"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -711,8 +617,8 @@
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_16"
- android:text="13.14"
- android:textColor="@color/text_90000000"
+ android:text="13"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
android:textStyle="bold" />
@@ -723,11 +629,9 @@
android:layout_alignBottom="@+id/social_contribution_data_3_tv"
android:layout_marginStart="@dimen/dp_2"
android:layout_toEndOf="@+id/social_contribution_data_3_tv"
- android:text="(T)"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_12"
-
- />
+ android:text="@string/number"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/social_contribution_des_3_tv"
@@ -736,9 +640,9 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_35"
- android:text="ssss"
- android:textColor="@color/text_40000000"
+ 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