From cc3b8aecab8fccf9a985d74a5223be44cc2b5ace Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 30 十月 2024 16:20:39 +0800
Subject: [PATCH] 2024年10月30日16:20:36
---
app/src/main/res/layout/item_device_details.xml | 165 ++++++++++++++++++++++++++++--------------------------
1 files changed, 86 insertions(+), 79 deletions(-)
diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml
index dd13f17..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,90 +68,88 @@
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
- android:id="@+id/power_ll"
+ android:id="@+id/device_label_run_state_ll"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<TextView
- android:id="@+id/power_value_tv"
+ android:id="@+id/device_label_run_state_value_tv"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:text="99"
+ android:layout_height="@dimen/dp_18"
+ 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/power_type_tv"
+ android:id="@+id/device_label_run_state_type_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_15"
+ android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
- android:gravity="center"
- android:text="@string/generated_power"
+ android:gravity="start"
+ android:text="@string/device_run_state"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
</LinearLayout>
<LinearLayout
- android:id="@+id/day_ll"
+ android:id="@+id/device_label_power_ll"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<TextView
- android:id="@+id/day_value_tv"
+ android:id="@+id/device_label_power_value_tv"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
android:gravity="center"
- android:text="99"
+ 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/day_type_tv"
+ android:id="@+id/device_label_power_type_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_15"
+ android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center"
+ android:text="@string/active_power"
+ android:textColor="@color/text_66000000"
+ android:textSize="@dimen/text_12" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/device_label_day_ll"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/device_label_day_value_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_18"
+ android:gravity="end"
+ android:text="0"
+ android:textColor="@color/text_E6000000"
+ 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="end"
android:text="@string/day_power_generation"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_12" />
-
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/month_ll"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/month_value_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_18"
- android:gravity="center"
- android:text="99"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_15"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/month_type_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_15"
- android:layout_marginTop="3dp"
- android:gravity="center"
- android:text="@string/month_power_generation"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -164,33 +167,37 @@
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_16"
android:background="@color/text_E1E1E1" />
-
- <ImageView
- android:id="@+id/plant_details_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">
+
+ <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/plant_details_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/plant_details_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" />
-
- <TextView
- android:id="@+id/fragment_house_list_line_state_tv"
+ android:id="@+id/device_label_state_tv"
android:layout_width="69dp"
android:layout_height="@dimen/dp_33"
android:layout_alignParentTop="true"
@@ -207,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