From bde413d383e3db95d2a255f6334fbbac7b9f373a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:13:14 +0800
Subject: [PATCH] Merge branch 'wjc_new' into feature/hxb
---
app/src/main/res/layout/fragment_home_page.xml | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 193afad..517d0ee 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -4,6 +4,7 @@
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
@@ -103,11 +104,13 @@
<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:textColor="@color/text_E6000000"
android:textSize="@dimen/text_26"
android:textStyle="bold" />
@@ -171,7 +174,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">
@@ -435,7 +438,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
- android:text="PV power generation"
+ android:text="@string/pv_power"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12" />
@@ -514,7 +517,7 @@
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:text="@string/t"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12"
@@ -528,8 +531,8 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_35"
- android:text="s"
+ android:layout_marginTop="@dimen/dp_39"
+ android:text="@string/saving_standard_coal"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -571,7 +574,7 @@
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:text="@string/t"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12"
@@ -584,8 +587,8 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_35"
- android:text="s"
+ android:layout_marginTop="@dimen/dp_39"
+ android:text="@string/co_reduction_rate"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -614,7 +617,7 @@
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_16"
- android:text="13.14"
+ android:text="13"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
android:textStyle="bold" />
@@ -626,11 +629,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:text="@string/number"
android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12"
-
- />
+ android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/social_contribution_des_3_tv"
@@ -639,8 +640,8 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_35"
- android:text="s"
+ 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