From 13b98b03b11f3865aaafc9daa3ce5b205fa1a228 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 30 十二月 2024 10:44:33 +0800
Subject: [PATCH] Merge branch '1.5.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into 1.5.1
---
app/src/main/res/layout/activity_test_main.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/app/src/main/res/layout/activity_test_main.xml b/app/src/main/res/layout/activity_test_main.xml
index 4b87208..6419cb0 100644
--- a/app/src/main/res/layout/activity_test_main.xml
+++ b/app/src/main/res/layout/activity_test_main.xml
@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/text_FFFFFFFF"
tools:context=".ui.test.TestMainActivity">
@@ -109,7 +110,7 @@
android:layout_marginStart="@dimen/dp_5"
android:textColor="@color/text_030D1C"
android:textSize="@dimen/text_15"
- android:text="閫嗗彉鍣ㄥ悕绉�:xxx"
+ android:text="閫嗗彉鍣ㄥ悕绉�:null"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/homeName_tv" />
--
Gitblit v1.8.0