From c870de9e4207c7af37229cb24b9ca0e2d1e1215f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 09 十二月 2024 15:09:00 +0800
Subject: [PATCH] Merge branch '1.5.0' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into 1.5.0
---
app/src/main/res/layout/fragment_home_page.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index c93e5f0..23a5805 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -55,7 +55,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"
>
@@ -63,7 +63,7 @@
<LinearLayout
android:id="@+id/home_page_station_ll"
android:layout_width="0dp"
- android:layout_height="@dimen/dp_66"
+ android:layout_height="@dimen/dp_56"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/bj_ff333738"
@@ -249,7 +249,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" />
--
Gitblit v1.8.0