From bde413d383e3db95d2a255f6334fbbac7b9f373a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:13:14 +0800
Subject: [PATCH] Merge branch 'wjc_new' into feature/hxb
---
app/src/main/res/layout/item_device_details.xml | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml
index 7ee0a76..021ad75 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"
@@ -116,7 +121,7 @@
android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center"
- android:text="@string/generated_power"
+ android:text="@string/active_power"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -206,4 +211,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