From 5e2e1fc7fc23d5fa035608bc415e9eac73ce2e37 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 27 十一月 2024 13:11:20 +0800
Subject: [PATCH] 2024年11月27日13:11:17
---
app/src/main/res/layout/item_plant_details.xml | 65 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index a3be9b4..fcdc37b 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="@dimen/dp_148"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/ffffff_13">
+ android:background="@drawable/bj_ff333738">
<ImageView
android:id="@+id/device_details_image_iv"
@@ -32,45 +32,66 @@
android:scaleType="centerCrop" />
<TextView
- android:id="@+id/device_details_name_tv"
- android:layout_width="0dp"
- android:layout_height="@dimen/dp_19"
+ android:id="@+id/device_state_tv"
+ android:layout_width="7dp"
+ android:layout_height="7dp"
android:layout_marginStart="@dimen/dp_11"
+ android:layout_marginTop="@dimen/dp_21"
+ android:layout_toEndOf="@+id/device_details_image_iv"
+ android:background="@drawable/device_state_ff38c494" />
+
+ <TextView
+ android:id="@+id/device_details_name_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20"
+ android:layout_marginStart="@dimen/dp_6"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginEnd="10dp"
- android:layout_toStartOf="@+id/fragment_house_list_line_state_tv"
- android:layout_toEndOf="@+id/device_details_image_iv"
+ android:layout_toEndOf="@+id/device_state_tv"
android:ellipsize="end"
android:gravity="center_vertical|start"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_16"
- android:textStyle="bold" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14"
+ />
<TextView
android:id="@+id/device_details_sn_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="wrap_content"
android:layout_below="@+id/device_details_name_tv"
- android:layout_alignStart="@+id/device_details_name_tv"
+ android:layout_alignStart="@+id/device_state_tv"
android:layout_marginTop="@dimen/dp_3"
android:gravity="center_vertical"
android:text="@string/string_capacity"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
<TextView
- android:id="@+id/fragment_house_list_line_state_tv"
- android:layout_width="69dp"
- android:layout_height="@dimen/dp_33"
- android:layout_alignParentTop="true"
- android:layout_alignParentEnd="true"
- android:background="@drawable/state_ffb300"
- android:gravity="center"
- android:text="@string/my_power_station_connecting"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_12" />
+ android:id="@+id/device_details_value_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/device_details_name_tv"
+ android:layout_marginStart="3dp"
+ android:layout_toEndOf="@+id/device_details_sn_tv"
+ android:layout_marginTop="1.5dp"
+ android:text="0.00"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
+
+ <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" />
+
<LinearLayout
android:id="@+id/screening_condition_ll"
--
Gitblit v1.8.0