Merge branch 'dev' into feature/v1.4.1

mac

2024-06-04 276156837ebca8b8b08a516e61fe105e670375fc

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

@@ -165,4 +165,17 @@

    </androidx.constraintlayout.widget.ConstraintLayout>


    <!--没有数据显示样式-->
    <include
        android:id="@+id/device_null_data_ic"
        layout="@layout/null_data_view"
        android:layout_width="match_parent"
        android:layout_height="224dp"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl" />

</androidx.constraintlayout.widget.ConstraintLayout>