From 11a814e836495cb0de25eaa670c75338d85e5e42 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期四, 13 三月 2025 21:07:01 +0800
Subject: [PATCH] V1.111 edit by lijun 2025-03-13 1.新增锁具工作模式读取 2.新增根据平台锁具模式设置当前所有锁具的模式
---
ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java | 15 ++++++++++++++-
1 files changed, 14 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 f2f8da7..7c3a640 100644
--- a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
+++ b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
@@ -14,7 +14,8 @@
// public static int Reg_Count_Real = 8; //瀵勫瓨鍣ㄦ暟閲�
- public static int Reg_Count_Real = 11; //瀵勫瓨鍣ㄦ暟閲�
+// public static int Reg_Count_Real = 11; //瀵勫瓨鍣ㄦ暟閲�
+ public static int Reg_Count_Real = 12; //瀵勫瓨鍣ㄦ暟閲�
private Date record_time = new Date(0); //'鏇存柊鏃堕棿',
private String gprs_sn; //'gprs妯″潡SN鐮�',
@@ -32,6 +33,7 @@
private int op_cmd; //'鎺у埗鍛戒护',
private int id_card_set; //'鎺堟潈ID鍗″彿',
private int lock_addr_set; //'璁剧疆璁惧鍦板潃[鎱庣敤]',
+ private int workmodel; //宸ヤ綔妯″紡銆�0-绂荤嚎妯″紡 1-鍦ㄧ嚎妯″紡銆�
private int lock_online; //閿佸叿鍦ㄧ嚎鐘舵�乕0-绂荤嚎 1-鍦ㄧ嚎]
@@ -76,6 +78,7 @@
for(int k =0;k<mac_addr.length;k++) {
mac_addr[k] = ComBase.changeByteToInt(buffer.get());
}
+ workmodel = ComBase.changeShortToInt(buffer.getShort());
// System.out.println("BlutoothMAC:" + getLockMacAddr());
@@ -147,6 +150,16 @@
}
+ public int getWorkmodel() {
+ return workmodel;
+ }
+
+
+ public void setWorkmodel(int workmodel) {
+ this.workmodel = workmodel;
+ }
+
+
public int getMax_id_count() {
return max_id_count;
}
--
Gitblit v1.9.1