Merge branch 'heads/v1.4.2'

mac

2024-10-21 8f5fe758de9464a5118bd306814c170b768fe695

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

@@ -8,7 +8,7 @@
    <androidx.constraintlayout.widget.ConstraintLayout

        android:layout_width="280dp"
        android:layout_height="229dp"
        android:layout_height="wrap_content"
        android:background="@drawable/confirmation_bj"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
@@ -58,8 +58,8 @@
                android:layout_marginStart="@dimen/dp_16"
                android:layout_marginTop="@dimen/dp_16"
                android:layout_marginEnd="@dimen/dp_20"
                android:singleLine="false"
                android:gravity="center"
                android:singleLine="false"
                android:textColor="@color/text_030D1C"
                android:textSize="12sp"
                android:visibility="gone"
@@ -81,5 +81,12 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/content_cl" />

        <View
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_16"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/comfirm_tv" />
    </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>