From 0287b5d20f7d57f5352248175733b99d5a99959b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 28 八月 2025 17:42:27 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev
---
app/src/main/res/layout/item_plant_details.xml | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index a83ff48..4487366 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -19,9 +19,10 @@
android:layout_width="match_parent"
android:layout_height="194.5dp"
android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/bj_ff1c1c1e">
-
+ <!--鐢电珯鍥剧墖-->
<ImageView
android:id="@+id/home_image_iv"
android:layout_width="44dp"
@@ -29,14 +30,14 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_13"
android:scaleType="centerCrop" />
-
-
+ <!--鐢电珯鍚嶇О浠ュ強鍦板潃-->
<LinearLayout
android:id="@+id/home_name_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_5"
- android:layout_marginTop="14.5dp"
+ android:layout_marginTop="13.5dp"
+ android:layout_toStartOf="@+id/home_debug_state_ll"
android:layout_toEndOf="@+id/home_image_iv"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -47,7 +48,7 @@
android:gravity="center">
<TextView
- android:id="@+id/device_state_tv"
+ android:id="@+id/home_state_tv"
android:layout_width="7dp"
android:layout_height="7dp"
android:background="@drawable/device_state_ff38c494" />
@@ -59,13 +60,37 @@
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center_vertical|start"
- android:paddingEnd="@dimen/dp_20"
+ android:paddingStart="0dp"
+ android:paddingEnd="@dimen/dp_5"
android:singleLine="true"
android:text="@string/power_station"
android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
+ <!--鐢电珯鐘舵��-->
+ <LinearLayout
+ android:id="@+id/home_debug_state_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_18"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentEnd="true"
+ android:layout_marginTop="@dimen/dp_15"
+ android:orientation="horizontal">
+ <ImageView
+ android:id="@+id/home_debug_state_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18" />
+
+ <TextView
+ android:id="@+id/home_debug_state_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingStart="0dp"
+ android:paddingEnd="@dimen/dp_16"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
<!--鐢电珯鍦板潃-->
<LinearLayout
android:layout_width="match_parent"
@@ -80,10 +105,12 @@
<TextView
android:id="@+id/home_location_tv"
- android:layout_width="280dp"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center_vertical|start"
+ android:paddingStart="0dp"
+ android:paddingEnd="@dimen/dp_5"
android:singleLine="true"
android:text="@string/power_station"
android:textColor="@color/text_FF5B5B5B"
@@ -102,7 +129,7 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="37.5dp"
+ android:layout_height="39dp"
android:orientation="horizontal">
<LinearLayout
@@ -149,7 +176,7 @@
<TextView
android:id="@+id/pv_type_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_14"
+ android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center_vertical|start"
android:text="@string/pv"
@@ -203,7 +230,7 @@
<TextView
android:id="@+id/generation_today_type_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_14"
+ android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center_vertical|start"
android:text="@string/day_generation"
@@ -227,7 +254,7 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="37.5dp"
+ android:layout_height="39dp"
android:orientation="horizontal">
<LinearLayout
@@ -274,7 +301,7 @@
<TextView
android:id="@+id/output_type_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_14"
+ android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center_vertical|start"
android:text="@string/output"
@@ -328,7 +355,7 @@
<TextView
android:id="@+id/battery_storage_type_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_14"
+ android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center_vertical|start"
android:text="@string/battery_capacity_indicator"
@@ -348,5 +375,4 @@
</RelativeLayout>
-</com.hdl.photovoltaic.widget.SwipeLayout>
-
+</com.hdl.photovoltaic.widget.SwipeLayout>
\ No newline at end of file
--
Gitblit v1.8.0