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_main.xml | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 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..16513dd 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">
@@ -81,37 +82,41 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/test_top_bar_view">
- <TextView
- android:id="@+id/homeId_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_25"
- android:layout_marginStart="@dimen/dp_5"
- android:textColor="@color/text_030D1C"
- android:textIsSelectable="true"
- android:textSize="@dimen/text_15"
- 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:text="鐢电珯鍚嶇О锛歯ull"
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_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/homeId_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_25"
+ android:layout_marginStart="@dimen/dp_5"
+ android:text="鐢电珯ID锛歯ull"
+ android:textColor="@color/text_030D1C"
+ android:textIsSelectable="true"
+ android:textSize="@dimen/text_15"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/homeName_tv" />
+
<TextView
android:id="@+id/deviceName_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_25"
android:layout_marginStart="@dimen/dp_5"
+ android:text="閫嗗彉鍣ㄥ悕绉�:null"
android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_15"
- android:text="閫嗗彉鍣ㄥ悕绉�:xxx"
+ android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/homeName_tv" />
+ app:layout_constraintTop_toBottomOf="@+id/homeId_tv" />
<TextView
android:id="@+id/click_command_tv"
@@ -127,16 +132,28 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
+ android:id="@+id/click_select_home_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_25"
+ android:layout_marginTop="@dimen/dp_8"
+ android:layout_marginEnd="20dp"
+ android:text="閫夋嫨鐢电珯"
+ android:textColor="@color/text_245EC3"
+ android:textSize="@dimen/text_14"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
android:id="@+id/click_select_device_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_25"
android:layout_marginEnd="20dp"
+ android:layout_marginBottom="@dimen/dp_8"
android:text="閫夋嫨璁惧"
android:textColor="@color/text_245EC3"
- android:textSize="@dimen/text_15"
+ android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintEnd_toEndOf="parent" />
<View
android:layout_width="match_parent"
--
Gitblit v1.8.0