From 5349ac72465131b610b2c635b3d2e6d59a7969e1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 13 十二月 2024 16:00:16 +0800
Subject: [PATCH] 2024年12月13日16:00:14
---
app/src/main/res/layout/item_plant_details.xml | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 274be47..837b553 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="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"
@@ -105,14 +105,13 @@
android:layout_below="@+id/device_details_image_iv"
android:layout_alignStart="@+id/device_details_image_iv"
android:layout_marginTop="@dimen/dp_16"
- android:layout_marginEnd="@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
@@ -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,8 +180,6 @@
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" />
@@ -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
@@ -229,8 +237,6 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical|start"
- android:paddingStart="@dimen/dp_26"
- android:paddingEnd="@dimen/dp_0"
android:text="0"
android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
@@ -253,8 +259,6 @@
android:layout_height="@dimen/dp_15"
android:layout_marginTop="3dp"
android:gravity="center_vertical|start"
- android:paddingStart="@dimen/dp_26"
- android:paddingEnd="@dimen/dp_0"
android:text="@string/month_power_generation"
android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
--
Gitblit v1.8.0