From c5d336ee11991456b69d00257124ea1627e985b7 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期三, 15 一月 2025 17:05:12 +0800
Subject: [PATCH] V1.109 edit by lijun 2025-01-15 1.通信协议新增读取电子锁蓝牙MAC地址数据
---
ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
index deac7e6..b708fd9 100644
--- a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
+++ b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
@@ -13,7 +13,8 @@
public static final int Unlock_Type_DI = 3; //DI
- public static int Reg_Count_Real = 8; //瀵勫瓨鍣ㄦ暟閲�
+// public static int Reg_Count_Real = 8; //瀵勫瓨鍣ㄦ暟閲�
+ public static int Reg_Count_Real = 11; //瀵勫瓨鍣ㄦ暟閲�
private Date record_time; //'鏇存柊鏃堕棿',
private String gprs_sn; //'gprs妯″潡SN鐮�',
@@ -37,6 +38,8 @@
private boolean isIDOpen = false; //鏄惁鏄疘D寮�閿�
private int last_unlock_type; //'涓婁竴娆″紑閿佹柟寮廩0-485寮�閿� 1-鍒峰崱寮�閿� 2-钃濈墮寮�閿� 3-DI寮�閿乚',
private int last_unlock_id; //'涓婁竴娆″埛寮�寮�閿佸崱鍙穂浠呭埛寮�寮�閿佹椂鏈夋晥]',
+
+ private int[] mac_addr = new int[6]; //閿佸叿钃濈墮MAC鍦板潃
private String ctl_uname = ""; //鎿嶄綔鐢ㄦ埛鍚�
@@ -66,6 +69,12 @@
this.unlock_id = (buffer.getInt()&0xFFFFFFFF); //'涓婁竴娆″埛寮�寮�閿佸崱鍙穂浠呭埛寮�寮�閿佹椂鏈夋晥]',
this.lock_addr = ComBase.changeShortToInt(buffer.getShort()); //'璁惧鍦板潃',
+ for(int k =0;k<mac_addr.length;k++) {
+ mac_addr[k] = ComBase.changeByteToInt(buffer.get());
+ }
+
+// System.out.println("BlutoothMAC:" + getLockMacAddr());
+
//System.out.println("this.lock_state:"+tmp_lock_state+"********lock_state:"+lock_state);
if(this.lock_state != tmp_lock_state && this.lock_state == 1) {
//閿佸叿鐘舵�佸彉鍖�;閿佷粠鍏抽棴鍙樹负鎵撳紑
@@ -79,6 +88,10 @@
buffer.compact();
return true;
+ }
+
+ public String getLockMacAddr() {
+ return String.format("%02x:%02x:%02x:%02x:%02x:%02x", mac_addr[0],mac_addr[1],mac_addr[2],mac_addr[3],mac_addr[4],mac_addr[5]).toUpperCase();
}
public int getLockDevId() {
@@ -293,4 +306,9 @@
+ ", lock_addr_set=" + lock_addr_set + "]";
}
+
+ public static void main(String[] args) {
+ int[] ss = new int[] {1,58,65,21,54,23};
+ System.out.println(String.format("%02x:%02x:%02x:%02x:%02x:%02x", ss[0],ss[1],ss[2],ss[3],ss[4],ss[5]).toUpperCase());
+ }
}
--
Gitblit v1.9.1