Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -5,7 +5,7 @@
    android:id="@+id/house_list_parent"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FF161616">
    android:background="@color/text_FF000000">
    <!--头部标签-->
    <RelativeLayout
        android:id="@+id/title_cl"
@@ -97,7 +97,7 @@
                    android:layout_height="match_parent"
                    android:layout_marginEnd="@dimen/dp_17"
                    android:layout_toStartOf="@+id/power_station_default_condition_iv"
                    android:background="@drawable/search_bj_ff333738">
                    android:background="@drawable/search_bj_ff1c1c1e">

                    <ImageView

@@ -127,7 +127,7 @@
                    android:layout_height="@dimen/dp_31"
                    android:layout_alignParentEnd="true"
                    android:layout_centerVertical="true"
                    android:src="@drawable/default_condition" />
                    android:src="@drawable/condition_screening" />


            </RelativeLayout>
@@ -405,7 +405,7 @@
                        android:id="@+id/station_month_tv"
                        android:layout_width="wrap_content"
                        android:layout_height="match_parent"
                        android:text="@string/month_power_generation"
                        android:text="@string/battery_capacity_indicator"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_14" />

@@ -478,7 +478,7 @@
                android:layout_height="@dimen/dp_35"
                android:layout_marginStart="@dimen/dp_13"
                android:layout_marginEnd="@dimen/dp_16"
                android:background="@drawable/search_bj_ff333738"
                android:background="@drawable/search_bj_ff1c1c1e"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent">
@@ -495,7 +495,7 @@
                <TextView
                    android:id="@+id/device_search_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_17"
                    android:layout_height="wrap_content"
                    android:layout_centerVertical="true"
                    android:layout_marginStart="@dimen/dp_11"
                    android:layout_toEndOf="@+id/device_search_iv"
@@ -521,7 +521,7 @@
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:clipToPadding="false"
                android:paddingBottom="@dimen/dp_16" />
                android:paddingBottom="@dimen/dp_10" />
        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

        <!--没有数据显示样式-->
@@ -541,9 +541,4 @@
    </androidx.constraintlayout.widget.ConstraintLayout>


</androidx.constraintlayout.widget.ConstraintLayout>





</androidx.constraintlayout.widget.ConstraintLayout>