From f1b6f9eeb0c65be3be02eba1296bf69067af6d9b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 25 九月 2024 14:51:59 +0800
Subject: [PATCH] 2024年09月25日14:51:50
---
app/src/main/res/layout/activity_device_search.xml | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/app/src/main/res/layout/activity_device_search.xml b/app/src/main/res/layout/activity_device_search.xml
index bf4544d..ab6f49e 100644
--- a/app/src/main/res/layout/activity_device_search.xml
+++ b/app/src/main/res/layout/activity_device_search.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.powerstation.DeviceSearchActivity">
<!--鎼滅储-->
@@ -62,9 +62,9 @@
android:layout_toEndOf="@+id/power_station_search_iv"
android:background="@null"
android:gravity="start|center_vertical"
- android:hint="Search the power station"
- android:textColor="@color/text_90000000"
- android:textColorHint="@color/text_40000000"
+ android:hint="@string/enter_the_device_sn_and_device_name"
+ android:textColor="@color/text_E6000000"
+ android:textColorHint="@color/text_66000000"
android:textSize="@dimen/text_14" />
<ImageView
@@ -86,12 +86,12 @@
android:layout_marginEnd="@dimen/dp_21"
android:gravity="center"
android:text="@string/search"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_16" />
</RelativeLayout>
-
+ <!--鍘嗗彶璁板綍-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/history_list_parent"
android:layout_width="match_parent"
@@ -109,7 +109,7 @@
android:layout_marginTop="@dimen/dp_23"
android:layout_marginEnd="@dimen/dp_21"
android:text="@string/history_search"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_16"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -136,7 +136,7 @@
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
-
+ <!--鎼滅储鏁版嵁-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/list_parent"
android:layout_width="match_parent"
@@ -165,4 +165,17 @@
</androidx.constraintlayout.widget.ConstraintLayout>
+
+ <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+ <include
+ android:id="@+id/device_null_data_ic"
+ layout="@layout/null_data_view"
+ android:layout_width="match_parent"
+ android:layout_height="224dp"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0