From 6c12dd77bc481aeabec568bfed3dd68e81b80f8b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 20 十月 2025 08:56:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/res/layout/manage_cabinet_activity.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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..b72f283 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"/>
@@ -382,7 +382,7 @@
android:id="@+id/cl_cz"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:visibility="gone">
+ android:visibility="visible">
<View
android:layout_width="match_parent"
--
Gitblit v1.9.3