From 620af01dc9ec9e08bc8d56bb685c420986a3e458 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 12 十二月 2025 09:23:36 +0800
Subject: [PATCH] 钥匙柜bug修改
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java
index 3ffcd14..bfb13b8 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/ManageCabinetActivity.java
@@ -184,11 +184,6 @@
for(int i=0;i<updateList.size();i++){
upList[i] = updateList.get(i);
}
- //todo 鍘绘帀
- CabinetGridDo gridDo = oldMap.get("0101");
- if(gridDo!=null){
- EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+"=================>鏇存柊鏁版嵁褰撳墠閽ュ寵2锛�"+gridDo.getCurKeyCode()));
- }
DaoManager.getCabinetGridDao().update(upList);
}
@@ -359,7 +354,7 @@
}
if(isShowOpenTip){
if(openTipDownCount==0){
- doRegister(9,null);
+ getVM().doAction(9);
}else {
openTipDownCount--;
getDB().tvClKmClose.setText(openTipDownCount+"s 鑷姩鍏抽棴");
@@ -575,7 +570,7 @@
}
//鍙戦�佹煡璇㈤挜鍖欏彿
EventBus.getDefault().post(new GetKeyStatusEvent());
- keyTime = new Date().getTime()+500;
+ keyTime = new Date().getTime()+300;
if(handler.hasMessages(0)){
handler.removeMessages(0);
}
@@ -678,8 +673,25 @@
if(!isFail){
if(copyMap.containsKey(gridDo.getGridKey())){
//鍏抽棬鎴愬姛
- EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date())+"闂ㄥ叧闂垚鍔�***************************>鐩爣锛�"+gridDo.getKeyCode()+",褰撳墠锛�"+gridDo.getCurKeyCode()));
- getVM().closeGrid(gridDo);
+ boolean isSend = false;
+ String bh = gridDo.getGridKey().substring(0,2);
+ if("1".equals(e.getType())){
+ //1鍙锋澘
+ if("01".equals(bh)){
+ isSend = true;
+ }
+ }else if("2".equals(e.getType())){
+ //2鍙锋澘
+ if("02".equals(bh)){
+ isSend = true;
+ }
+ }else {
+ isSend = true;
+ }
+ if(isSend) {
+ EventBus.getDefault().post(new HttpEvent(StringUtil.DateToStrSS(new Date()) + "闂ㄥ叧闂垚鍔�***************************>鐩爣锛�" + gridDo.getKeyCode() + ",褰撳墠锛�" + gridDo.getCurKeyCode()));
+ getVM().closeGrid(gridDo);
+ }
}
}
}
--
Gitblit v1.9.3