weimingfei
10 小时以前 8ff90d87687b6d38158809aae776b6c709d7b60a
keyCabinet-android/app/src/main/res/layout/face_activity.xml
@@ -220,13 +220,57 @@
            </androidx.constraintlayout.widget.ConstraintLayout>
            <androidx.constraintlayout.widget.ConstraintLayout
                android:layout_width="match_parent"
                android:id="@+id/cl_zw_gl"
                android:layout_width="0dp"
                android:layout_height="75dp"
                android:layout_marginLeft="30dp"
                app:layout_constraintBottom_toBottomOf="parent"
                android:layout_marginBottom="30dp"
                android:background="@drawable/shape_r30_face_bg"
                app:layout_constraintLeft_toLeftOf="parent"
                app:layout_constraintRight_toLeftOf="@+id/cl_sk_gl"
                app:commandType="@{9}"
                app:onClickCommand="@{model.myTypeCommand}"
                >
                <LinearLayout
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    app:layout_constraintTop_toTopOf="parent"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintEnd_toEndOf="parent"
                    >
                    <ImageView
                        android:layout_width="28dp"
                        android:layout_height="28dp"
                        android:src="@mipmap/ic_zhiwen"
                        android:layout_gravity="center_vertical"/>
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="指纹验证"
                        android:textColor="#ff279baa"
                        android:textSize="24sp"
                        android:textStyle="bold"
                        android:layout_marginLeft="12dp"/>
                </LinearLayout>
            </androidx.constraintlayout.widget.ConstraintLayout>
            <androidx.constraintlayout.widget.ConstraintLayout
                android:id="@+id/cl_sk_gl"
                android:layout_width="0dp"
                android:layout_height="75dp"
                android:layout_marginLeft="30dp"
                android:layout_marginRight="30dp"
                app:layout_constraintBottom_toBottomOf="parent"
                android:layout_marginBottom="30dp"
                android:background="@drawable/shape_r30_face_bg"
                app:layout_constraintLeft_toRightOf="@+id/cl_zw_gl"
                app:layout_constraintRight_toRightOf="parent"
                app:commandType="@{1}"
                app:onClickCommand="@{model.myTypeCommand}"
                >
@@ -252,14 +296,15 @@
                        android:textColor="#ff279baa"
                        android:textSize="24sp"
                        android:textStyle="bold"
                        android:layout_marginLeft="7dp"/>
                        android:layout_marginLeft="12dp"/>
                </LinearLayout>
            </androidx.constraintlayout.widget.ConstraintLayout>
        </androidx.constraintlayout.widget.ConstraintLayout>
        <!--人脸验证-->
        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_fail"
            android:layout_width="wrap_content"
@@ -308,6 +353,7 @@
        </androidx.constraintlayout.widget.ConstraintLayout>
        <!-- 司机选验证方式 -->
        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_sj_xuan"
            android:layout_width="match_parent"
