From 2859902a782139b2dee7fa97dee66da6db3bd5d5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 11 十二月 2024 13:11:53 +0800
Subject: [PATCH] 2024年12月11日13:11:51
---
app/src/main/res/layout/item_plant_details.xml | 51 ++++++++++++++-----------
app/src/main/res/layout/item_device_details.xml | 51 +++++++++++++------------
2 files changed, 55 insertions(+), 47 deletions(-)
diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml
index d65f8e0..0aa508e 100644
--- a/app/src/main/res/layout/item_device_details.xml
+++ b/app/src/main/res/layout/item_device_details.xml
@@ -103,9 +103,8 @@
<LinearLayout
android:id="@+id/device_label_run_state_ll"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
android:orientation="vertical">
<TextView
@@ -129,17 +128,23 @@
</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/device_label_power_ll"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
android:orientation="vertical">
@@ -152,8 +157,6 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="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" />
@@ -175,25 +178,29 @@
android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="start|center_horizontal"
- android:paddingStart="@dimen/dp_26"
- android:paddingEnd="@dimen/dp_0"
android:text="@string/active_power"
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/device_label_day_ll"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
@@ -205,8 +212,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" />
@@ -229,8 +234,6 @@
android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="start"
- 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" />
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 274be47..36735a9 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -110,9 +110,8 @@
<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,23 +203,28 @@
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">
@@ -229,8 +238,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 +260,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