From 4f12f1e3543fce41e71ae9e21a782f8d9cb41947 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 10:45:11 +0800
Subject: [PATCH] Merge branch '1.3.1' into dev
---
app/src/main/res/layout/item_plant_details.xml | 92 ++++++++++++++++++++++++++-------------------
1 files changed, 53 insertions(+), 39 deletions(-)
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 2c0de7f..89b01b4 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -19,6 +19,7 @@
android:layout_width="match_parent"
android:layout_height="150.5dp"
android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/bj_ff1c1c1e">
@@ -35,9 +36,10 @@
android:id="@+id/home_name_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
- android:layout_marginStart="@dimen/dp_11"
- android:layout_marginTop="14.5dp"
- android:layout_toEndOf="@+id/device_details_image_iv"
+ android:layout_marginStart="@dimen/dp_5"
+ 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">
@@ -64,49 +66,61 @@
<TextView
android:id="@+id/device_details_sn_tv"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/home_name_ll"
- android:layout_alignStart="@+id/home_name_ll"
- android:layout_marginTop="2.5dp"
- android:gravity="center_vertical"
- android:text="@string/string_capacity"
- android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_12" />
+ android:layout_height="@dimen/dp_18"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentEnd="true"
+ android:layout_marginTop="@dimen/dp_15"
+ android:orientation="horizontal">
- <TextView
- android:id="@+id/device_details_value_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/home_name_ll"
- android:layout_marginStart="3dp"
- android:layout_marginTop="1.5dp"
- android:layout_toEndOf="@+id/device_details_sn_tv"
- android:text="0.00"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14" />
+ <ImageView
+ android:id="@+id/home_debug_state_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18" />
- <TextView
- android:id="@+id/kwp_unit"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBottom="@+id/device_details_value_tv"
- android:layout_marginStart="4dp"
- android:layout_marginBottom="2dp"
- android:layout_toEndOf="@+id/device_details_value_tv"
- android:text="kWp"
- android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_10" />
+ <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"
+ android:layout_height="@dimen/dp_19"
+ android:layout_below="@+id/home_name_ll"
+ android:layout_alignStart="@+id/home_name_ll">
+
+ <ImageView
+ android:layout_width="@dimen/dp_19"
+ android:layout_height="@dimen/dp_19"
+ android:src="@drawable/location" />
+
+ <TextView
+ android:id="@+id/home_location_tv"
+ 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"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
<LinearLayout
- android:id="@+id/screening_condition_ll"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_37"
- android:layout_below="@+id/device_details_image_iv"
- android:layout_alignStart="@+id/device_details_image_iv"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/home_image_iv"
+ android:layout_alignStart="@+id/home_image_iv"
android:layout_marginTop="@dimen/dp_16"
- android:layout_marginEnd="@dimen/dp_32"
- android:orientation="horizontal">
+ android:layout_marginEnd="@dimen/dp_16"
+ android:orientation="vertical">
<LinearLayout
android:id="@+id/power_ll"
--
Gitblit v1.8.0