From 338e7ed513d21d1468c0908fdca2ea4097ee0621 Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期三, 10 十二月 2025 18:42:42 +0800
Subject: [PATCH] 指纹钥匙柜
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/keyCabinet/KeyCabinetActivity.java | 91 +++++----------------------------------------
1 files changed, 11 insertions(+), 80 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 daaca99..c006208 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;
@@ -363,92 +364,13 @@
handler.removeMessages(1);
}
//鑾峰彇鍗″彿
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>鍏抽棬锛岃幏鍙栭挜鍖欎俊鎭�"));
EventBus.getDefault().post(new GetKeyStatusEvent());
keyTime = new Date().getTime()+500;
if(handler.hasMessages(0)){
handler.removeMessages(0);
}
handler.sendEmptyMessageDelayed(0,1200);
- /*if(selectBean!=null){
- String key = SportUtils.intToHex(Integer.parseInt(selectBean.getBoardCode()))
- +SportUtils.intToHex(Integer.parseInt(selectBean.getChannelCode()));
- if(key.equals(e.getKey())) {
- stopCountTimer();
- if(flag==0) {
- //棰嗗彇
- if (e.getIsOpen() == 0) {
- //鍏抽棬鎴愬姛
- //鏌ヨ閽ュ寵鍙�
- CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
- if (gridDo != null) {
- if(gridDo.getUpdateTime().compareTo(openTime)<0){
- //寮�闂ㄥ墠鏁版嵁锛屼笉鑳戒娇鐢�
- EventBus.getDefault().post(new GetKeyStatusEvent());
- return;
- }
- //Toast.makeText(mContext, "1:"+gridDo.getKeyCode()+"锛�2:"+selectBean.getKeyCode(), Toast.LENGTH_LONG).show();
- if (!TextUtils.isEmpty(gridDo.getCurKeyCode())) {
- if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
- //棰嗗彇澶辫触
- isOpened = false;
- getVM().doAction(6);
- getVM().closeGrid(gridDo);
- }else {
- //閽ュ寵涓嶅尮閰�
- getVM().doAction(10,null);
- EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
- }
- } else {
- //閽ュ寵鎷胯蛋浜�
- isOpened = false;
- getVM().doAction(5);
- getVM().closeGrid(gridDo);
- }
- }else {
- ToastView.show(MApplication.mContext, "鏈煡璇㈠埌瑙勬牸淇℃伅");
- }
- } else {
- //鍏抽棬澶辫触
- }
- }else {
- //褰掕繕
- if (e.getIsOpen() == 0) {
- //鍏抽棬鎴愬姛
- //鏌ヨ閽ュ寵鍙�
- CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
- if (gridDo != null) {
- if(gridDo.getUpdateTime().compareTo(openTime)<0){
- //寮�闂ㄥ墠鏁版嵁锛屼笉鑳戒娇鐢�
- EventBus.getDefault().post(new GetKeyStatusEvent());
- return;
- }
- //Toast.makeText(mContext, "1:"+gridDo.getKeyCode()+"锛�2:"+selectBean.getKeyCode(), Toast.LENGTH_LONG).show();
- if (!TextUtils.isEmpty(gridDo.getCurKeyCode())) {
- if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
- //鐩稿悓褰掕繕鎴愬姛
- isOpened = false;
- getVM().doAction(8);
- getVM().closeGrid(gridDo);
- }else {
- //閽ュ寵涓嶅尮閰�
- getVM().doAction(10,null);
- EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
- }
- } else {
- //閽ュ寵鏈綊杩�
- isOpened = false;
- getVM().doAction(9);
- getVM().closeGrid(gridDo);
- }
- }else {
- ToastView.show(MApplication.mContext, "鏈煡璇㈠埌瑙勬牸淇℃伅");
- }
- } else {
- //鍏抽棬澶辫触
- }
- }
- }
- }*/
}
}
@@ -471,10 +393,12 @@
if(selectBean!=null){
//鏍￠獙鏃堕棿
if(keyTime==null){
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅1"));
return;
}
if(keyTime!=null&&keyTime>System.currentTimeMillis()){
//鏍￠獙杩斿洖鏃堕棿<鍛戒护鏃堕棿
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅2"));
return;
}
if(handler.hasMessages(0)){
@@ -483,11 +407,13 @@
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;
}
}
@@ -529,6 +455,7 @@
}
}else {
//褰掕繕
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅5"));
CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
if (gridDo != null) {
if (gridDo.getIsOpen() == 0) {
@@ -539,6 +466,7 @@
isOpened = false;
getVM().doAction(8);
getVM().closeGrid(gridDo);
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅-褰掕繕鎴愬姛"));
}else {
//閽ュ寵涓嶅尮閰�
getVM().doAction(10);
@@ -549,12 +477,15 @@
isOpened = false;
getVM().doAction(9);
getVM().closeGrid(gridDo);
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅-閽ュ寵鏈綊杩�"));
}
}else {
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅-娌″叧闂�"));
//娌″叧闂�
if(!TextUtils.isEmpty(gridDo.getCurKeyCode())){
//鏈夐挜鍖欎簡
getVM().doAction(7);
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅-娌″叧闂�-鏈夐挜鍖�"));
}
}
} else {
--
Gitblit v1.9.3