From dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 15:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/res/layout/manage_cabinet_activity.xml | 78 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 10 deletions(-)
diff --git a/keyCabinet-android/app/src/main/res/layout/manage_cabinet_activity.xml b/keyCabinet-android/app/src/main/res/layout/manage_cabinet_activity.xml
index 4a5ca0a..e2655a4 100644
--- a/keyCabinet-android/app/src/main/res/layout/manage_cabinet_activity.xml
+++ b/keyCabinet-android/app/src/main/res/layout/manage_cabinet_activity.xml
@@ -44,7 +44,7 @@
android:id="@+id/tv_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="0"
+ android:text='@{model.dataOb.gridNum+""}'
android:textColor="#111111"
android:textSize="22sp"
app:layout_constraintTop_toTopOf="@+id/tv1"
@@ -121,7 +121,7 @@
android:id="@+id/tv_zw_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="0"
+ android:text='@{model.dataOb.onlineKeyNum+""}'
android:textColor="#ff111111"
android:textSize="21sp"
android:paddingBottom="3dp"/>
@@ -156,7 +156,7 @@
android:id="@+id/tv_jc_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="0"
+ android:text='@{model.dataOb.outKeyNum+""}'
android:textColor="#ff111111"
android:textSize="21sp"
android:paddingBottom="3dp"/>
@@ -191,7 +191,7 @@
android:id="@+id/tv_wx_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="0"
+ android:text='@{model.dataOb.serviceKeyNum+""}'
android:textColor="#ff111111"
android:textSize="21sp"
android:paddingBottom="3dp"/>
@@ -250,7 +250,7 @@
android:id="@+id/tv_gz_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="0"
+ android:text='@{model.dataOb.errGridNum+""}'
android:textColor="#ff111111"
android:textSize="21sp"
android:paddingBottom="3dp"/>
@@ -285,7 +285,7 @@
android:id="@+id/tv_wbd_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="0"
+ android:text='@{model.dataOb.unBindGridNum+""}'
android:textColor="#ff111111"
android:textSize="21sp"
android:paddingBottom="3dp"/>
@@ -310,6 +310,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rcv_km"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@+id/cl_2"
@@ -350,7 +351,7 @@
android:textSize="24sp"
android:paddingLeft="30dp"
android:paddingRight="30dp"
- android:background="@drawable/shape_mb_bt_ok"
+ android:background="@drawable/shape_mb_bt_faile"
app:layout_constraintTop_toTopOf="@+id/tv_all_open"
app:layout_constraintLeft_toRightOf="@+id/tv_all_open"
app:layout_constraintRight_toLeftOf="@+id/tv_bj"
@@ -442,7 +443,8 @@
app:commandType="@{6}"
app:onClickCommand="@{model.myTypeCommand}"
android:layout_marginLeft="30dp"
- android:layout_marginRight="30dp"/>
+ android:layout_marginRight="30dp"
+ />
<TextView
android:id="@+id/tv_bjgz"
@@ -479,7 +481,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#80000000"
- app:commandType="@{8}"
+ app:commandType="@{9}"
app:onClickCommand="@{model.myTypeCommand}"/>
<androidx.constraintlayout.widget.ConstraintLayout
@@ -517,7 +519,7 @@
android:id="@+id/tv_cl_km_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="閽ュ寵鏌淎C103銆丄C104銆丄C105銆丄C104銆丄C105銆丄C104銆丄C105銆丄C105銆丄C104銆丄C105寮�闂ㄦ垚鍔燂紝棰嗚繕鍚庤鍏抽棬"
+ android:text="閽ュ寵鏌滃紑闂ㄦ垚鍔燂紝棰嗚繕鍚庤鍏抽棬"
android:textColor="#ff333333"
android:textSize="22sp"
android:gravity="center"
@@ -543,5 +545,61 @@
</androidx.constraintlayout.widget.ConstraintLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/cl_tip"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/white"
+ android:visibility="gone">
+
+ <TextView
+ android:id="@+id/tv_djs"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="10s"
+ android:textColor="#ff279baa"
+ android:textSize="24sp"
+ app:layout_constraintTop_toTopOf="parent"
+ android:layout_marginTop="33dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginRight="30dp"/>
+
+ <ImageView
+ android:id="@+id/img_tip2"
+ android:layout_width="300dp"
+ android:layout_height="205dp"
+ android:src="@mipmap/ic_notclose_key"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ android:layout_marginTop="140dp"/>
+
+ <TextView
+ android:id="@+id/tv_tip2_1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鏌滈棬鏈叧闂�"
+ android:textColor="#ff111111"
+ android:textSize="33sp"
+ android:textStyle="bold"
+ app:layout_constraintTop_toBottomOf="@+id/img_tip2"
+ android:layout_marginTop="18dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+
+ <TextView
+ android:id="@+id/tv_tip2_2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text=""
+ android:textColor="#ff666666"
+ android:textSize="24sp"
+ app:layout_constraintTop_toBottomOf="@+id/tv_tip2_1"
+ android:layout_marginTop="22dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
--
Gitblit v1.9.3