From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/res/layout/item_plant_details.xml | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 837b553..2c0de7f 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -128,7 +128,7 @@
android:textSize="@dimen/text_14" />
<TextView
- android:id="@+id/power_kwp_unit"
+ android:id="@+id/power_kw_unit"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="3dp"
@@ -186,12 +186,12 @@
<TextView
- android:id="@+id/day_kwp_unit"
+ android:id="@+id/day_kwh_unit"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="3dp"
android:gravity="bottom"
- android:text="kW"
+ android:text="kWh"
android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_10" />
</LinearLayout>
@@ -242,12 +242,12 @@
android:textSize="@dimen/text_14" />
<TextView
- android:id="@+id/month_kwp_unit"
+ android:id="@+id/month_kwh_unit"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="3dp"
android:gravity="bottom"
- android:text="kW"
+ android:text="kWh"
android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_10" />
</LinearLayout>
@@ -259,7 +259,7 @@
android:layout_height="@dimen/dp_15"
android:layout_marginTop="3dp"
android:gravity="center_vertical|start"
- android:text="@string/month_power_generation"
+ android:text="@string/battery_capacity_indicator"
android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
@@ -311,5 +311,4 @@
</RelativeLayout>
-</com.hdl.photovoltaic.widget.SwipeLayout>
-
+</com.hdl.photovoltaic.widget.SwipeLayout>
\ No newline at end of file
--
Gitblit v1.8.0