From 9695405b73d4de40135a0ec05e4ae9d18ae4d344 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 09:48:51 +0800
Subject: [PATCH] 2024年06月25日09:48:48
---
app/src/main/res/layout/item_plant_details.xml | 56 ++++++++++++++++++++++++++------------------------------
1 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 9c91e74..1b7cf5e 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -3,7 +3,7 @@
<com.hdl.photovoltaic.widget.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/item_parent_swipeLayout"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="@dimen/dp_164">
<include
android:id="@+id/swipe_layout_il"
@@ -15,16 +15,15 @@
android:layout_height="164dp">
<RelativeLayout
- android:id="@+id/plant_details_info_rl"
+ android:id="@+id/device_details_info_rl"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="@dimen/dp_148"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/ffffff_13">
<ImageView
- android:id="@+id/plant_details_image_iv"
+ android:id="@+id/device_details_image_iv"
android:layout_width="44dp"
android:layout_height="42dp"
android:layout_marginStart="@dimen/dp_16"
@@ -33,37 +32,37 @@
android:scaleType="centerCrop" />
<TextView
- android:id="@+id/plant_details_name_tv"
+ android:id="@+id/device_details_name_tv"
android:layout_width="170dp"
android:layout_height="@dimen/dp_19"
android:layout_marginStart="@dimen/dp_11"
android:layout_marginTop="@dimen/dp_15"
- android:layout_toEndOf="@+id/plant_details_image_iv"
+ android:layout_toEndOf="@+id/device_details_image_iv"
android:ellipsize="end"
android:gravity="center_vertical|start"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_16"
android:textStyle="bold" />
<TextView
- android:id="@+id/plant_details_capacity_tv"
+ android:id="@+id/device_details_sn_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_17"
- android:layout_below="@+id/plant_details_name_tv"
- android:layout_alignStart="@+id/plant_details_name_tv"
+ android:layout_below="@+id/device_details_name_tv"
+ android:layout_alignStart="@+id/device_details_name_tv"
android:layout_marginTop="@dimen/dp_3"
android:gravity="center_vertical"
- android:text="@string/installed_capacity"
- android:textColor="@color/text_40000000"
+ android:text="@string/string_capacity"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
<LinearLayout
android:id="@+id/screening_condition_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_36"
- android:layout_below="@+id/plant_details_image_iv"
+ android:layout_below="@+id/device_details_image_iv"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_17"
android:orientation="horizontal">
@@ -80,10 +79,9 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_15"
- android:textStyle="bold" />
+ android:text="0"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_15" />
<TextView
android:id="@+id/power_type_tv"
@@ -92,7 +90,7 @@
android:layout_marginTop="3dp"
android:gravity="center"
android:text="@string/generated_power"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -109,10 +107,9 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_15"
- android:textStyle="bold" />
+ android:text="0"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_15" />
<TextView
android:id="@+id/day_type_tv"
@@ -121,7 +118,7 @@
android:layout_marginTop="3dp"
android:gravity="center"
android:text="@string/day_power_generation"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -138,10 +135,9 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_15"
- android:textStyle="bold" />
+ android:text="0"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_15" />
<TextView
android:id="@+id/month_type_tv"
@@ -150,7 +146,7 @@
android:layout_marginTop="3dp"
android:gravity="center"
android:text="@string/month_power_generation"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -189,7 +185,7 @@
android:gravity="center_vertical|start"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
<TextView
--
Gitblit v1.8.0