From 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:56:35 +0800
Subject: [PATCH] Merge branch 'master' into 1.2.1_google
---
app/src/main/res/layout/item_house_line_c.xml | 132 ++++++++++++++++++++++++-------------------
1 files changed, 74 insertions(+), 58 deletions(-)
diff --git a/app/src/main/res/layout/item_house_line_c.xml b/app/src/main/res/layout/item_house_line_c.xml
index db8d0c4..b3c1bc5 100644
--- a/app/src/main/res/layout/item_house_line_c.xml
+++ b/app/src/main/res/layout/item_house_line_c.xml
@@ -1,71 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.hdl.photovoltaic.widget.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/item_parent_cl"
+ android:id="@+id/item_parent_sl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_52"
- android:background="@color/text_FF1C1C1E">
-
- <TextView
- android:id="@+id/house_name_tv"
- android:layout_width="0dp"
- android:layout_height="@dimen/dp_23"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginEnd="@dimen/dp_16"
- android:ellipsize="end"
- android:singleLine="true"
- android:text="@string/power_station"
- android:textColor="@color/text_FFACACAC"
- android:textSize="@dimen/text_14"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/house_Image_ll"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ android:layout_height="@dimen/dp_62">
<LinearLayout
- android:id="@+id/house_Image_ll"
- android:layout_width="wrap_content"
+ android:layout_width="@dimen/dp_68"
android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ android:background="@color/text_FF000000">
- <ImageView
- android:id="@+id/house_del_iv"
- android:layout_width="@dimen/dp_40"
- android:layout_height="@dimen/dp_40"
- android:layout_marginEnd="@dimen/dp_16"
- android:src="@drawable/del_home"
- android:visibility="gone" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_52"
+ android:layout_marginTop="@dimen/dp_10"
+ android:gravity="center"
+ >
- <ImageView
- android:id="@+id/house_move_iv"
- android:layout_width="@dimen/dp_26"
- android:layout_height="@dimen/dp_26"
- android:layout_marginEnd="@dimen/dp_21"
- android:src="@drawable/move_c_house"
- android:visibility="gone" />
-
- <ImageView
- android:id="@+id/house_select_iv"
- android:layout_width="@dimen/dp_39"
- android:layout_height="@dimen/dp_39"
- android:layout_marginEnd="@dimen/dp_16"
- android:visibility="gone" />
+ <ImageView
+ android:id="@+id/del_c_home_iv"
+ android:layout_width="@dimen/dp_36"
+ android:layout_height="@dimen/dp_36"
+ android:src="@drawable/del_home" />
+ </LinearLayout>
</LinearLayout>
- <View
- android:layout_width="0dp"
- android:layout_height="0.5dp"
- android:layout_marginBottom="0.5dp"
- android:background="@color/text_1AFFFFFF"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- />
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/item_parent_cl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_52"
+ android:layout_marginTop="@dimen/dp_10"
+ android:background="@color/text_FF1C1C1E">
+ <TextView
+ android:id="@+id/house_name_tv"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/dp_23"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:text="@string/power_station"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/house_Image_ll"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+ <LinearLayout
+ android:id="@+id/house_Image_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/house_select_iv"
+ android:layout_width="@dimen/dp_39"
+ android:layout_height="@dimen/dp_39"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:visibility="gone" />
+ </LinearLayout>
+
+ <!-- <View-->
+ <!-- android:layout_width="0dp"-->
+ <!-- android:layout_height="0.5dp"-->
+ <!-- android:layout_marginBottom="0.5dp"-->
+ <!-- android:background="@color/text_1AFFFFFF"-->
+ <!-- app:layout_constraintBottom_toBottomOf="parent"-->
+ <!-- app:layout_constraintEnd_toEndOf="parent"-->
+ <!-- app:layout_constraintStart_toStartOf="parent"-->
+
+ <!-- />-->
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </LinearLayout>
+
+</com.hdl.photovoltaic.widget.SwipeLayout>
\ No newline at end of file
--
Gitblit v1.8.0