Merge branch '1.3.1'

wjc

2025-07-07 c19f27f32f3c3d2caf82ddbdc3b2602ee3610e46

 app/src/main/res/layout/item_house_line_c.xml

@@ -1,9 +1,39 @@
<?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_sl"
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_62">

    <LinearLayout
        android:layout_width="@dimen/dp_68"
        android:layout_height="match_parent"
        android:background="@color/text_FF000000">

        <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/del_c_home_iv"
                android:layout_width="@dimen/dp_36"
                android:layout_height="@dimen/dp_36"
                android:src="@drawable/del_home" />
        </LinearLayout>
    </LinearLayout>

    <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
@@ -33,22 +63,6 @@
        app:layout_constraintTop_toTopOf="parent">

        <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" />

        <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"
@@ -56,16 +70,18 @@
            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"
            <!--        <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>