From b73aeebc90267339a4851a68a6ebd396b7c66aea Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 21 五月 2024 17:08:01 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/layout/activity_device_search.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/app/src/main/res/layout/activity_device_search.xml b/app/src/main/res/layout/activity_device_search.xml
index 059a110..d240c1f 100644
--- a/app/src/main/res/layout/activity_device_search.xml
+++ b/app/src/main/res/layout/activity_device_search.xml
@@ -62,7 +62,7 @@
android:layout_toEndOf="@+id/power_station_search_iv"
android:background="@null"
android:gravity="start|center_vertical"
- android:hint="Search the power station"
+ 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" />
--
Gitblit v1.8.0