From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/res/layout/activity_test_log.xml | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/app/src/main/res/layout/activity_test_log.xml b/app/src/main/res/layout/activity_test_log.xml
index 84a7c50..a93b97a 100644
--- a/app/src/main/res/layout/activity_test_log.xml
+++ b/app/src/main/res/layout/activity_test_log.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.TestLogActivity">
<RelativeLayout
@@ -81,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
@@ -129,7 +130,7 @@
android:id="@+id/sv"
android:layout_width="0dp"
android:layout_height="0dp"
- app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintBottom_toTopOf="@+id/uploading_log_ll"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title_cl">
@@ -153,10 +154,10 @@
</ScrollView>
<!--涓婁紶鏃ュ織鍐呭-->
<LinearLayout
+ android:id="@+id/uploading_log_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
- android:background="@color/text_FFFFFFFF"
- android:visibility="gone"
+ android:background="@color/text_FF1C1C1E"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -168,8 +169,8 @@
android:layout_height="@dimen/dp_50"
android:layout_weight="1"
android:gravity="center"
- android:text="涓婁紶鏃ュ織鍒颁簯绔�"
- android:textColor="@color/text_030D1C"
+ android:text="鏃ュ織鍒嗕韩"
+ android:textColor="@color/text_FFFFFFFF"
android:textSize="@dimen/text_15" />
</LinearLayout>
--
Gitblit v1.8.0