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

doum

2025-10-17 cb6aca0642ac8dd5de877ade168066d85acb589c

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

@@ -11,14 +11,14 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:padding="9dp"
        android:background="@drawable/shape_r6_cabinet_unsel_bg">
        android:background="@{data.isSelected?@drawable/shape_r6_cabinet_sel_bg:@drawable/shape_r6_cabinet_unsel_bg}">

        <TextView
            android:id="@+id/tv1"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="A02"
            android:textColor="#ff111111"
            android:text="@{data.cabinetName}"
            android:textColor="@{data.text1Color}"
            android:textSize="24sp"
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -28,8 +28,8 @@
            android:id="@+id/tv2"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="苏A18812"
            android:textColor="#ff279baa"
            android:text="@{data.carCode}"
            android:textColor="@{data.text2Color}"
            android:textSize="24sp"
            app:layout_constraintTop_toBottomOf="@+id/tv1"
            app:layout_constraintStart_toStartOf="parent"