From 9c67fc611daf6f9cb7c05f72d598543bff2d26f1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 25 十月 2024 11:23:17 +0800
Subject: [PATCH] s2024年10月25日11:23:14
---
app/src/main/res/layout/item_device_details.xml | 88 ++++++++++++++++++++++++--------------------
1 files changed, 48 insertions(+), 40 deletions(-)
diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml
index 2ab825c..8a7ce61 100644
--- a/app/src/main/res/layout/item_device_details.xml
+++ b/app/src/main/res/layout/item_device_details.xml
@@ -1,17 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
-<com.hdl.photovoltaic.widget.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/item_parent_swipeLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
- <include
- android:id="@+id/swipe_layout_il"
- layout="@layout/swipe_right_layout" />
+ <!--鍏堥殣钘忓彸婊戝姛鑳� SwipeLayout-->
+ <!-- <include
+ android:id="@+id/swipe_layout_il"
+ layout="@layout/swipe_right_layout"
+ />-->
<RelativeLayout
android:id="@+id/item_parent_rl"
- android:layout_width="match_parent"
- android:layout_height="164dp">
+ android:layout_width="0dp"
+ android:layout_height="164dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
<RelativeLayout
android:id="@+id/device_details_info_rl"
@@ -63,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
@@ -76,17 +82,17 @@
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"
- android:textStyle="bold" />
+ 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_marginTop="3dp"
- android:gravity="center"
+ android:gravity="start"
android:text="@string/device_run_state"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -107,8 +113,7 @@
android:gravity="center"
android:text="0"
android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_15"
- android:textStyle="bold" />
+ android:textSize="@dimen/text_15" />
<TextView
android:id="@+id/device_label_power_type_tv"
@@ -133,18 +138,17 @@
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"
- android:textStyle="bold" />
+ android:textSize="@dimen/text_15" />
<TextView
android:id="@+id/device_label_day_type_tv"
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" />
@@ -163,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"
@@ -206,4 +214,4 @@
</RelativeLayout>
-</com.hdl.photovoltaic.widget.SwipeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0