From 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:12:37 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/res/layout/loading_alert.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/app/src/main/res/layout/loading_alert.xml b/app/src/main/res/layout/loading_alert.xml
index d1dec40..08238da 100644
--- a/app/src/main/res/layout/loading_alert.xml
+++ b/app/src/main/res/layout/loading_alert.xml
@@ -29,7 +29,7 @@
android:layout_marginRight="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:maxLines="1"
- android:text="@string/device_鍔犺浇涓�"
+ android:text="@string/device_loading"
android:textColor="@color/text_FFFFFFFF"
android:textSize="@dimen/text_12"
app:layout_constraintEnd_toEndOf="@+id/load_pb"
--
Gitblit v1.8.0