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/activity_set.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/layout/activity_set.xml b/app/src/main/res/layout/activity_set.xml
index e083c00..7f01766 100644
--- a/app/src/main/res/layout/activity_set.xml
+++ b/app/src/main/res/layout/activity_set.xml
@@ -9,7 +9,13 @@
<include
android:id="@+id/toolbar_top_rl"
- layout="@layout/toolbar_top_view_44" />
+ layout="@layout/toolbar_top_view_44"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_44"
+ android:layout_marginTop="@dimen/dp_38"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<ScrollView
android:id="@+id/set_sll"
@@ -55,7 +61,7 @@
android:gravity="center"
android:text="@string/set_logout"
android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_18"
+ android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
--
Gitblit v1.8.0