Merge branch 'wjc_new' into lwj_new

mac

2024-05-21 f538aef48a6eda583b88cb5d5670fd7f2ed82135

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

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