From eb746715527db9b42740db84bb576735185e21cd Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 28 四月 2025 15:30:27 +0800
Subject: [PATCH] 11111
---
ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 101 insertions(+), 7 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 2bac998..9e2c0e5 100644
--- a/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
+++ b/ElectLock_Monitor/src/com/dev/lock/data/ElectLock_State.java
@@ -15,8 +15,14 @@
// public static int Reg_Count_Real = 8; //瀵勫瓨鍣ㄦ暟閲�
// public static int Reg_Count_Real = 11; //瀵勫瓨鍣ㄦ暟閲�
- public static int Reg_Count_Real = 12; //瀵勫瓨鍣ㄦ暟閲�
+// public static int Reg_Count_Real = 12; //瀵勫瓨鍣ㄦ暟閲�
+ public static int Reg_Count_Real = 14; //瀵勫瓨鍣ㄦ暟閲�
+
+ public static int Reg_Count_Card = 100; //璇诲彇宸叉巿鏉冪數姹犲崱瀵勫瓨鍣ㄦ暟閲�
+
+
+ private int lock_id; //閿佸叿ID[褰撳墠闇�瑕佹搷浣滅殑閿佸叿ID鍙穄
private Date record_time = new Date(0); //'鏇存柊鏃堕棿',
private String gprs_sn; //'gprs妯″潡SN鐮�',
private String client_ip; //'璁惧IP鍦板潃',
@@ -31,7 +37,7 @@
private int err_tol_count; //'鎬婚敊璇鏁�',
private int err_count; //'杩炵画閿欒璁℃暟',
private int op_cmd; //'鎺у埗鍛戒护',
- private int id_card_set; //'鎺堟潈ID鍗″彿',
+ private long id_card_set; //'鎺堟潈ID鍗″彿',
private int lock_addr_set; //'璁剧疆璁惧鍦板潃[鎱庣敤]',
private int workmodel; //宸ヤ綔妯″紡銆�0-绂荤嚎妯″紡 1-鍦ㄧ嚎妯″紡銆�
@@ -45,9 +51,16 @@
private String ctl_uname = ""; //鎿嶄綔鐢ㄦ埛鍚�
+ private int bluetooth_st_state; //钃濈墮寮�鍏筹細0-鍏抽棴钃濈墮 1-寮�鍚摑鐗�
+ private int bluetooth_state; //钃濈墮鐘舵�侊細0锛氳摑鐗欏凡鍏抽棴锛�1锛氳摑鐗欏凡寮�鍚�
+
private int lock_open_count; //'閿佸叿鎬诲紑鍚鏁�'
- private Date last_update_time; //涓婁竴娆￠攣鍏峰紑鍚垨鍏抽棴鏃堕棿
+ private Date last_update_time = new Date(0); //涓婁竴娆￠攣鍏峰紑鍚垨鍏抽棴鏃堕棿
+
+ private long[] id_cards = new long[ElectLock_ComBase.Lock_MaxCardCount];
+
+ private int readCount = 0; //璇诲彇鏁版嵁娆℃暟锛岀敤浜庤鍙栧凡鎺堟潈鍗″彿
public ElectLock_State() {
@@ -78,9 +91,15 @@
for(int k =0;k<mac_addr.length;k++) {
mac_addr[k] = ComBase.changeByteToInt(buffer.get());
}
- workmodel = ComBase.changeShortToInt(buffer.getShort());
+ workmodel = ComBase.changeShortToInt(buffer.getShort());
- System.out.println("宸ヤ綔妯″紡锛�" + workmodel);
+ bluetooth_st_state = ComBase.changeShortToInt(buffer.getShort());
+ bluetooth_state = ComBase.changeShortToInt(buffer.getShort());
+
+// System.out.println("宸ヤ綔妯″紡锛�" + workmodel);
+// System.out.println("BlutoothMAC:" + getLockMacAddr());
+// System.out.println("bluetooth_st_state:" + getBluetooth_st_state());
+// System.out.println("bluetooth_state:" + getBluetooth_state());
// System.out.println("BlutoothMAC:" + getLockMacAddr());
//System.out.println("this.lock_state:"+tmp_lock_state+"********lock_state:"+lock_state);
@@ -99,7 +118,26 @@
this.last_update_time = new Date();
}
record_time = new Date();
+ readCount ++;
+ if(readCount >= 999998) {
+ readCount = 0;
+ }
buffer.compact();
+ return true;
+ }
+
+
+ public boolean putCardByteBuffer(ByteBuffer buffer,int idx) {
+ if(buffer.limit() < (Reg_Count_Card*2)) {
+ System.out.println("瀹炴椂淇℃伅杩斿洖闀垮害閿欒" + buffer.limit());
+ return false;
+ }
+
+ buffer.order(ByteOrder.BIG_ENDIAN);
+ buffer.position(0);
+ for(int k = idx;k<(idx+50) && k < ElectLock_ComBase.Lock_MaxCardCount;k++) {
+ id_cards[k] = (buffer.getInt()&0xFFFFFFFF);
+ }
return true;
}
@@ -107,6 +145,49 @@
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 void resetLockMacAddr() {
+ for(int n=0;n<mac_addr.length;n++) {
+ mac_addr[n] = 0xFF;
+ }
+ }
+
+
+
+ public int getReadCount() {
+ return readCount;
+ }
+
+
+ public long[] getId_cards() {
+ return id_cards;
+ }
+
+
+ public void setId_cards(long[] id_cards) {
+ this.id_cards = id_cards;
+ }
+
+
+ public int getBluetooth_st_state() {
+ return bluetooth_st_state;
+ }
+
+
+ public int getBluetooth_state() {
+ return bluetooth_state;
+ }
+
+
+ public void setBluetooth_st_state(int bluetooth_st_state) {
+ this.bluetooth_st_state = bluetooth_st_state;
+ }
+
+
+ public void setBluetooth_state(int bluetooth_state) {
+ this.bluetooth_state = bluetooth_state;
+ }
+
+
public int getLockDevId() {
return 10000000 + this.lock_addr;
}
@@ -211,7 +292,7 @@
return op_cmd;
}
- public int getId_card_set() {
+ public long getId_card_set() {
return id_card_set;
}
@@ -275,7 +356,7 @@
this.op_cmd = op_cmd;
}
- public void setId_card_set(int id_card_set) {
+ public void setId_card_set(long id_card_set) {
this.id_card_set = id_card_set;
}
@@ -313,6 +394,19 @@
}
+ public int getLock_id() {
+ return lock_id;
+ }
+
+ public int getLockAddr() {
+ return lock_id%1000;
+ }
+
+ public void setLock_id(int lock_id) {
+ this.lock_id = lock_id;
+ }
+
+
public void addCommCount() {
this.comm_count ++ ;
if(this.comm_count > 999990000) {
--
Gitblit v1.9.1