From c04d741f6daddd9e445a0d00adc42d1c8c45f67f Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 23 一月 2026 10:40:33 +0800
Subject: [PATCH] 钥匙柜同步柜格实际钥匙数据
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
index 204cdf4..6562451 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/main/MainActivity.java
@@ -477,6 +477,7 @@
protected void onResume() {
super.onResume();
isShowing = true;
+ getVM().setSubmit(true);
YNHAPI mAPI = YNHAPI.getInstance();
mAPI.setNavigationBarVisibility(YNHAPI.NavigationBarVisibility.ALWAYS_INVISIBLE);
mAPI.setBootLaunchApk("com.doumee.keyCabinet", true);
@@ -752,6 +753,7 @@
super.onPause();
showTime = null;
isShowing = false;
+ getVM().setSubmit(false);
}
private int finishCount;
@@ -1305,7 +1307,7 @@
getVM().addInfo(e.getMsg());
}
}
-
+ private long lastCloseDoorTime;
@Subscribe(threadMode = ThreadMode.MAIN)
public void CLGridEvent(CLGridEvent e){
if(!isFinishing()){
@@ -1378,6 +1380,7 @@
String open = data.substring(6,8);
String key = bh+tdh;
CabinetGridDo gridDo = DaoManager.getCabinetGridDao().getGridByKey(key);
+ lastCloseDoorTime = System.currentTimeMillis();
if(gridDo!=null){
gridDo.setIsOpen("00".equals(open)?1:0);
gridDo.setUpdateTime(StringUtil.DateToStr(new Date()));
@@ -1528,7 +1531,17 @@
//涓�鍙风増
bh = 1;
}
- String[] sp = data.split("AA");
+ List<String> sp = new ArrayList<>();
+ String data2 = data.substring(8,data.length());
+ while (data2.length()>0){
+ if (data2.length()<22) {
+ sp.add(data2+"");
+ data2 = "";
+ }else {
+ sp.add(data2.substring(0,22));
+ data2 = data2.substring(22);
+ }
+ }
for(String s:sp){
if(s.length()>=20){
String key = SportUtils.intToHex(bh)+s.substring(4,6);
@@ -1542,10 +1555,10 @@
}else {
gridDo.setCurKeyCode("");
}
- if("0101".equals(key)) {
+ /*if("0101".equals(key)) {
getVM().addInfo(key+" , "+isHaveKey+" "+keyCode);
getVM().addInfo(key + "璁剧疆閽ュ寵锛�" + gridDo.getCurKeyCode());
- }
+ }*/
gridDo.setUpdateTime(StringUtil.DateToStr(new Date()));
updateList.add(gridDo);
}
@@ -1553,7 +1566,7 @@
}
getVM().updateGrids(updateList);
- EventBus.getDefault().post(new KeyResultEvent());
+ EventBus.getDefault().post(new KeyResultEvent(bh+""));
}
private SerialPortModel jiuPort;
--
Gitblit v1.9.3