Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2025-10-17 cb6aca0642ac8dd5de877ade168066d85acb589c

 keyCabinet-android/app/src/main/res/layout/face_activity.xml

@@ -133,6 +133,7 @@
                app:layout_constraintEnd_toEndOf="parent"/>

            <androidx.constraintlayout.widget.ConstraintLayout
                android:id="@+id/cl_remind"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                app:layout_constraintTop_toBottomOf="@+id/tv_tip"
@@ -254,7 +255,7 @@
        </androidx.constraintlayout.widget.ConstraintLayout>

        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_sk"
            android:id="@+id/bt_sk"
            android:layout_width="match_parent"
            android:layout_height="75dp"
            android:layout_marginLeft="30dp"
@@ -359,6 +360,7 @@

        </androidx.constraintlayout.widget.ConstraintLayout>


        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_sj_sk"
            android:layout_width="match_parent"
@@ -398,6 +400,8 @@
            </LinearLayout>
        </androidx.constraintlayout.widget.ConstraintLayout>



        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_tip1"
            android:layout_width="match_parent"
@@ -405,6 +409,7 @@
            app:layout_constraintTop_toBottomOf="@+id/viewBack"
            app:layout_constraintBottom_toBottomOf="parent"
            android:layout_marginTop="36dp"
            android:background="@color/white"
            android:visibility="gone">

            <ImageView