From fa7bb21e6605319169ff4b3dd5acb0196e74570e Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 31 七月 2024 15:12:42 +0800
Subject: [PATCH] 2024年07月31日15:12:38
---
app/src/main/res/layout/fragment_home_page.xml | 220 ++++++++++++++++++++++++++++--------------------------
1 files changed, 113 insertions(+), 107 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 97c4360..f593ac9 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -4,99 +4,93 @@
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"
+ <!--澶撮儴鏍囩-->
+ <RelativeLayout
+ android:id="@+id/title_cl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_44"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="58dp"
- android:text="@string/power_shome_page"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <ImageView
- android:id="@+id/home_page_station_add_iv"
- android:layout_width="@dimen/dp_31"
- android:layout_height="@dimen/dp_31"
- android:layout_marginTop="53dp"
- android:layout_marginEnd="@dimen/dp_24"
- android:src="@drawable/add"
+ android:layout_marginTop="@dimen/dp_44"
+ android:layout_marginEnd="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+
+ <TextView
+ android:id="@+id/home_page_title_tv"
+ style="@style/Text20Style"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:text="@string/summarize" />
+
+ <ImageView
+ android:id="@+id/home_page_station_add_iv"
+ android:layout_width="@dimen/dp_31"
+ android:layout_height="@dimen/dp_31"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:src="@drawable/add" />
+ </RelativeLayout>
<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"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/home_page_title_tv">
+ app:layout_constraintTop_toBottomOf="@+id/title_cl">
<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">
+ <!--鏉′欢绛涢��-->
<LinearLayout
android:id="@+id/home_page_station_ll"
- android:layout_width="375dp"
+ 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">
- <!--鍏ㄩ儴-->
+
<include
- android:id="@+id/home_page_station_all_ic"
+ android:id="@+id/home_all_il"
layout="@layout/item_station" />
- <View
- android:layout_width="15.5dp"
- android:layout_height="match_parent" />
- <!--鏁呴殰-->
<include
- android:id="@+id/home_page_station_fault_ic"
+ android:id="@+id/home_faults_il"
layout="@layout/item_station" />
- <View
- android:layout_width="16dp"
- android:layout_height="match_parent" />
- <!--绂荤嚎-->
<include
- android:id="@+id/home_page_station_offline_ic"
+ android:id="@+id/home_offline_il"
layout="@layout/item_station" />
- <View
- android:layout_width="15.5dp"
- android:layout_height="match_parent" />
- <!--寰呮帴鍏�-->
<include
- android:id="@+id/home_page_station_connected_ic"
+ android:id="@+id/home_connected_il"
layout="@layout/item_station" />
-
</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">
@@ -115,20 +109,22 @@
android:layout_height="102dp"
android:layout_marginTop="@dimen/dp_22"
android:background="@drawable/disc">
-
+ <!--鐢ㄥ瘜鏂囨湰瀹炵幇-->
<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:text="0"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_26"
android:textStyle="bold" />
-
+ <!--鍏堥殣钘�-->
<TextView
android:id="@+id/home_page_station_info_rl1_f_text2_tv"
- android:layout_width="9dp"
+ android:layout_width="wrap_content"
android:layout_height="14.5dp"
android:layout_alignBottom="@+id/info_rl1_f_text1_tv"
android:layout_marginStart="2.5dp"
@@ -136,7 +132,8 @@
android:layout_toEndOf="@+id/info_rl1_f_text1_tv"
android:text="%"
android:textColor="@color/text_191919"
- android:textSize="@dimen/text_12" />
+ android:textSize="@dimen/text_12"
+ android:visibility="gone" />
</RelativeLayout>
@@ -148,17 +145,17 @@
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"
style="@style/Text14Style"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="@dimen/dp_18"
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"
@@ -168,13 +165,13 @@
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"
style="@style/Text14Style"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="@dimen/dp_18"
android:layout_below="@+id/info_rl1_text3_tv"
android:layout_alignStart="@+id/info_rl1_text1_tv"
android:layout_marginTop="3dp"
@@ -186,7 +183,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">
@@ -201,9 +198,9 @@
<TextView
android:id="@+id/home_page_station_info_rl1_title_tv"
android:layout_width="wrap_content"
- android:layout_height="14.5dp"
+ android:layout_height="16dp"
android:layout_marginStart="@dimen/dp_47"
- android:layout_marginTop="17dp"
+ android:layout_marginTop="16dp"
android:text="@string/generation"
android:textColor="@color/text_191919"
android:textSize="@dimen/text_12" />
@@ -256,11 +253,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">
@@ -271,7 +270,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"
@@ -291,7 +290,7 @@
<TextView
android:id="@+id/day_tv"
style="@style/Text14Style"
- android:layout_width="86dp"
+ android:layout_width="85dp"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/day" />
@@ -305,7 +304,7 @@
<TextView
android:id="@+id/month_tv"
style="@style/Text14Style"
- android:layout_width="86dp"
+ android:layout_width="85dp"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/month" />
@@ -319,7 +318,7 @@
<TextView
android:id="@+id/year_tv"
style="@style/Text14Style"
- android:layout_width="86dp"
+ android:layout_width="85dp"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/year" />
@@ -384,7 +383,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" />
@@ -431,13 +430,13 @@
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
android:id="@+id/unit_icon_tv"
- android:layout_width="@dimen/dp_11"
- android:layout_height="@dimen/dp_11"
+ android:layout_width="@dimen/dp_10"
+ android:layout_height="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_3"
android:layout_marginEnd="@dimen/dp_3"
android:layout_toStartOf="@+id/unit_text_tv"
@@ -448,27 +447,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">
@@ -478,7 +486,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"
@@ -505,9 +513,9 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_12"
android:text="13.14"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
android:textStyle="bold" />
@@ -518,8 +526,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_969696"
android:textSize="@dimen/text_12"
@@ -532,9 +540,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" />
@@ -562,9 +570,9 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_12"
android:text="13.14"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
android:textStyle="bold" />
@@ -575,8 +583,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_969696"
android:textSize="@dimen/text_12"
/>
@@ -588,9 +596,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" />
@@ -617,9 +625,9 @@
android:layout_height="22dp"
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:layout_marginTop="@dimen/dp_12"
+ android:text="13"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
android:textStyle="bold" />
@@ -630,11 +638,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_969696"
+ android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/social_contribution_des_3_tv"
@@ -643,9 +649,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