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

doum

2025-10-17 cb6aca0642ac8dd5de877ade168066d85acb589c

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

@@ -62,13 +62,63 @@
            android:layout_marginRight="30dp"/>

        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_km"
            android:layout_width="match_parent"
            android:layout_height="0dp"
            app:layout_constraintTop_toBottomOf="@+id/viewBack"
            app:layout_constraintBottom_toBottomOf="parent"
            android:layout_marginTop="36dp"
            android:visibility="visible">

            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/rcv_km"
                android:layout_width="match_parent"
                android:layout_height="0dp"
                app:layout_constraintTop_toTopOf="parent"
                app:layout_constraintBottom_toTopOf="@+id/tv_km"
                android:layout_marginBottom="30dp"
                android:paddingLeft="30dp"
                android:paddingRight="30dp"/>

            <ImageView
                android:id="@+id/im_empty"
                android:layout_width="300dp"
                android:layout_height="300dp"
                android:src="@mipmap/default_nodata"
                app:layout_constraintTop_toTopOf="@+id/rcv_km"
                app:layout_constraintBottom_toBottomOf="@+id/rcv_km"
                app:layout_constraintStart_toStartOf="@+id/rcv_km"
                app:layout_constraintEnd_toEndOf="@+id/rcv_km"
                android:visibility="@{model.emptyVisibility}"/>

            <TextView
                android:id="@+id/tv_km"
                android:layout_width="match_parent"
                android:layout_height="75dp"
                android:text="开门"
                android:textColor="@color/white"
                android:textSize="24sp"
                android:textStyle="bold"
                android:gravity="center"
                android:background="@drawable/shape_mb_bt_faile"
                android:layout_marginLeft="30dp"
                android:layout_marginRight="30dp"
                app:layout_constraintBottom_toBottomOf="parent"
                app:commandType="@{1}"
                app:onClickCommand="@{model.myTypeCommand}"
                android:layout_marginBottom="30dp"/>

        </androidx.constraintlayout.widget.ConstraintLayout>

        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_tip1"
            android:layout_width="match_parent"
            android:layout_height="0dp"
            app:layout_constraintTop_toBottomOf="@+id/viewBack"
            app:layout_constraintBottom_toBottomOf="parent"
            android:layout_marginTop="36dp"
            android:visibility="gone">
            android:visibility="gone"
            android:background="@color/white">

            <ImageView
                android:id="@+id/img_jg1"
@@ -106,6 +156,7 @@
                app:layout_constraintEnd_toEndOf="parent"/>

            <TextView
                android:id="@+id/bt_tip"
                android:layout_width="match_parent"
                android:layout_height="75dp"
                android:text="重新检测"
@@ -117,10 +168,9 @@
                android:layout_marginLeft="30dp"
                android:layout_marginRight="30dp"
                app:layout_constraintBottom_toBottomOf="parent"
                app:commandType="@{5}"
                app:commandType="@{2}"
                app:onClickCommand="@{model.myTypeCommand}"
                android:layout_marginBottom="30dp"/>


        </androidx.constraintlayout.widget.ConstraintLayout>

@@ -131,7 +181,8 @@
            app:layout_constraintTop_toBottomOf="@+id/viewBack"
            app:layout_constraintBottom_toBottomOf="parent"
            android:layout_marginTop="36dp"
            android:visibility="gone">
            android:visibility="gone"
            android:background="@color/white">

            <ImageView
                android:id="@+id/img_tip2"
@@ -167,42 +218,6 @@
                android:layout_marginTop="22dp"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintEnd_toEndOf="parent"/>

        </androidx.constraintlayout.widget.ConstraintLayout>

        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/cl_km"
            android:layout_width="match_parent"
            android:layout_height="0dp"
            app:layout_constraintTop_toBottomOf="@+id/viewBack"
            app:layout_constraintBottom_toBottomOf="parent"
            android:layout_marginTop="36dp"
            android:visibility="visible">

            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/rcv_km"
                android:layout_width="match_parent"
                android:layout_height="0dp"
                app:layout_constraintTop_toTopOf="parent"
                app:layout_constraintBottom_toTopOf="@+id/tv_km_1"
                android:layout_marginBottom="30dp"/>

            <TextView
                android:id="@+id/tv_km_1"
                android:layout_width="match_parent"
                android:layout_height="75dp"
                android:text="开门"
                android:textColor="@color/white"
                android:textSize="24sp"
                android:textStyle="bold"
                android:gravity="center"
                android:background="@drawable/shape_r25_blue_bg"
                android:layout_marginLeft="30dp"
                android:layout_marginRight="30dp"
                app:layout_constraintBottom_toBottomOf="parent"
                app:commandType="@{6}"
                app:onClickCommand="@{model.myTypeCommand}"
                android:layout_marginBottom="30dp"/>

        </androidx.constraintlayout.widget.ConstraintLayout>