From 24ea247fa736f51a3f813736fce3199435e35c86 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 02 一月 2025 13:52:35 +0800
Subject: [PATCH] 2025年01月02日13:52:34
---
app/src/main/res/layout/fragment_home_page.xml | 97 ++++++++++++++++++++++++++----------------------
1 files changed, 52 insertions(+), 45 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 5bbb558..da6e24c 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_FF161616"
+ android:background="@color/text_FF000000"
tools:context=".ui.home.HomePageFragment">
<!--澶撮儴鏍囩-->
<RelativeLayout
@@ -21,11 +21,12 @@
<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/power_home_page" />
+ android:text="@string/power_home_page"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_18" />
<ImageView
android:id="@+id/home_page_station_add_iv"
@@ -55,7 +56,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingBottom="@dimen/dp_16"
+ android:paddingBottom="@dimen/dp_10"
>
@@ -66,7 +67,7 @@
android:layout_height="@dimen/dp_66"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/bj_ff333738"
+ android:background="@drawable/bj_ff1c1c1e"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -86,7 +87,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
- android:textColor="@color/text_FFFFFFFF"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_16" />
<TextView
@@ -113,7 +114,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
- android:textColor="@color/text_FFFFFFFF"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_16" />
<TextView
@@ -140,7 +141,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
- android:textColor="@color/text_FFFFFFFF"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_16" />
<TextView
@@ -167,7 +168,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
- android:textColor="@color/text_FFFFFFFF"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_16" />
<TextView
@@ -191,7 +192,7 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/bj_ff333738"
+ android:background="@drawable/bj_ff1c1c1e"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -249,7 +250,7 @@
android:layout_below="@+id/progressBar"
android:layout_alignStart="@+id/info_rl1_f_text1_tv"
android:layout_marginTop="@dimen/dp_8"
- android:text="Radio"
+ android:text="@string/radio"
android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
@@ -317,7 +318,7 @@
android:layout_marginStart="4dp"
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/info_rl1_text3_tv"
- android:text="kWp"
+ android:text="kW"
android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_10" />
@@ -525,7 +526,8 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/bj_ff333738"
+ android:background="@drawable/bj_ff1c1c1e"
+ android:paddingBottom="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_cl">
@@ -545,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"
@@ -557,57 +559,61 @@
<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"
- android:layout_width="0.5dp"
+ android:layout_width="1dp"
android:layout_height="match_parent"
- android:background="@color/text_33FFFFFF" />
+ android:background="@color/text_FF39383D" />
<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"
- android:layout_width="0.5dp"
+ android:layout_width="1dp"
android:layout_height="match_parent"
- android:background="@color/text_33FFFFFF" />
+ android:background="@color/text_FF39383D" />
<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"
- android:layout_width="0.5dp"
+ android:layout_width="1dp"
android:layout_height="match_parent"
- android:background="@color/text_33FFFFFF" />
+ android:background="@color/text_FF39383D" />
<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>
<!--鏃堕棿鍒囨崲鎺т欢-->
@@ -615,7 +621,7 @@
android:id="@+id/home_page_station_select_time_ll"
android:layout_width="match_parent"
android:layout_height="30.5dp"
- android:layout_marginTop="@dimen/dp_24"
+ android:layout_marginTop="@dimen/dp_22"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
@@ -634,8 +640,8 @@
<ImageView
android:id="@+id/last_step_iv"
- android:layout_width="9dp"
- android:layout_height="15dp"
+ android:layout_width="16dp"
+ android:layout_height="16dp"
android:scaleType="fitCenter"
android:src="@drawable/last_step" />
@@ -645,7 +651,7 @@
</LinearLayout>
<View
- android:layout_width="@dimen/dp_16"
+ android:layout_width="@dimen/dp_4"
android:layout_height="match_parent" />
@@ -659,7 +665,7 @@
android:textSize="@dimen/text_14" />
<View
- android:layout_width="@dimen/dp_16"
+ android:layout_width="@dimen/dp_4"
android:layout_height="match_parent" />
<!--鍔犲ぇ鐐瑰嚮鐑尯-->
<LinearLayout
@@ -674,8 +680,8 @@
<ImageView
android:id="@+id/next_step_iv"
- android:layout_width="9dp"
- android:layout_height="15dp"
+ android:layout_width="16dp"
+ android:layout_height="16dp"
android:scaleType="fitCenter"
android:src="@drawable/next_step" />
@@ -691,7 +697,7 @@
android:id="@+id/chart_title_rl"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_15"
- android:layout_marginTop="@dimen/dp_26"
+ android:layout_marginTop="@dimen/dp_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_page_station_select_time_ll">
@@ -702,7 +708,7 @@
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_marginStart="18.5dp"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
<TextView
@@ -729,7 +735,9 @@
<FrameLayout
android:layout_width="0dp"
android:layout_height="284dp"
+ android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_18"
+ android:layout_marginEnd="@dimen/dp_4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/chart_title_rl">
@@ -750,8 +758,7 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/bj_ff333738"
-
+ android:background="@drawable/bj_ff1c1c1e"
android:paddingBottom="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -784,7 +791,7 @@
<RelativeLayout
android:id="@+id/social_contribution_1_rl"
android:layout_width="97dp"
- android:layout_height="@dimen/dp_126">
+ android:layout_height="@dimen/dp_116">
<ImageView
android:layout_width="match_parent"
@@ -824,7 +831,7 @@
android:layout_marginStart="@dimen/dp_8"
android:text="@string/saving_standard_coal"
android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_11" />
+ android:textSize="@dimen/text_10" />
</RelativeLayout>
@@ -837,7 +844,7 @@
<RelativeLayout
android:id="@+id/social_contribution_2_rl"
android:layout_width="97dp"
- android:layout_height="@dimen/dp_126">
+ android:layout_height="@dimen/dp_116">
<ImageView
android:layout_width="match_parent"
@@ -879,7 +886,7 @@
android:layout_marginStart="@dimen/dp_8"
android:text="@string/co_reduction_rate"
android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_11" />
+ android:textSize="@dimen/text_10" />
</RelativeLayout>
@@ -892,7 +899,7 @@
<RelativeLayout
android:id="@+id/social_contribution_3_rl"
android:layout_width="97dp"
- android:layout_height="@dimen/dp_126">
+ android:layout_height="@dimen/dp_116">
<ImageView
android:layout_width="match_parent"
@@ -932,7 +939,7 @@
android:layout_marginStart="@dimen/dp_8"
android:text="@string/quantity_of_equivalent_values"
android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_11" />
+ android:textSize="@dimen/text_10" />
</RelativeLayout>
--
Gitblit v1.8.0