Merge branch '1.5.1'

wjc

2025-01-07 90d5f028ccdaaaf64286f9d632cb335a4d0544b9

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

@@ -3,12 +3,12 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="224dp">
    android:layout_height="wrap_content">

    <ImageView
        android:id="@+id/null_data_gif_animation_iv"
        android:layout_width="289.5dp"
        android:layout_height="189.5dp"
        android:layout_width="246dp"
        android:layout_height="158.5dp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
@@ -16,11 +16,10 @@

    <TextView
        android:id="@+id/null_data_tv"
        android:layout_width="match_parent"
        android:layout_width="0dp"
        android:layout_height="22.5dp"
        android:layout_marginTop="11.5dp"
        android:gravity="center"
        android:textColor="@color/text_7C8590"
        android:textColor="@color/text_66FFFFFF"
        android:textSize="@dimen/text_16"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"