Merge branch '1.5.1'

wjc

2025-01-07 90d5f028ccdaaaf64286f9d632cb335a4d0544b9

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

@@ -4,12 +4,19 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_F5F7FA"
    android:background="@color/text_FF000000"
    tools:context=".ui.newC.PowerStationsListEdit">


    <include
        android:id="@+id/toolbar_top_fragment_house_list_rl"
        layout="@layout/toolbar_top_view_44" />
        android:id="@+id/toolbar_top_rl"
        layout="@layout/toolbar_top_view_44"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_44"
        android:layout_marginTop="@dimen/dp_38"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/fragment_house_srl"
@@ -19,7 +26,7 @@
        app:layout_constraintBottom_toTopOf="@+id/add_power_station_rl"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">

        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/fragment_house_srl_list_rc"
@@ -33,7 +40,7 @@
        android:id="@+id/add_power_station_rl"
        android:layout_width="match_parent"
        android:layout_height="82dp"
        android:background="@color/text_FFFFFFFF"
        android:background="@color/text_00000000"
        android:gravity="center"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
@@ -43,11 +50,11 @@
            android:id="@+id/add_power_station_tv"
            android:layout_width="335dp"
            android:layout_height="52dp"
            android:background="@drawable/checked"
            android:background="@drawable/bj_ff39383d"
            android:gravity="center"
            android:text="@string/add_power_station"
            android:textColor="@color/text_FFFFFFFF"
            android:textSize="18sp" />
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="14sp" />
    </RelativeLayout>