From 579da4e0056080c878ed4d0a479a631db9610ee1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 25 三月 2025 21:35:32 +0800
Subject: [PATCH] 2025年03月25日21:35:30
---
app/src/main/res/layout/item_plant_details.xml | 89 +++++++++++++++++++++++---------------------
1 files changed, 46 insertions(+), 43 deletions(-)
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 56ddb5c..8c4ef06 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="@dimen/dp_164">
+ android:layout_height="wrap_content">
<include
android:id="@+id/swipe_layout_il"
@@ -12,15 +12,15 @@
<RelativeLayout
android:id="@+id/item_parent_rl"
android:layout_width="match_parent"
- android:layout_height="164dp">
+ android:layout_height="160.5dp">
<RelativeLayout
android:id="@+id/device_details_info_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_148"
+ 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"
@@ -36,7 +36,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_11"
- android:layout_marginTop="@dimen/dp_15"
+ android:layout_marginTop="14.5dp"
android:layout_toEndOf="@+id/device_details_image_iv"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -67,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/home_name_ll"
android:layout_alignStart="@+id/home_name_ll"
- android:layout_marginTop="@dimen/dp_3"
+ android:layout_marginTop="2.5dp"
android:gravity="center_vertical"
android:text="@string/string_capacity"
android:textColor="@color/text_66FFFFFF"
@@ -104,15 +104,14 @@
android:layout_height="@dimen/dp_37"
android:layout_below="@+id/device_details_image_iv"
android:layout_alignStart="@+id/device_details_image_iv"
- android:layout_marginTop="@dimen/dp_17"
- android:layout_marginEnd="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_32"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/power_ll"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
@@ -129,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"
@@ -151,17 +150,24 @@
</LinearLayout>
- <View
- android:layout_width="0.5dp"
- android:layout_height="17.5dp"
- android:layout_gravity="center"
- android:background="@color/text_1AFFFFFF" />
+ <LinearLayout
+ android:layout_width="@dimen/dp_0"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center">
+
+ <View
+ android:layout_width="0.5dp"
+ android:layout_height="17.5dp"
+ android:layout_gravity="center"
+ android:background="@color/text_1AFFFFFF" />
+ </LinearLayout>
+
<LinearLayout
android:id="@+id/day_ll"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
@@ -174,20 +180,18 @@
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:gravity="start|center_horizontal"
- android:paddingStart="@dimen/dp_26"
- android:paddingEnd="@dimen/dp_0"
android:text="0"
android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
<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>
@@ -199,25 +203,29 @@
android:layout_height="@dimen/dp_15"
android:layout_marginTop="3dp"
android:gravity="start|center_horizontal"
- android:paddingStart="@dimen/dp_26"
- android:paddingEnd="@dimen/dp_0"
android:text="@string/day_power_generation"
android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
</LinearLayout>
- <View
- android:layout_width="0.5dp"
- android:layout_height="17.5dp"
- android:layout_gravity="center"
- android:background="@color/text_1AFFFFFF" />
+ <LinearLayout
+ android:layout_width="@dimen/dp_0"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center">
+
+ <View
+ android:layout_width="0.5dp"
+ android:layout_height="17.5dp"
+ android:layout_gravity="center"
+ android:background="@color/text_1AFFFFFF" />
+ </LinearLayout>
<LinearLayout
android:id="@+id/month_ll"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
@@ -226,23 +234,20 @@
<TextView
android:id="@+id/month_value_tv"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center_vertical|end"
+ android:gravity="center_vertical|start"
android:text="0"
android:textColor="@color/text_E6FFFFFF"
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:paddingStart="@dimen/dp_0"
- android:paddingEnd="@dimen/dp_15"
- android:text="kW"
+ android:text="kWh"
android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_10" />
</LinearLayout>
@@ -253,10 +258,8 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_15"
android:layout_marginTop="3dp"
- android:gravity="center_vertical|end"
- android:paddingStart="@dimen/dp_0"
- android:paddingEnd="@dimen/dp_15"
- android:text="@string/month_power_generation"
+ android:gravity="center_vertical|start"
+ android:text="@string/battery_capacity_indicator"
android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
@@ -277,7 +280,7 @@
<!--鐢电珯鍦板潃-->
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_33"
+ android:layout_height="@dimen/dp_35"
android:layout_below="@+id/line"
android:layout_marginStart="11dp">
--
Gitblit v1.8.0