From 705006fe0c1187ace53ee6505f71ba98fe4b44e6 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 26 四月 2024 18:27:45 +0800
Subject: [PATCH] 2024年04月26日18:26:42
---
app/src/main/res/layout/fragment_home_page.xml | 53 +++++++++++++++++++++--------------------------------
1 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 03310b3..dc4f322 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -45,7 +45,7 @@
<LinearLayout
android:id="@+id/home_page_station_ll"
- android:layout_width="0dp"
+ android:layout_width="375dp"
android:layout_height="@dimen/dp_56"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
@@ -284,7 +284,7 @@
android:layout_width="86dp"
android:layout_height="match_parent"
android:gravity="center"
- android:text="Day" />
+ android:text="@string/day" />
<View
android:id="@+id/v_1"
@@ -298,7 +298,7 @@
android:layout_width="86dp"
android:layout_height="match_parent"
android:gravity="center"
- android:text="Month" />
+ android:text="@string/month" />
<View
android:id="@+id/v_2"
@@ -312,7 +312,7 @@
android:layout_width="86dp"
android:layout_height="match_parent"
android:gravity="center"
- android:text="Year" />
+ android:text="@string/year" />
<View
android:id="@+id/v_3"
@@ -326,7 +326,7 @@
android:layout_width="86dp"
android:layout_height="match_parent"
android:gravity="center"
- android:text="LifeCycle" />
+ android:text="@string/life_cycle" />
</LinearLayout>
<!--鏃堕棿鍒囨崲鎺т欢-->
@@ -461,27 +461,27 @@
<TextView
android:id="@+id/social_contribution_data_1_tv"
android:layout_width="wrap_content"
- android:layout_height="13dp"
+ android:layout_height="22dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_16"
android:text="13.14"
android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_14"
+ android:textSize="@dimen/text_18"
android:textStyle="bold" />
<TextView
android:id="@+id/social_contribution_unit_1_tv"
android:layout_width="wrap_content"
- android:layout_height="9dp"
+ android:layout_height="15dp"
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_90000000"
- android:textSize="@dimen/text_14"
- android:textStyle="bold"
+ android:textSize="@dimen/text_12"
+
/>
@@ -495,7 +495,7 @@
android:layout_marginTop="@dimen/dp_35"
android:text="ssss"
android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
+ android:textSize="@dimen/text_12" />
</RelativeLayout>
@@ -518,27 +518,26 @@
<TextView
android:id="@+id/social_contribution_data_2_tv"
android:layout_width="wrap_content"
- android:layout_height="13dp"
+ android:layout_height="22dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_16"
android:text="13.14"
android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_14"
+ android:textSize="@dimen/text_18"
android:textStyle="bold" />
<TextView
android:id="@+id/social_contribution_unit_2_tv"
android:layout_width="wrap_content"
- android:layout_height="9dp"
+ android:layout_height="15dp"
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_90000000"
- android:textSize="@dimen/text_14"
- android:textStyle="bold"
+ android:textSize="@dimen/text_12"
/>
@@ -552,7 +551,7 @@
android:layout_marginTop="@dimen/dp_35"
android:text="ssss"
android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
+ android:textSize="@dimen/text_12" />
</RelativeLayout>
@@ -575,27 +574,25 @@
<TextView
android:id="@+id/social_contribution_data_3_tv"
android:layout_width="wrap_content"
- android:layout_height="13dp"
- android:layout_alignParentStart="true"
+ 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:textColor="@color/text_90000000"
- android:textSize="@dimen/text_14"
+ android:textSize="@dimen/text_18"
android:textStyle="bold" />
<TextView
android:id="@+id/social_contribution_unit_3_tv"
android:layout_width="wrap_content"
- android:layout_height="9dp"
+ android:layout_height="15dp"
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_90000000"
- android:textSize="@dimen/text_14"
- android:textStyle="bold"
+ android:textSize="@dimen/text_12"
/>
@@ -609,22 +606,14 @@
android:layout_marginTop="@dimen/dp_35"
android:text="ssss"
android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
+ android:textSize="@dimen/text_12" />
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
- <LinearLayout
- android:id="@+id/wwwwww"
- android:layout_width="match_parent"
- android:layout_height="323dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/home_page_station_statistics_cl">
- </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
--
Gitblit v1.8.0