From beadecb2bbc75b8f153d366df11246719cf97b2f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 23 二月 2024 14:37:25 +0800
Subject: [PATCH] Merge branch 'dev-hxb' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev-hxb
---
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