From a1c880c476327032fe174af8c80d6f78a590dae9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 07 二月 2025 16:35:22 +0800
Subject: [PATCH] Merge branch '1.5.1' into dev
---
app/src/main/res/layout/activity_test_log.xml | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/app/src/main/res/layout/activity_test_log.xml b/app/src/main/res/layout/activity_test_log.xml
index 4747004..9d97c88 100644
--- a/app/src/main/res/layout/activity_test_log.xml
+++ b/app/src/main/res/layout/activity_test_log.xml
@@ -82,25 +82,25 @@
app:layout_constraintTop_toBottomOf="@+id/test_top_bar_view">
<TextView
+ android:id="@+id/homeName_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_25"
+ android:layout_marginStart="@dimen/dp_5"
+ android:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_14"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
android:id="@+id/homeId_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_25"
android:layout_marginStart="4dp"
android:textColor="@color/text_030D1C"
android:textIsSelectable="true"
- android:textSize="@dimen/text_15"
+ android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <TextView
- android:id="@+id/homeName_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_25"
- android:layout_marginStart="@dimen/dp_5"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_15"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/homeId_tv" />
+ app:layout_constraintTop_toBottomOf="@+id/homeName_tv" />
<TextView
@@ -157,7 +157,8 @@
android:id="@+id/uploading_log_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
- android:background="@color/text_FFFFFFFF"
+ android:background="@color/text_FF1C1C1E"
+ android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -170,7 +171,7 @@
android:layout_weight="1"
android:gravity="center"
android:text="鏃ュ織鍒嗕韩"
- android:textColor="@color/text_030D1C"
+ android:textColor="@color/text_FFFFFFFF"
android:textSize="@dimen/text_15" />
</LinearLayout>
--
Gitblit v1.8.0