From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/layout/activity_test_main.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/layout/activity_test_main.xml b/app/src/main/res/layout/activity_test_main.xml
index c3a06f3..4b87208 100644
--- a/app/src/main/res/layout/activity_test_main.xml
+++ b/app/src/main/res/layout/activity_test_main.xml
@@ -18,7 +18,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,7 +75,7 @@
<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"
@@ -103,6 +103,17 @@
app:layout_constraintTop_toBottomOf="@+id/homeId_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:textColor="@color/text_030D1C"
+ android:textSize="@dimen/text_15"
+ android:text="閫嗗彉鍣ㄥ悕绉�:xxx"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/homeName_tv" />
+
+ <TextView
android:id="@+id/click_command_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_25"
--
Gitblit v1.8.0