From 0e2325fbddacb5e776a1f1392623e3175f9d03ff Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 05 十二月 2024 17:13:53 +0800
Subject: [PATCH] 2024年12月05日17:13:52
---
app/src/main/res/layout/item_device_details.xml | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 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..e6b701e 100644
--- a/app/src/main/res/layout/item_device_details.xml
+++ b/app/src/main/res/layout/item_device_details.xml
@@ -36,36 +36,44 @@
android:background="@drawable/device_image"
android:scaleType="centerCrop" />
- <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_height="@dimen/dp_20"
+ android:layout_marginStart="@dimen/dp_11"
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_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_below="@+id/home_name_ll"
+ android:layout_alignStart="@+id/home_name_ll"
android:layout_marginTop="@dimen/dp_3"
android:gravity="center_vertical"
android:text="SN:"
@@ -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"
--
Gitblit v1.8.0