From 3e3904224ff6b37c654f54cee56e9ca466f289de Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 15 五月 2024 19:31:55 +0800
Subject: [PATCH] Merge branch 'wjc_new' into lwj_new
---
app/src/main/res/layout/fragment_home_page.xml | 73 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 35 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..4cd5ea9 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -10,7 +10,7 @@
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"
@@ -29,7 +29,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,13 +39,9 @@
<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"
@@ -74,7 +70,7 @@
android:layout_marginTop="7dp"
android:gravity="center"
android:text="999"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_21"
android:textStyle="bold" />
@@ -86,7 +82,7 @@
android:layout_marginTop="1dp"
android:gravity="center"
android:text="state"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -105,7 +101,7 @@
android:layout_marginTop="7dp"
android:gravity="center"
android:text="999"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_21"
android:textStyle="bold" />
@@ -117,7 +113,7 @@
android:layout_marginTop="1dp"
android:gravity="center"
android:text="state"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -136,7 +132,7 @@
android:layout_marginTop="7dp"
android:gravity="center"
android:text="999"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_21"
android:textStyle="bold" />
@@ -148,7 +144,7 @@
android:layout_marginTop="1dp"
android:gravity="center"
android:text="state"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -167,7 +163,7 @@
android:layout_marginTop="7dp"
android:gravity="center"
android:text="999"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_21"
android:textStyle="bold" />
@@ -179,7 +175,7 @@
android:layout_marginTop="1dp"
android:gravity="center"
android:text="state"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -349,7 +345,7 @@
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
-
+ <!--鏃ユ湡-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/home_page_station_data_cl"
android:layout_width="match_parent"
@@ -364,7 +360,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 +473,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 +520,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
@@ -542,19 +538,26 @@
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:text="PV power generation"
- android:textColor="@color/text_90000000"
+ 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" />
+ 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
@@ -571,7 +574,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 +603,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" />
@@ -612,7 +615,7 @@
android:layout_marginStart="@dimen/dp_2"
android:layout_toEndOf="@+id/social_contribution_data_1_tv"
android:text="(T)"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12"
@@ -627,7 +630,7 @@
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_35"
android:text="ssss"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -657,7 +660,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" />
@@ -669,7 +672,7 @@
android:layout_marginStart="@dimen/dp_2"
android:layout_toEndOf="@+id/social_contribution_data_2_tv"
android:text="(T)"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12"
/>
@@ -683,7 +686,7 @@
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_35"
android:text="ssss"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -712,7 +715,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" />
@@ -724,7 +727,7 @@
android:layout_marginStart="@dimen/dp_2"
android:layout_toEndOf="@+id/social_contribution_data_3_tv"
android:text="(T)"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12"
/>
@@ -738,7 +741,7 @@
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_35"
android:text="ssss"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
--
Gitblit v1.8.0