From a1c880c476327032fe174af8c80d6f78a590dae9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 07 二月 2025 16:35:22 +0800
Subject: [PATCH] Merge branch '1.5.1' into dev
---
app/src/main/res/layout/item_plant_details.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 75ea580..65c4391 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -20,7 +20,7 @@
android:layout_height="150.5dp"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/bj_ff333738">
+ android:background="@drawable/bj_ff1c1c1e">
<ImageView
android:id="@+id/device_details_image_iv"
@@ -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>
--
Gitblit v1.8.0