From 589d1dff2ce8554ee53b818a98db000df7fdf4e7 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 七月 2025 10:19:17 +0800
Subject: [PATCH] 2025年07月22日10:19:08
---
app/src/main/res/layout/item_device_details.xml | 118 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 60 insertions(+), 58 deletions(-)
diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml
index eceb6bc..152339d 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,20 +21,20 @@
<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"
+ android:id="@+id/home_image_iv"
android:layout_width="44dp"
android:layout_height="42dp"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_13"
android:background="@drawable/device_image"
- android:scaleType="centerCrop" />
+ android:scaleType="matrix" />
<LinearLayout
@@ -42,8 +42,8 @@
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_toEndOf="@+id/device_details_image_iv"
+ android:layout_marginTop="14.5dp"
+ android:layout_toEndOf="@+id/home_image_iv"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -54,7 +54,7 @@
android:background="@drawable/device_state_ff38c494" />
<TextView
- android:id="@+id/device_details_name_tv"
+ android:id="@+id/home_name_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
@@ -63,7 +63,7 @@
android:paddingEnd="@dimen/dp_20"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
@@ -74,10 +74,10 @@
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"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<TextView
@@ -88,24 +88,23 @@
android:layout_marginStart="3dp"
android:layout_marginTop="1.5dp"
android:layout_toEndOf="@+id/device_details_sn_tv"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<LinearLayout
android:id="@+id/screening_condition_ll"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_36"
- android:layout_below="@+id/device_details_image_iv"
+ android:layout_height="@dimen/dp_37"
+ android:layout_below="@+id/home_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
@@ -114,32 +113,38 @@
android:layout_height="@dimen/dp_18"
android:gravity="start"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_15" />
<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"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
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_power_ll"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1"
android:orientation="vertical">
@@ -152,20 +157,18 @@
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:textColor="@color/text_FFACACAC"
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"
android:gravity="bottom"
android:text="kW"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
</LinearLayout>
@@ -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:textColor="@color/text_FF5B5B5B"
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,24 +209,21 @@
<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:textColor="@color/text_FFACACAC"
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:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
</LinearLayout>
@@ -229,11 +233,9 @@
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:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -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">
@@ -274,7 +276,7 @@
android:gravity="center_vertical|start"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</RelativeLayout>
--
Gitblit v1.8.0