From fad0704afaf4ed07963d267142cc6f625a09909d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 六月 2026 18:32:05 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
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 055412b..8818ef8 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
@@ -147,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){
@@ -365,7 +367,7 @@
}
//鑾峰彇鍗″彿
EventBus.getDefault().post(new GetKeyStatusEvent());
- keyTime = new Date().getTime()+300;
+ keyTime = new Date().getTime()+500;
if(handler.hasMessages(0)){
handler.removeMessages(0);
}
@@ -470,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;
--
Gitblit v1.9.3