@@ -424,18 +470,68 @@
                android:layout_marginBottom="30dp"
                android:visibility="visible">
                <androidx.constraintlayout.widget.ConstraintLayout
                    android:id="@+id/cl_zw_sj"
                    android:layout_width="0dp"
                    android:layout_height="75dp"
                    app:layout_constraintBottom_toBottomOf="parent"
                    android:background="@drawable/shape_r30_face_bg"
                    app:layout_constraintLeft_toLeftOf="parent"
                    app:layout_constraintRight_toLeftOf="@+id/ll_01"
                    android:layout_marginRight="20dp"
                    app:commandType="@{10}"
                    app:onClickCommand="@{model.myTypeCommand}"
                    >
                <LinearLayout
                    android:id="@+id/ll_01"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                        android:layout_height="wrap_content"
                    app:layout_constraintTop_toTopOf="parent"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintEnd_toEndOf="parent"
                        >
                        <ImageView
                            android:layout_width="28dp"
                            android:layout_height="28dp"
                            android:src="@mipmap/ic_zhiwen"
                            android:layout_gravity="center_vertical"/>
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:text="指纹"
                            android:textColor="#ff279baa"
                            android:textSize="24sp"
                            android:textStyle="bold"
                            android:layout_marginLeft="12dp"/>
                    </LinearLayout>
                </androidx.constraintlayout.widget.ConstraintLayout>
                <androidx.constraintlayout.widget.ConstraintLayout
                    android:id="@+id/ll_01"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    app:layout_constraintTop_toTopOf="parent"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintLeft_toRightOf="@+id/cl_zw_sj"
                    app:layout_constraintRight_toLeftOf="@+id/ll_02"
                    android:background="@drawable/shape_r30_face_bg"
                    android:paddingLeft="30dp"
                    android:paddingRight="30dp"
                    app:commandType="@{2}"
                    app:onClickCommand="@{model.myTypeCommand}">
                    <LinearLayout
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        app:layout_constraintTop_toTopOf="parent"
                        app:layout_constraintBottom_toBottomOf="parent"
                        app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintEnd_toEndOf="parent"
                        >
                    <ImageView
                        android:layout_width="28dp"
@@ -445,14 +541,15 @@
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="刷卡验证"
                            android:text="刷卡"
                        android:textColor="#ff279baa"
                        android:textSize="24sp"
                        android:layout_marginLeft="7dp"
                        android:textStyle="bold"
                        android:layout_gravity="center_vertical"/>
                            android:layout_marginLeft="12dp"/>
                </LinearLayout>
                </androidx.constraintlayout.widget.ConstraintLayout>
                <LinearLayout
                    android:id="@+id/ll_02"
@@ -484,7 +581,125 @@
        </androidx.constraintlayout.widget.ConstraintLayout>
        <!--指纹验证-->
        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_zw"
            android:layout_width="match_parent"
            android:layout_height="0dp"
            app:layout_constraintTop_toTopOf="@+id/camera_textureview"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            android:background="@color/white"
            android:visibility="gone">
            <View
                android:id="@+id/v_c_zw"
                android:layout_width="340dp"
                android:layout_height="340dp"
                android:background="@mipmap/ic_zhiwenyanzheng"
                app:layout_constraintTop_toTopOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
                />
            <TextView
                android:id="@+id/tv_zw_tip"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:text="请将手指放置在指纹采集器上"
                android:textColor="#ff666666"
                android:textSize="24sp"
                android:gravity="center"
                app:layout_constraintTop_toBottomOf="@+id/v_c_zw"
                android:layout_marginTop="42dp"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintEnd_toEndOf="parent"/>
            <androidx.constraintlayout.widget.ConstraintLayout
                android:id="@+id/cl_sk_zw"
                android:layout_width="0dp"
                android:layout_height="75dp"
                android:layout_marginLeft="30dp"
                app:layout_constraintBottom_toBottomOf="parent"
                android:layout_marginBottom="30dp"
                android:background="@drawable/shape_r30_face_bg"
                app:layout_constraintLeft_toLeftOf="parent"
                app:layout_constraintRight_toLeftOf="@+id/cl_rl_zw"
                app:commandType="@{1}"
                app:onClickCommand="@{model.myTypeCommand}"
                >
                <LinearLayout
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    app:layout_constraintTop_toTopOf="parent"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintEnd_toEndOf="parent"
                    >
                    <ImageView
                        android:layout_width="28dp"
                        android:layout_height="28dp"
                        android:src="@mipmap/ic_shuaka"
                        android:layout_gravity="center_vertical"/>
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="刷卡验证"
                        android:textColor="#ff279baa"
                        android:textSize="24sp"
                        android:textStyle="bold"
                        android:layout_marginLeft="12dp"/>
                </LinearLayout>
            </androidx.constraintlayout.widget.ConstraintLayout>
            <androidx.constraintlayout.widget.ConstraintLayout
                android:id="@+id/cl_rl_zw"
                android:layout_width="0dp"
                android:layout_height="75dp"
                android:layout_marginLeft="30dp"
                android:layout_marginRight="30dp"
                app:layout_constraintBottom_toBottomOf="parent"
                android:layout_marginBottom="30dp"
                app:layout_constraintLeft_toRightOf="@+id/cl_sk_zw"
                app:layout_constraintRight_toRightOf="parent"
                android:background="@drawable/shape_r30_face_bg"
                app:commandType="@{4}"
                app:onClickCommand="@{model.myTypeCommand}"
                >
                <LinearLayout
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    app:layout_constraintTop_toTopOf="parent"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintEnd_toEndOf="parent"
                    >
                    <ImageView
                        android:layout_width="28dp"
                        android:layout_height="28dp"
                        android:src="@mipmap/ic_renlian"
                        android:layout_gravity="center_vertical"/>
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="人脸验证"
                        android:textColor="#ff279baa"
                        android:textSize="24sp"
                        android:textStyle="bold"
                        android:layout_marginLeft="12dp"/>
                </LinearLayout>
            </androidx.constraintlayout.widget.ConstraintLayout>
        </androidx.constraintlayout.widget.ConstraintLayout>
        <!--刷卡验证-->
        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_card"
            android:layout_width="match_parent"
