Merge branch 'wjc_new' into develop_new

mac

2024-05-21 d24c8a8d62caf0c0902246972a80f34edd098ba0

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

@@ -20,7 +20,8 @@

        <TextView
            android:id="@+id/loading_confirmation_title_tv"
            android:layout_width="wrap_content"
            android:layout_width="0dp"
            android:gravity="center"
            android:layout_height="@dimen/dp_25"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="@dimen/dp_24"