Merge branch 'wjc_new' into develop_new

mac

2024-05-21 d24c8a8d62caf0c0902246972a80f34edd098ba0

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

@@ -19,7 +19,8 @@
            android:id="@+id/type_title_tv"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_20"
            android:textColor="@color/text_90000000"
            android:gravity="center"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_14"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"