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 | 210 ++++++++++++++++++++++++++++------------------------
1 files changed, 112 insertions(+), 98 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 b9a76ca..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,8 +23,10 @@
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;
import com.doumee.keyCabinet.event.OpenGridEvent;
import com.doumee.keyCabinet.event.OpenGridListEvent;
import com.doumee.keyCabinet.event.OpenGridOneResultEvent;
@@ -58,6 +60,7 @@
private int status;
private int ysDownCount = 10;
+ private boolean isChose;
@Override
public int getLayoutId() {
@@ -73,6 +76,9 @@
adapter = new CabinetRcvAdapter(this, R.layout.cabinet_rcv_item, new CabinetRcvAdapter.OnItemClick() {
@Override
public void onItemClick(KeyCabinetBean item) {
+ if(isChose){
+ return;
+ }
selectBean = item;
}
});
@@ -151,6 +157,10 @@
Toast.makeText(mContext, "璇烽�夋嫨鏌滈棬", Toast.LENGTH_SHORT).show();
return;
}
+ if(isChose){
+ return;
+ }
+ isChose = true;
if(isOpening){
return;
}
@@ -158,9 +168,10 @@
//寮�鍚煖闂�
getVM().openGridDriver(selectBean);
downTime = 60;
+ getDB().tvTitle.setVisibility(View.GONE);
break;
case 2:
- getDB().clTip1.setVisibility(View.GONE);
+ //getDB().clTip1.setVisibility(View.GONE);
if(status==0) {
//閲嶆柊寮�闂�
openTime = StringUtil.DateToStr(new Date());
@@ -183,7 +194,7 @@
isOpening = false;
//寮�鍚垚鍔�
status=1;
- if("0".equals(flag)) {
+ if(flag==0) {
getDB().imgTip2.setImageResource(R.mipmap.ic_notclose_key);
getDB().tvTip22.setText("璇烽鍙栭挜鍖欏悗鍏抽棴鏌滈棬");
}else {
@@ -193,7 +204,6 @@
getDB().tvTip21.setText(getTipText(selectBean.getCode(),"鏌滈棬鎵撳紑鎴愬姛"), TextView.BufferType.SPANNABLE);
getDB().clTip1.setVisibility(View.GONE);
getDB().clTip2.setVisibility(View.VISIBLE);
- EventBus.getDefault().post(new GetKeyStatusEvent());
ysDownCount = 8;
break;
case 7:
@@ -273,6 +283,12 @@
private SpannableString getErrPhoneText(){
String phone = MApplication.getConfigBean().getLinkPhone();
+ if(phone==null){
+ String text = "濡傛湁闂璇疯仈绯荤鐞嗗憳";
+ SpannableString styledText = new SpannableString(text);
+ styledText.setSpan(new TextAppearanceSpan(this, R.style.style_tip3), 0, text.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ return styledText;
+ }
String text = "濡傛湁闂璇疯仈绯荤鐞嗗憳"+phone;
SpannableString styledText = new SpannableString(text);
styledText.setSpan(new TextAppearanceSpan(this, R.style.style_tip2), 0, text.length()-phone.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -291,6 +307,8 @@
@Override
protected void onDestroy() {
super.onDestroy();
+ handler.removeCallbacksAndMessages(null);
+ handler = null;
}
private String openTime = "";
@@ -300,6 +318,10 @@
if(selectBean!=null){
String key = SportUtils.intToHex(Integer.parseInt(selectBean.getBoardCode()))
+SportUtils.intToHex(Integer.parseInt(selectBean.getChannelCode()));
+ //寮�闂ㄦ垚鍔燂紝绉婚櫎寮�闂�
+ if(handler.hasMessages(1)){
+ handler.removeMessages(1);
+ }
if(key.equals(e.getKey())) {
if (e.getIsOpen()==1) {
//寮�闂ㄦ垚鍔�
@@ -307,8 +329,7 @@
return;
}
isOpened = true;
- Toast.makeText(mContext, "鎿嶄綔4", Toast.LENGTH_LONG).show();
- doRegister(4, null);
+ getVM().doAction(4);
} else {
//澶辫触
//濡傛灉鏄挜鍖欎笉瀵圭户缁紑闂�
@@ -321,105 +342,48 @@
}
if (!gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//閽ュ寵涓嶅尮閰�
- doRegister(10,null);
+ getVM().doAction(10,null);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
return;
}
}
- doRegister(3, null);
+ getVM().doAction(3);
}
}
}
}
}
+ private Long keyTime;
private boolean isOpened = false;
@Subscribe(threadMode= ThreadMode.MAIN)
public void CloseGridOneResultEvent(CloseGridOneResultEvent e){
if(!isFinishing()){
- //鑾峰彇鍗″彿
- EventBus.getDefault().post(new GetKeyStatusEvent());
- 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;
- doRegister(6, null);
- getVM().closeGrid(gridDo);
- }else {
- //閽ュ寵涓嶅尮閰�
- //Toast.makeText(mContext, "鎿嶄綔10", Toast.LENGTH_LONG).show();
- doRegister(10,null);
- EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
- }
- } else {
- //閽ュ寵鎷胯蛋浜�
- isOpened = false;
- doRegister(5, null);
- 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;
- doRegister(8, null);
- getVM().closeGrid(gridDo);
- }else {
- //閽ュ寵涓嶅尮閰�
- doRegister(10,null);
- EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
- }
- } else {
- //閽ュ寵鏈綊杩�
- isOpened = false;
- doRegister(9, null);
- getVM().closeGrid(gridDo);
- }
- }else {
- ToastView.show(MApplication.mContext, "鏈煡璇㈠埌瑙勬牸淇℃伅");
- }
- } else {
- //鍏抽棬澶辫触
- }
- }
- }
+ //鍏抽棬鎴愬姛锛岀Щ闄ゅ紑闂�
+ if(handler.hasMessages(1)){
+ 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);
+ }
+ }
+
+ @Subscribe(threadMode= ThreadMode.MAIN)
+ public void OpenErrEvent(OpenErrEvent e){
+ //寮�闂ㄥけ璐�
+ if(!isFinishing()){
+ //寮�闂�
+ if(handler.hasMessages(1)){
+ handler.removeMessages(1);
+ }
+ EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
+ handler.sendEmptyMessageDelayed(1,1000);
}
}
@@ -427,6 +391,32 @@
public void KeyResultEvent(KeyResultEvent e){
if(!isFinishing()){
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)){
+ 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) {
@@ -440,25 +430,24 @@
if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//棰嗗彇澶辫触
isOpened = false;
- doRegister(6, null);
+ getVM().doAction(6);
getVM().closeGrid(gridDo);
}else {
//閽ュ寵涓嶅尮閰�
- //Toast.makeText(mContext, "鎿嶄綔10", Toast.LENGTH_LONG).show();
- doRegister(10,null);
+ getVM().doAction(10);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
}
} else {
//閽ュ寵鎷胯蛋浜�
isOpened = false;
- doRegister(5, null);
+ getVM().doAction(5);
getVM().closeGrid(gridDo);
}
}else {
//娌″叧闂�
if(TextUtils.isEmpty(gridDo.getCurKeyCode())){
//绌轰簡
- doRegister(7,null);
+ getVM().doAction(7);
}
}
}else {
@@ -466,6 +455,7 @@
}
}else {
//褰掕繕
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅5"));
CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
if (gridDo != null) {
if (gridDo.getIsOpen() == 0) {
@@ -474,24 +464,28 @@
if (gridDo.getCurKeyCode().equals(selectBean.getKeyCode())) {
//鐩稿悓褰掕繕鎴愬姛
isOpened = false;
- doRegister(8, null);
+ getVM().doAction(8);
getVM().closeGrid(gridDo);
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅-褰掕繕鎴愬姛"));
}else {
//閽ュ寵涓嶅尮閰�
- doRegister(10,null);
+ getVM().doAction(10);
EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
}
} else {
//閽ュ寵鏈綊杩�
isOpened = false;
- doRegister(9, null);
+ getVM().doAction(9);
getVM().closeGrid(gridDo);
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅-閽ュ寵鏈綊杩�"));
}
}else {
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅-娌″叧闂�"));
//娌″叧闂�
if(!TextUtils.isEmpty(gridDo.getCurKeyCode())){
//鏈夐挜鍖欎簡
- doRegister(7,null);
+ getVM().doAction(7);
+ EventBus.getDefault().post(new HttpEvent("xxxxxxxxxx==>閽ュ寵淇℃伅-娌″叧闂�-鏈夐挜鍖�"));
}
}
} else {
@@ -501,4 +495,24 @@
}
}
}
+
+ private Handler handler = new Handler(){
+ @Override
+ public void handleMessage(@NonNull Message msg) {
+ switch (msg.what){
+ case 0:
+ //閲嶆柊鍙戦�侀挜鍖欐煡璇�
+ //鍙戦�佹煡璇㈤挜鍖欏彿
+ EventBus.getDefault().post(new GetKeyStatusEvent());
+ handler.sendEmptyMessageDelayed(0,1200);
+ break;
+ case 1:
+ EventBus.getDefault().post(new OpenGridEvent(selectBean.getChannelCode(), selectBean.getBoardCode()));
+ handler.sendEmptyMessageDelayed(1,1000);
+ break;
+ default:
+ break;
+ }
+ }
+ };
}
\ No newline at end of file
--
Gitblit v1.9.3