Merge branch 'wjc_new' into lwj_new

mac

2024-05-22 a4ae9ba07cffea7b53c3f92e8deac8a73fb62710

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

@@ -8,7 +8,7 @@
    <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"