Merge branch 'heads/v1.4.2'

mac

2024-10-21 8f5fe758de9464a5118bd306814c170b768fe695

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

@@ -10,9 +10,9 @@
    <RelativeLayout
        android:id="@+id/title_cl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_31"
        android:layout_height="@dimen/dp_44"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="@dimen/dp_44"
        android:layout_marginTop="@dimen/dp_38"
        android:layout_marginEnd="@dimen/dp_16"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -33,9 +33,8 @@
            android:id="@+id/device_label"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_marginStart="19dp"
            android:layout_marginEnd="7dp"
            android:layout_toStartOf="@+id/edit_iv"
            android:layout_marginStart="17dp"
            android:layout_marginEnd="-339dp"
            android:layout_toEndOf="@+id/power_station_label"
            android:gravity="start|center_vertical"
            android:text="@string/device"
@@ -51,15 +50,14 @@
            android:layout_marginEnd="@dimen/dp_13"
            android:layout_toStartOf="@+id/add_iv"
            android:src="@drawable/edit"
            android:visibility="gone"

            />
            android:visibility="gone" />

        <ImageView
            android:id="@+id/add_iv"
            android:layout_width="@dimen/dp_31"
            android:layout_height="@dimen/dp_31"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:src="@drawable/add" />


@@ -79,7 +77,7 @@
            android:id="@+id/power_station_label_top_cl"
            android:layout_width="match_parent"
            android:layout_height="174dp"
            android:layout_marginTop="@dimen/dp_21">
            android:layout_marginTop="@dimen/dp_13">
            <!--搜索-->
            <RelativeLayout
                android:id="@+id/power_station_search_cl"
@@ -189,7 +187,6 @@
                        android:text="@string/station_name"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold"

                        />

@@ -219,8 +216,7 @@
                        android:layout_height="@dimen/dp_17"
                        android:text="@string/generated_power"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold" />
                        android:textSize="@dimen/text_12" />

                    <ImageView
                        android:id="@+id/station_power_iv"
@@ -248,8 +244,7 @@
                        android:layout_height="@dimen/dp_17"
                        android:text="@string/day_power_generation"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold" />
                        android:textSize="@dimen/text_12" />

                    <ImageView
                        android:id="@+id/station_day_iv"
@@ -277,8 +272,7 @@
                        android:layout_height="@dimen/dp_17"
                        android:text="@string/month_power_generation"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold" />
                        android:textSize="@dimen/text_12" />

                    <ImageView
                        android:id="@+id/station_month_iv"
@@ -306,8 +300,7 @@
                android:id="@+id/fragment_house_srl_list_rc"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:clipToPadding="false"
                android:paddingBottom="@dimen/dp_16" />
                 />
        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>


@@ -329,7 +322,7 @@
            android:id="@+id/device_label_top_cl"
            android:layout_width="match_parent"
            android:layout_height="40dp"
            android:layout_marginTop="@dimen/dp_21">
            android:layout_marginTop="@dimen/dp_13">
            <!--搜索-->
            <RelativeLayout
                android:id="@+id/device_search_cl"