Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

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

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

@@ -421,11 +421,11 @@

        </androidx.constraintlayout.widget.ConstraintLayout>

        <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="18.5dp"
            android:layout_marginTop="10dp"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -434,8 +434,10 @@
            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/fragment_house_srl_list_rc"
                android:layout_width="match_parent"
                android:layout_height="match_parent" />
        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
                android:layout_height="match_parent"
                android:clipToPadding="false"
                android:paddingBottom="@dimen/dp_10" />
        </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
        <!--没有数据显示样式-->
        <include
            android:id="@+id/home_null_data_ic"
@@ -507,7 +509,7 @@

        </androidx.constraintlayout.widget.ConstraintLayout>

        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
            android:id="@+id/fragment_device_srl"
            android:layout_width="match_parent"
            android:layout_height="0dp"
@@ -522,7 +524,7 @@
                android:layout_height="match_parent"
                android:clipToPadding="false"
                android:paddingBottom="@dimen/dp_10" />
        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
        </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>

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


</androidx.constraintlayout.widget.ConstraintLayout>





</androidx.constraintlayout.widget.ConstraintLayout>