Merge branch 'dev' into feature/v1.4.1

mac

2024-06-05 31de722a45e886eae89cfea2f1740c1f4d3b0216

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

@@ -3,12 +3,13 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/message_parent"
    android:layout_width="match_parent"
    android:background="@drawable/bj"
    android:layout_height="match_parent">
    <!--头部标签-->
    <RelativeLayout
        android:id="@+id/message_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_31"
        android:layout_height="@dimen/dp_36"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="@dimen/dp_44"
        android:layout_marginEnd="@dimen/dp_16"
@@ -190,7 +191,7 @@
                            android:layout_width="@dimen/dp_10"
                            android:layout_height="@dimen/dp_10"
                            android:layout_marginStart="@dimen/dp_7"
                            android:background="@drawable/up" />
                            android:background="@drawable/down" />
                    </LinearLayout>


@@ -225,7 +226,7 @@
                            android:id="@+id/all_time_title_iv"
                            android:layout_width="@dimen/dp_10"
                            android:layout_height="@dimen/dp_10"
                            android:background="@drawable/up" />
                            android:background="@drawable/down" />
                    </LinearLayout>