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_qr_code_main.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/layout/activity_qr_code_main.xml b/app/src/main/res/layout/activity_qr_code_main.xml
index 75de78b..cb202ff 100644
--- a/app/src/main/res/layout/activity_qr_code_main.xml
+++ b/app/src/main/res/layout/activity_qr_code_main.xml
@@ -41,7 +41,7 @@
<TextView
android:id="@+id/user_name_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
+ android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16"
android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_18"
@@ -53,7 +53,7 @@
<TextView
android:id="@+id/user_account_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
+ android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_14"
--
Gitblit v1.8.0