From e5068e0a3b20b579bd62a142f9af8f5ecaa54472 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 20:20:37 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/res/layout/item_device_details.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml
index 7ee0a76..2ab825c 100644
--- a/app/src/main/res/layout/item_device_details.xml
+++ b/app/src/main/res/layout/item_device_details.xml
@@ -116,7 +116,7 @@
android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center"
- android:text="@string/generated_power"
+ android:text="@string/active_power"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
--
Gitblit v1.8.0