Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

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

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


@@ -18,11 +18,11 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
    <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
        android:id="@+id/fragment_house_srl"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_marginTop="@dimen/dp_12"
        android:layout_marginTop="@dimen/dp_10"
        app:layout_constraintBottom_toTopOf="@+id/add_power_station_rl"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -34,13 +34,13 @@
            android:layout_height="match_parent"
            android:clipToPadding="false"
            android:paddingBottom="@dimen/dp_16" />
    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
    </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>

    <RelativeLayout
        android:id="@+id/add_power_station_rl"
        android:layout_width="match_parent"
        android:layout_height="82dp"
        android:background="@color/text_FF333738"
        android:background="@color/text_00000000"
        android:gravity="center"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
@@ -50,10 +50,10 @@
            android:id="@+id/add_power_station_tv"
            android:layout_width="335dp"
            android:layout_height="52dp"
            android:background="@drawable/bj_ff555859"
            android:background="@drawable/bj_ff39383d"
            android:gravity="center"
            android:text="@string/add_power_station"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="14sp" />
    </RelativeLayout>