From 1af31e38c6a2cd072ed310149c656780610fe57b Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 21 四月 2025 08:42:54 +0800
Subject: [PATCH] 2.修复锁具开启之后记录bug
---
ElectLock_Monitor/src/com/dev/lock/data/ElectLock_ComBase.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_ComBase.java b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_ComBase.java
index 7b288e6..b773337 100644
--- a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_ComBase.java
+++ b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_ComBase.java
@@ -2,9 +2,13 @@
public class ElectLock_ComBase {
+ public static final int Lock_MaxLineCount = 254; //涓�涓覆鍙ｆ湇鍔″櫒鏈�澶ц繛鎺ラ攣鍏蜂釜鏁�
public static final int Lock_Model_OffLine = 0; //绂荤嚎妯″紡
public static final int Lock_Model_OnLine = 1; //鍦ㄧ嚎妯″紡
+
+ public static final int Lock_Bluetooth_Close = 0; //钃濈墮鍏抽棴
+ public static final int Lock_Bluetooth_Open = 1; //钃濈墮寮�鍚�
public static final int CMD_Fail = -1; //澶辫触
@@ -27,25 +31,32 @@
public static final int CMD_RemoveIdCard = 0x20; //绉婚櫎鎺堟潈鍗D
public static final int CMD_RemoveIdCard_Ack = 0x21; //绉婚櫎鎺堟潈鍗D鎴愬姛
+ public static final int CMD_OpenBluetooth = 0x24; //寮�鍚摑鐗�
+ public static final int CMD_OpenBluetooth_Ack = 0x25; //寮�鍚摑鐗欐垚鍔�
- public static final int Auth_Fail = 0; //鎺堟潈澶辫触
- public static final int Auth_Success = 1; //鎺堟潈鎴愬姛
+ public static final int CMD_CloseBluetooth = 0x26; //鍏抽棴钃濈墮
+ public static final int CMD_CloseBluetooth_Ack = 0x27; //鍏抽棴钃濈墮鎴愬姛
- public static final int LOCK_REAL_ADDR = 0; //瀹炴椂鏁版嵁鍦板潃
-
- public static final int LOCK_CLEAR_AUTH_ADDR = 0; //娓呯┖鎵�鏈夋巿鏉冨湴鍧�
- public static final int LOCK_REMOTE_OPEN_ADDR = 1; //杩滅▼寮�閿佸湴鍧�
- public static final int LOCK_RESTART_ADDR = 2; //杩滅▼閲嶅惎鍦板潃
-
- public static final int LOCK_SET_ADDR_ADDR = 0; //璁剧疆璁惧鍦板潃
- public static final int LOCK_Add_ID_AUTH_ADDR = 1; //鎺堟潈ID鍗″湴鍧�
- public static final int LOCK_Clear_ID_AUTH_ADDR = 3; //鍙栨秷鎺堟潈ID鍗″湴鍧�
- public static final int LOCK_SET_Model_ADDR = 5; //璁剧疆閿佸叿宸ヤ綔妯″紡
+ public static final int Auth_Fail = 0; //鎺堟潈澶辫触
+ public static final int Auth_Success = 1; //鎺堟潈鎴愬姛
- public static final int RegCount_Sigle = 1; //鍗曠偣鎺у埗鏃剁偣浣�
- public static final int RegCount_Double = 2; //ID鍗℃帶鍒舵椂鐐逛綅
+ public static final int LOCK_REAL_ADDR = 0; //瀹炴椂鏁版嵁鍦板潃
+
+ public static final int LOCK_CLEAR_AUTH_ADDR = 0; //娓呯┖鎵�鏈夋巿鏉冨湴鍧�
+ public static final int LOCK_REMOTE_OPEN_ADDR = 1; //杩滅▼寮�閿佸湴鍧�
+ public static final int LOCK_RESTART_ADDR = 2; //杩滅▼閲嶅惎鍦板潃
+
+ public static final int LOCK_SET_ADDR_ADDR = 0; //璁剧疆璁惧鍦板潃
+ public static final int LOCK_Add_ID_AUTH_ADDR = 1; //鎺堟潈ID鍗″湴鍧�
+ public static final int LOCK_Clear_ID_AUTH_ADDR = 3; //鍙栨秷鎺堟潈ID鍗″湴鍧�
+ public static final int LOCK_SET_Model_ADDR = 5; //璁剧疆閿佸叿宸ヤ綔妯″紡
+ public static final int LOCK_SET_Bluetooth_ADDR = 6; //璁剧疆钃濈墮寮�鍏冲湴鍧�
+
+
+ public static final int RegCount_Sigle = 1; //鍗曠偣鎺у埗鏃剁偣浣�
+ public static final int RegCount_Double = 2; //ID鍗℃帶鍒舵椂鐐逛綅
public static final int Control_Value = 0xFF00; //鎺у埗鏃跺啓鍏ュ��
@@ -59,6 +70,8 @@
public static final int CtlType_RemoveIdCard = 6; //绉婚櫎鎺堟潈鍗D
public static final int CtlType_Bluetooth = 7; //钃濈墮寮�閿�
public static final int CtlType_IDCardOpen = 8; //ID寮�閿�
+ public static final int CtlType_BluetoothOpen = 9; //钃濈墮寮�鍚�
+ public static final int CtlType_BluetoothClose = 10; //钃濈墮鍏抽棴
/************************************************************************************/
--
Gitblit v1.9.1