From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/res/layout/fragment_home_page.xml | 134 +++++++++++++++++++++++++-------------------
1 files changed, 76 insertions(+), 58 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index bc03351..19b088c 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/power_home_page"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18" />
<ImageView
@@ -37,8 +37,8 @@
android:src="@drawable/add" />
</RelativeLayout>
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
- android:id="@+id/srl"
+ <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
+ android:id="@+id/rsl"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_10"
@@ -51,7 +51,7 @@
android:id="@+id/sl"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="@dimen/dp_26">
+ android:layout_marginTop="@dimen/dp_10">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -87,7 +87,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -96,7 +96,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/message_all"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
<!--鏁呴殰-->
@@ -114,7 +114,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -123,7 +123,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/my_power_station_malfunction"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
<!--绂荤嚎-->
@@ -141,7 +141,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -150,7 +150,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/my_power_station_off_line"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
<!--寰呮帴鍏�-->
@@ -168,7 +168,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -177,7 +177,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/to_be_added"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -216,7 +216,7 @@
android:layout_marginStart="@dimen/dp_41"
android:layout_marginTop="@dimen/dp_32"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_26" />
<!--鍏堥殣钘�-->
<TextView
@@ -228,7 +228,7 @@
android:layout_marginBottom="6.5dp"
android:layout_toEndOf="@+id/info_rl1_f_text1_tv"
android:text="%"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
android:visibility="visible" />
@@ -251,7 +251,7 @@
android:layout_alignStart="@+id/info_rl1_f_text1_tv"
android:layout_marginTop="@dimen/dp_8"
android:text="@string/radio"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</RelativeLayout>
@@ -274,7 +274,7 @@
android:layout_marginStart="42.5dp"
android:layout_marginTop="16.5dp"
android:text="0.00"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -286,7 +286,7 @@
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/info_rl1_text1_tv"
android:text="kWp"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
<TextView
@@ -296,7 +296,7 @@
android:layout_below="@+id/info_rl1_text1_tv"
android:layout_alignStart="@+id/info_rl1_text1_tv"
android:text="@string/string_capacity"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<TextView
@@ -307,7 +307,7 @@
android:layout_alignStart="@+id/info_rl1_text1_tv"
android:layout_marginTop="@dimen/dp_18"
android:text="0.00"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -318,8 +318,8 @@
android:layout_marginStart="4dp"
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/info_rl1_text3_tv"
- android:text="kWp"
- android:textColor="@color/text_66FFFFFF"
+ android:text="kW"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
<TextView
@@ -329,7 +329,7 @@
android:layout_below="@+id/info_rl1_text3_tv"
android:layout_alignStart="@+id/info_rl1_text1_tv"
android:text="@string/generated_power"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</RelativeLayout>
@@ -359,7 +359,7 @@
android:layout_marginStart="40.5dp"
android:layout_marginTop="18dp"
android:text="0.00"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -371,7 +371,7 @@
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/day"
android:text="kWh"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
<TextView
@@ -381,7 +381,7 @@
android:layout_below="@+id/day_unit"
android:layout_alignStart="@+id/day"
android:text="@string/day_power_generation"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<!--骞�-->
@@ -393,7 +393,7 @@
android:layout_marginStart="40.5dp"
android:layout_marginTop="20dp"
android:text="0.00"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -405,7 +405,7 @@
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/year"
android:text="kWh"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
<TextView
@@ -415,7 +415,7 @@
android:layout_below="@+id/year_unit"
android:layout_alignStart="@+id/year"
android:text="@string/year_power_generation"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
@@ -452,7 +452,7 @@
android:layout_marginStart="40.5dp"
android:layout_marginTop="18dp"
android:text="0.00"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -464,7 +464,7 @@
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/month"
android:text="kWh"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
<TextView
@@ -474,7 +474,7 @@
android:layout_below="@+id/month_unit"
android:layout_alignStart="@+id/month"
android:text="@string/month_power_generation"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<!--绱鍙戠數閲�-->
@@ -486,7 +486,7 @@
android:layout_marginStart="40.5dp"
android:layout_marginTop="20dp"
android:text="0.00"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -498,7 +498,7 @@
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/Total"
android:text="kWh"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
<TextView
@@ -508,7 +508,7 @@
android:layout_below="@+id/Total_unit"
android:layout_alignStart="@+id/month"
android:text="@string/cumulative_power_generation"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
@@ -539,7 +539,7 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:text="@string/energy_generation_statistics"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -547,7 +547,7 @@
<LinearLayout
android:id="@+id/home_page_station_select_time_type_ll"
android:layout_width="0dp"
- android:layout_height="30.5dp"
+ android:layout_height="35dp"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
@@ -559,12 +559,13 @@
<TextView
android:id="@+id/day_tv"
- style="@style/Text12Style"
+ style="@style/Text13Style"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
- android:text="@string/day" />
+ android:text="@string/day"
+ android:textStyle="bold" />
<View
android:id="@+id/v_1"
@@ -574,12 +575,13 @@
<TextView
android:id="@+id/month_tv"
- style="@style/Text12Style"
+ style="@style/Text13Style"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
- android:text="@string/month" />
+ android:text="@string/month"
+ android:textStyle="bold" />
<View
android:id="@+id/v_2"
@@ -589,12 +591,13 @@
<TextView
android:id="@+id/year_tv"
- style="@style/Text12Style"
+ style="@style/Text13Style"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
- android:text="@string/year" />
+ android:text="@string/year"
+ android:textStyle="bold" />
<View
android:id="@+id/v_3"
@@ -604,12 +607,13 @@
<TextView
android:id="@+id/lifeCycle_tv"
- style="@style/Text12Style"
+ style="@style/Text13Style"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
- android:text="@string/life_cycle" />
+ android:text="@string/life_cycle"
+ android:textStyle="bold" />
</LinearLayout>
<!--鏃堕棿鍒囨崲鎺т欢-->
@@ -657,7 +661,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="2024/03/07"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -704,7 +708,7 @@
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_marginStart="18.5dp"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<TextView
@@ -723,7 +727,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_16"
android:text="@string/pv_power"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
</RelativeLayout>
@@ -767,7 +771,7 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:text="@string/social_contribution"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -804,7 +808,7 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="13.14"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -815,7 +819,7 @@
android:layout_marginStart="2.5dp"
android:layout_toEndOf="@+id/social_contribution_data_1_tv"
android:text="@string/t"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<TextView
@@ -826,7 +830,7 @@
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_8"
android:text="@string/saving_standard_coal"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
@@ -857,7 +861,7 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="13.14"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -868,7 +872,7 @@
android:layout_marginStart="2.5dp"
android:layout_toEndOf="@+id/social_contribution_data_2_tv"
android:text="@string/t"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
/>
@@ -881,7 +885,7 @@
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_8"
android:text="@string/co_reduction_rate"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
@@ -912,7 +916,7 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="13.14"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -923,7 +927,7 @@
android:layout_marginStart="2.5dp"
android:layout_toEndOf="@+id/social_contribution_data_3_tv"
android:text="@string/number"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<TextView
@@ -934,7 +938,7 @@
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_8"
android:text="@string/quantity_of_equivalent_values"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
@@ -948,7 +952,21 @@
</ScrollView>
- </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+ </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
+
+<!-- <androidx.constraintlayout.widget.Guideline-->
+<!-- android:id="@+id/guideline2"-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:orientation="horizontal"-->
+<!-- app:layout_constraintGuide_begin="20dp" />-->
+
+<!-- <androidx.constraintlayout.widget.Guideline-->
+<!-- android:id="@+id/guideline3"-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:orientation="vertical"-->
+<!-- app:layout_constraintGuide_begin="20dp" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0