From 9c67fc611daf6f9cb7c05f72d598543bff2d26f1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 25 十月 2024 11:23:17 +0800
Subject: [PATCH] s2024年10月25日11:23:14
---
app/src/main/res/layout/fragment_home_page.xml | 110 +++++++++++++++++++++++++++++-------------------------
1 files changed, 59 insertions(+), 51 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 21b2eac..4a3ad77 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -4,38 +4,47 @@
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_26"
+ <!--澶撮儴鏍囩-->
+ <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_38"
+ 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/power_home_page" />
+
+ <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="match_parent"
android:layout_height="0dp"
- android:layout_marginTop="@dimen/dp_26"
+ android:layout_marginTop="@dimen/dp_14"
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"
@@ -100,7 +109,7 @@
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="wrap_content"
@@ -108,14 +117,14 @@
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"
@@ -123,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>
@@ -135,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="0.00kW.h" />
+ 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"
@@ -155,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="0.00kW.h" />
+ 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"
@@ -188,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" />
@@ -280,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" />
@@ -294,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" />
@@ -308,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" />
@@ -425,8 +435,8 @@
<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"
@@ -503,7 +513,7 @@
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_E6000000"
android:textSize="@dimen/text_18"
@@ -516,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_E6000000"
+ android:text="@string/t"
+ android:textColor="@color/text_969696"
android:textSize="@dimen/text_12"
@@ -560,7 +570,7 @@
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_E6000000"
android:textSize="@dimen/text_18"
@@ -573,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_E6000000"
+ android:text="@string/t"
+ android:textColor="@color/text_969696"
android:textSize="@dimen/text_12"
/>
@@ -615,8 +625,8 @@
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:layout_marginTop="@dimen/dp_12"
+ android:text="13"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
android:textStyle="bold" />
@@ -628,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_E6000000"
- 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"
--
Gitblit v1.8.0