Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

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

@@ -3,8 +3,8 @@
    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">
    android:layout_height="match_parent"
    android:background="@drawable/bj">
    <!--头部标签-->
    <RelativeLayout
        android:id="@+id/message_rl"
@@ -22,7 +22,7 @@
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_centerVertical="true"
            android:gravity="center_vertical"
            android:gravity="center_vertical|bottom"
            android:text="@string/message_nascent"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_20"
@@ -35,26 +35,23 @@
            android:layout_centerVertical="true"
            android:layout_marginStart="@dimen/dp_21"
            android:layout_marginEnd="@dimen/dp_4"
            android:layout_toStartOf="@+id/all_clear_tv"
            android:layout_toStartOf="@+id/all_clear_iv"
            android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
            android:gravity="start|center_vertical"
            android:gravity="start|center_vertical|bottom"
            android:text="@string/alarm_record"
            android:textColor="@color/text_66000000"
            android:textSize="@dimen/text_16"

            />

        <TextView
            android:id="@+id/all_clear_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_31"
            android:layout_alignParentEnd="true"
            android:gravity="center"
            android:text="@string/all_read"
            android:textColor="@color/text_38C494"
            android:textSize="@dimen/dp_16"
        <ImageView

            />
            android:id="@+id/all_clear_iv"
            android:layout_width="@dimen/dp_28"
            android:layout_height="@dimen/dp_28"
            android:layout_alignParentEnd="true"
            android:layout_marginTop="@dimen/dp_4"
            android:src="@drawable/clearall" />


    </RelativeLayout>
@@ -147,7 +144,7 @@
                            android:textSize="@dimen/text_14" />

                        <View
                            android:layout_width="@dimen/dp_7"
                            android:layout_width="@dimen/dp_5"
                            android:layout_height="match_parent" />

                        <ImageView
@@ -183,7 +180,7 @@
                            android:textSize="@dimen/text_14" />

                        <View
                            android:layout_width="7dp"
                            android:layout_width="5dp"
                            android:layout_height="match_parent" />

                        <ImageView
@@ -219,7 +216,7 @@
                            android:textSize="@dimen/text_14" />

                        <View
                            android:layout_width="@dimen/dp_7"
                            android:layout_width="@dimen/dp_5"
                            android:layout_height="match_parent" />

                        <ImageView