From 445ba440b32fae364a39b8ef7822ecf3bd4e6abb Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期三, 14 一月 2026 11:29:26 +0800
Subject: [PATCH] 钥匙柜bug修改

---
 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java |   21 ++++++++++++++++++++-
 1 files changed, 20 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 f3e8818..0366822 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
@@ -23,6 +23,7 @@
 import com.doumee.keyCabinet.dao.DaoManager;
 import com.doumee.keyCabinet.databinding.KeyCabinetActivityBinding;
 import com.doumee.keyCabinet.event.CloseGridOneResultEvent;
+import com.doumee.keyCabinet.event.HttpEvent;
 import com.doumee.keyCabinet.event.KeyResultEvent;
 import com.doumee.keyCabinet.event.GetKeyStatusEvent;
 import com.doumee.keyCabinet.event.OpenErrEvent;
@@ -146,10 +147,12 @@
     }
 
     private boolean isOpening = false;
+    private int doAction;
     @Override
     protected void doRegister(int type, ActionEventData data) {
         stopCountTimer();
         downTime = 30;
+        doAction = type;
         switch (type){
             case 1:
                 if(selectBean==null){
@@ -364,7 +367,7 @@
             }
             //鑾峰彇鍗″彿
             EventBus.getDefault().post(new GetKeyStatusEvent());
-            keyTime = new Date().getTime()+500;
+            keyTime = new Date().getTime()+300;
             if(handler.hasMessages(0)){
                 handler.removeMessages(0);
             }
@@ -469,6 +472,9 @@
     public void KeyResultEvent(KeyResultEvent e){
         if(!isFinishing()){
             if(selectBean!=null){
+                if(doAction==5||doAction==6||doAction==8||doAction==9){
+                    return;
+                }
                 //鏍¢獙鏃堕棿
                 if(keyTime==null){
                     return;
@@ -480,6 +486,19 @@
                 if(handler.hasMessages(0)){
                     handler.removeMessages(0);
                 }
+                if("1".equals(e.getType())){
+                    //1鍙锋澘
+                    if(!"1".equals(selectBean.getBoardCode())){
+                        EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅3"));
+                        return;
+                    }
+                }else if("2".equals(e.getType())){
+                    //2鍙锋澘
+                    if(!"2".equals(selectBean.getBoardCode())){
+                        EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅4"));
+                        return;
+                    }
+                }
                 String key = SportUtils.intToHex(Integer.parseInt(selectBean.getBoardCode()))
                         +SportUtils.intToHex(Integer.parseInt(selectBean.getChannelCode()));
                 if(flag==0) {

--
Gitblit v1.9.3