@@ -520,12 +735,55 @@
                app:layout_constraintEnd_toEndOf="parent"/>
            <androidx.constraintlayout.widget.ConstraintLayout
                android:layout_width="match_parent"
                android:id="@+id/cl_zw_sk"
                android:layout_width="0dp"
                android:layout_height="75dp"
                android:layout_marginLeft="30dp"
                app:layout_constraintBottom_toBottomOf="parent"
                android:layout_marginBottom="30dp"
                android:background="@drawable/shape_r30_face_bg"
                app:layout_constraintLeft_toLeftOf="parent"
                app:layout_constraintRight_toLeftOf="@+id/cl_rl_sk"
                app:commandType="@{11}"
                app:onClickCommand="@{model.myTypeCommand}"
                >
                <LinearLayout
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    app:layout_constraintTop_toTopOf="parent"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintEnd_toEndOf="parent"
                    >
                    <ImageView
                        android:layout_width="28dp"
                        android:layout_height="28dp"
                        android:src="@mipmap/ic_zhiwen"
                        android:layout_gravity="center_vertical"/>
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text="指纹验证"
                        android:textColor="#ff279baa"
                        android:textSize="24sp"
                        android:textStyle="bold"
                        android:layout_marginLeft="12dp"/>
                </LinearLayout>
            </androidx.constraintlayout.widget.ConstraintLayout>
            <androidx.constraintlayout.widget.ConstraintLayout
                android:id="@+id/cl_rl_sk"
                android:layout_width="0dp"
                android:layout_height="75dp"
                android:layout_marginLeft="30dp"
                android:layout_marginRight="30dp"
                app:layout_constraintBottom_toBottomOf="parent"
                android:layout_marginBottom="30dp"
                app:layout_constraintLeft_toRightOf="@+id/cl_zw_sk"
                app:layout_constraintRight_toRightOf="parent"
                android:background="@drawable/shape_r30_face_bg"
                app:commandType="@{4}"
                app:onClickCommand="@{model.myTypeCommand}"
@@ -552,13 +810,14 @@
                        android:textColor="#ff279baa"
                        android:textSize="24sp"
                        android:textStyle="bold"
                        android:layout_marginLeft="7dp"/>
                        android:layout_marginLeft="12dp"/>
                </LinearLayout>
            </androidx.constraintlayout.widget.ConstraintLayout>
        </androidx.constraintlayout.widget.ConstraintLayout>
        <!--酒精检测-->
        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_jiu"
            android:layout_width="match_parent"