From f21dcea3e5f6fc7bfc51b3ddc6ff9764fb93bfdb Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 11 十二月 2024 11:25:37 +0800
Subject: [PATCH] 2024年12月11日11:25:28
---
app/src/main/res/layout/item_device_details.xml | 90 ++++++++++++++++++++++++++-------------------
1 files changed, 52 insertions(+), 38 deletions(-)
diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml
index 2913a84..d65f8e0 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,9 +21,9 @@
<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">
@@ -34,39 +34,47 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_13"
android:background="@drawable/device_image"
- android:scaleType="centerCrop" />
+ android:scaleType="matrix" />
- <TextView
- android:id="@+id/device_state_tv"
- android:layout_width="7dp"
- android:layout_height="7dp"
- android:layout_marginStart="@dimen/dp_11"
- android:layout_marginTop="@dimen/dp_21"
- android:layout_toEndOf="@+id/device_details_image_iv"
- android:background="@drawable/device_state_ff38c494" />
- <TextView
- android:id="@+id/device_details_name_tv"
+ <LinearLayout
+ android:id="@+id/home_name_ll"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_19"
- android:layout_marginStart="@dimen/dp_6"
- android:layout_marginTop="@dimen/dp_15"
- android:layout_marginEnd="@dimen/dp_6"
- android:layout_toEndOf="@+id/device_state_tv"
- android:ellipsize="end"
- android:gravity="center_vertical|start"
- android:singleLine="true"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14" />
+ android:layout_height="@dimen/dp_20"
+ android:layout_marginStart="@dimen/dp_11"
+ android:layout_marginTop="14.5dp"
+ android:layout_toEndOf="@+id/device_details_image_iv"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/device_state_tv"
+ android:layout_width="7dp"
+ android:layout_height="7dp"
+ android:background="@drawable/device_state_ff38c494" />
+
+ <TextView
+ android:id="@+id/device_details_name_tv"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:ellipsize="end"
+ android:gravity="center_vertical|start"
+ android:paddingStart="@dimen/dp_6"
+ android:paddingEnd="@dimen/dp_20"
+ android:singleLine="true"
+ android:text="@string/power_station"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
+ </LinearLayout>
<TextView
android:id="@+id/device_details_sn_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/device_details_name_tv"
- android:layout_alignStart="@+id/device_state_tv"
- android:layout_marginTop="@dimen/dp_3"
+ android:layout_below="@+id/home_name_ll"
+ android:layout_alignStart="@+id/home_name_ll"
+ android:layout_marginTop="2.5dp"
android:gravity="center_vertical"
android:text="SN:"
android:textColor="@color/text_66FFFFFF"
@@ -76,7 +84,7 @@
android:id="@+id/device_details_value_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/device_details_name_tv"
+ android:layout_below="@+id/home_name_ll"
android:layout_marginStart="3dp"
android:layout_marginTop="1.5dp"
android:layout_toEndOf="@+id/device_details_sn_tv"
@@ -86,10 +94,10 @@
<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_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal">
@@ -137,14 +145,15 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_18"
- android:gravity="center">
+ android:layout_height="@dimen/dp_18">
<TextView
android:id="@+id/device_label_power_value_tv"
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" />
@@ -165,7 +174,9 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
- android:gravity="center"
+ 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" />
@@ -191,10 +202,11 @@
<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:paddingStart="@dimen/dp_26"
+ android:paddingEnd="@dimen/dp_0"
android:text="0"
android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
@@ -216,7 +228,9 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
- android:gravity="end"
+ 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" />
@@ -238,7 +252,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