From 542a1aebe872632e69b4a42ff629d13bb4e8d6d0 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 七月 2025 09:31:14 +0800
Subject: [PATCH] Merge branch '1.3.1'
---
app/src/main/res/layout/activity_test_main.xml | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/app/src/main/res/layout/activity_test_main.xml b/app/src/main/res/layout/activity_test_main.xml
index 4cfb376..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">
@@ -18,7 +19,7 @@
app:layout_constraintTop_toTopOf="parent">
<!--1.杩斿洖鎸夐挳 澧炲ぇ鐐瑰嚮鍖哄煙-->
<LinearLayout
- android:id="@+id/top_back_btn"
+ android:id="@+id/top_back_ll"
android:layout_width="@dimen/dp_56"
android:layout_height="match_parent"
android:gravity="center_vertical"
@@ -75,33 +76,85 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/title_cl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_50"
+ android:layout_height="@dimen/dp_75"
android:background="@color/text_FFFFFFFF"
app:layout_constraintEnd_toEndOf="parent"
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:textColor="@color/text_030D1C"
- android:textIsSelectable="true"
- android:textSize="@dimen/text_15"
- android:layout_marginStart="@dimen/dp_5"
- 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_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_14"
+ app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/homeId_tv" />
+ <TextView
+ android:id="@+id/click_command_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_25"
+ android:layout_marginEnd="20dp"
+ android:text="娴嬭瘯鎸囦护"
+ android:textColor="@color/text_245EC3"
+ android:textSize="@dimen/text_15"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ 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_14"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent" />
+
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
--
Gitblit v1.8.0