From 2e91f8abdcb87feda9e237895d4460a19fd7aed8 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 10 一月 2025 15:41:23 +0800
Subject: [PATCH] 2025年01月10日15:40:19
---
app/src/main/res/layout/item_device_details.xml | 84 +++++++++++++++++++++--------------------
1 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml
index da6acee..b5da7ad 100644
--- a/app/src/main/res/layout/item_device_details.xml
+++ b/app/src/main/res/layout/item_device_details.xml
@@ -13,7 +13,7 @@
<RelativeLayout
android:id="@+id/item_parent_rl"
android:layout_width="0dp"
- android:layout_height="164dp"
+ android:layout_height="160.5dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -21,11 +21,11 @@
<RelativeLayout
android:id="@+id/device_details_info_rl"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="150.5dp"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/bj_ff333738">
+ android:background="@drawable/bj_ff1c1c1e">
<ImageView
android:id="@+id/device_details_image_iv"
@@ -42,7 +42,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">
@@ -74,7 +74,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="SN:"
android:textColor="@color/text_66FFFFFF"
@@ -94,18 +94,17 @@
<LinearLayout
android:id="@+id/screening_condition_ll"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_36"
+ android:layout_height="@dimen/dp_37"
android:layout_below="@+id/device_details_image_iv"
android:layout_marginStart="@dimen/dp_16"
- 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/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
@@ -120,7 +119,7 @@
<TextView
android:id="@+id/device_label_run_state_type_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:gravity="start"
android:text="@string/device_run_state"
@@ -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,14 +157,12 @@
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" />
<TextView
- android:id="@+id/day_kwp_unit"
+ android:id="@+id/device_label_power_unit"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="3dp"
@@ -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
@@ -202,22 +209,19 @@
<TextView
android:id="@+id/device_label_day_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/device_label_day_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:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_10" />
@@ -229,9 +233,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
- android:gravity="end"
- android:paddingStart="@dimen/dp_0"
- android:paddingEnd="@dimen/dp_15"
+ android:gravity="start"
android:text="@string/day_power_generation"
android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
@@ -253,7 +255,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