Merge branch 'wjc_new' into feature/hxb

mac

2024-05-30 bde413d383e3db95d2a255f6334fbbac7b9f373a

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

@@ -3,7 +3,8 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/me_parent"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    android:layout_height="match_parent"
    android:background="@drawable/bj">

    <TextView
        android:id="@+id/me_title_tv"
@@ -40,7 +41,7 @@
            android:layout_width="wrap_content"
            android:layout_height="25dp"
            android:layout_marginTop="@dimen/dp_16"
            android:textColor="@color/text_90000000"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_18"
            app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv"
            app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv"