From 014d6eb06e74ac10932621f44ba40f93e3518c82 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 18 七月 2024 16:15:37 +0800
Subject: [PATCH] 2024年07月18日16:15:31
---
app/src/main/res/layout/item_device_details.xml | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml
index a58b8f8..8a7ce61 100644
--- a/app/src/main/res/layout/item_device_details.xml
+++ b/app/src/main/res/layout/item_device_details.xml
@@ -68,6 +68,7 @@
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:orientation="horizontal">
<LinearLayout
@@ -81,7 +82,8 @@
android:id="@+id/device_label_run_state_value_tv"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
- android:gravity="center"
+ android:gravity="start"
+ android:text="0"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_15" />
@@ -90,7 +92,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
- android:gravity="center"
+ android:gravity="start"
android:text="@string/device_run_state"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -136,7 +138,7 @@
android:id="@+id/device_label_day_value_tv"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
- android:gravity="center"
+ android:gravity="end"
android:text="0"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_15" />
@@ -146,7 +148,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
- android:gravity="center"
+ android:gravity="end"
android:text="@string/day_power_generation"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -165,30 +167,34 @@
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_16"
android:background="@color/text_E1E1E1" />
-
- <ImageView
- android:id="@+id/device_label_location_iv"
- android:layout_width="@dimen/dp_19"
- android:layout_height="@dimen/dp_19"
+ <!--鐢电珯鍦板潃-->
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_33"
android:layout_below="@+id/line"
- android:layout_marginStart="@dimen/dp_11"
- android:layout_marginTop="@dimen/dp_7"
- android:src="@drawable/location" />
+ android:layout_marginStart="11dp">
- <TextView
- android:id="@+id/device_label_location_tv"
- android:layout_width="290dp"
- android:layout_height="@dimen/dp_19"
- android:layout_below="@+id/line"
- android:layout_marginStart="@dimen/dp_3"
- android:layout_marginTop="@dimen/dp_8"
- android:layout_toEndOf="@+id/device_label_location_iv"
- android:ellipsize="end"
- android:gravity="center_vertical|start"
- android:singleLine="true"
- android:text="@string/power_station"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_12" />
+ <ImageView
+ android:id="@+id/device_label_location_iv"
+ android:layout_width="@dimen/dp_19"
+ android:layout_height="@dimen/dp_19"
+ android:layout_centerVertical="true"
+ android:src="@drawable/location" />
+
+ <TextView
+ android:id="@+id/device_label_location_tv"
+ android:layout_width="290dp"
+ android:layout_height="@dimen/dp_17"
+ android:layout_centerVertical="true"
+ android:layout_toEndOf="@+id/device_label_location_iv"
+ android:ellipsize="end"
+ android:gravity="center_vertical|start"
+ android:singleLine="true"
+ android:text="@string/power_station"
+ android:textColor="@color/text_66000000"
+ android:textSize="@dimen/text_12" />
+ </RelativeLayout>
+
<TextView
android:id="@+id/device_label_state_tv"
--
Gitblit v1.8.0