From 28d2b0a2b33c786670f4999e4b634036de2d6883 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 15 十二月 2025 11:19:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java
index c006208..ffbdafd 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java
@@ -366,7 +366,7 @@
//鑾峰彇鍗″彿
EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>鍏抽棬锛岃幏鍙栭挜鍖欎俊鎭�"));
EventBus.getDefault().post(new GetKeyStatusEvent());
- keyTime = new Date().getTime()+500;
+ keyTime = new Date().getTime()+100;
if(handler.hasMessages(0)){
handler.removeMessages(0);
}
@@ -404,6 +404,8 @@
if(handler.hasMessages(0)){
handler.removeMessages(0);
}
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅,鐗堝彿锛�"+
+ e.getType())+",bar:"+selectBean.getBoardCode()+",flag="+flag);
if("1".equals(e.getType())){
//1鍙锋澘
if(!"1".equals(selectBean.getBoardCode())){
@@ -422,14 +424,17 @@
if(flag==0) {
//棰嗗彇
//鏌ヨ閽ュ寵鍙�
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅杩斿洖"));
CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
if (gridDo != null) {
if (gridDo.getIsOpen() == 0) {
+ //ToastView.show(MApplication.mContext,"褰撳墠锛�"+gridDo.getCurKeyCode()+"锛岀粦瀹氾細"+gridDo.getKeyCode());
//鍏抽棬鎴愬姛
if (!TextUtils.isEmpty(gridDo.getCurKeyCode())) {
if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//棰嗗彇澶辫触
isOpened = false;
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>褰撳墠閽ュ寵锛�"+gridDo.getCurKeyCode()));
getVM().doAction(6);
getVM().closeGrid(gridDo);
}else {
--
Gitblit v1.9.3