From e6eb7fb0af366e370f125668d62e89eb0004f517 Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 28 四月 2025 15:10:57 +0800
Subject: [PATCH] V1.108 edit by lijun 2025-04-28 1.添加锁具ID卡信息读取
---
Device_Simulator_DTS_Tester/bin/com/dev/electlock/SPCommElectLock.class | 0
Device_Simulator_DTS_Tester/bin/main/main_window_computer.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$43.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$53.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$63.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$73.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$30.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$1$1.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$10.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$40.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$50.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$20.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$60.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$70.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$57.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$9.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$37.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$47.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$67.class | 0
Device_Simulator_DTS_Tester/src/com/dev/electlock/data/ElectLock_ComBase.java | 4 +
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$75$1.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$77.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$17.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$27.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$1.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$44.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$79.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$39.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$8.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$59.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$64.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$19.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$24.class | 0
Device_Simulator_DTS_Tester/src/com/dev/electlock/data/ElectLock_State.java | 25 ++++++++
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$28.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$41.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$76.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$13.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$21.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$61.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$2.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$33.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$36.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$5.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$16.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$56.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$25.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/data/ElectLock_State.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$15.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$7.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$35.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$45.class | 0
Device_Simulator_DTS_Tester/bin/version.txt | 4 +
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$55.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$65.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$48.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$58.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$68.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$78.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$4.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$75.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$72.class | 0
Device_Simulator_DTS_Tester/src/version.txt | 4 +
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$62.class | 0
Device_Simulator_DTS_Tester/src/main/main_window_computer.java | 2
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$12.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$22.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$32.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$42.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$52.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/data/ElectLock_ComBase.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$6.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$69.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$14.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$29.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$49.class | 0
Device_Simulator_DTS_Tester/src/com/dev/electlock/electlock_page_base.java | 67 +++++++++++++++++++++-
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$3.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$34.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$54.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$74.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$66.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$18.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$38.class | 0
Device_Simulator_DTS_Tester/src/com/dev/electlock/SPCommElectLock.java | 18 +++++
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$11.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$23.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$31.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$51.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$71.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$26.class | 0
Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$46.class | 0
93 files changed, 115 insertions(+), 9 deletions(-)
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/SPCommElectLock.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/SPCommElectLock.class
index 9c5afc5..a96b799 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/SPCommElectLock.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/SPCommElectLock.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/data/ElectLock_ComBase.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/data/ElectLock_ComBase.class
index 3ae5221..9a31322 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/data/ElectLock_ComBase.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/data/ElectLock_ComBase.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/data/ElectLock_State.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/data/ElectLock_State.class
index 440d315..71737f7 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/data/ElectLock_State.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/data/ElectLock_State.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$1$1.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$1$1.class
index 9ebd5d8..a1a81aa 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$1$1.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$1$1.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$1.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$1.class
index 6ba3db7..9f3a4a3 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$1.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$1.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$10.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$10.class
index 4563e59..e2efb72 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$10.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$10.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$11.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$11.class
index dea7546..c388946 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$11.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$11.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$12.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$12.class
index 6cba219..ce63c25 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$12.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$12.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$13.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$13.class
index 0ca64e0..542fd97 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$13.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$13.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$14.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$14.class
index db40d92..7d11a99 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$14.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$14.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$15.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$15.class
index 70905bd..984f993 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$15.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$15.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$16.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$16.class
index 659a449..0768409 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$16.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$16.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$17.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$17.class
index 46639ec..37fa3c2 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$17.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$17.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$18.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$18.class
index 26b5a70..32147f0 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$18.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$18.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$19.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$19.class
index 2c9fc20..1e6da22 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$19.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$19.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$2.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$2.class
index 2dcd778..515bb60 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$2.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$2.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$20.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$20.class
index 6f5d885..7820d9a 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$20.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$20.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$21.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$21.class
index afa2f8d..48e543b 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$21.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$21.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$22.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$22.class
index 104a68c..9b2a420 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$22.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$22.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$23.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$23.class
index 70c389d..b942419 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$23.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$23.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$24.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$24.class
index 9134e61..9fe059b 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$24.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$24.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$25.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$25.class
index 1d8fa27..08aad49 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$25.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$25.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$26.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$26.class
index f66eef8..6fa4294 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$26.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$26.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$27.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$27.class
index 1289c35..82705ce 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$27.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$27.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$28.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$28.class
index f388afc..41662a0 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$28.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$28.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$29.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$29.class
index e4bba14..026bae8 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$29.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$29.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$3.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$3.class
index 6ffc6a8..a63209d 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$3.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$3.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$30.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$30.class
index e5ac1bf..ef8b5ca 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$30.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$30.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$31.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$31.class
index b096e16..c6e1aa0 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$31.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$31.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$32.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$32.class
index 9a5896c..0c7358e 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$32.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$32.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$33.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$33.class
index 15490de..4129500 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$33.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$33.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$34.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$34.class
index 8023e45..733b6a9 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$34.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$34.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$35.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$35.class
index a30f1bd..a8f5a81 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$35.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$35.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$36.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$36.class
index 2c8b8a1..20789bc 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$36.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$36.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$37.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$37.class
index 5833e0f..93768b5 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$37.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$37.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$38.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$38.class
index 849af95..e5aad0e 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$38.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$38.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$39.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$39.class
index ac72a38..8a3a1ea 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$39.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$39.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$4.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$4.class
index 9f5df5e..6e1032e 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$4.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$4.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$40.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$40.class
index 84cf563..2c9ba37 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$40.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$40.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$41.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$41.class
index f198b7c..5fbe468 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$41.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$41.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$42.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$42.class
index d57bb5b..e740410 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$42.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$42.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$43.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$43.class
index 16c7150..8ab57ba 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$43.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$43.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$44.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$44.class
index d52bf25..f3b0c25 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$44.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$44.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$45.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$45.class
index 19021fb..febcb8f 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$45.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$45.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$46.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$46.class
index 89f0575..9e535c0 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$46.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$46.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$47.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$47.class
index ea42090..f5a8b4d 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$47.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$47.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$48.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$48.class
index 24e6606..b4bf400 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$48.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$48.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$49.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$49.class
index 40186fb..f4da919 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$49.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$49.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$5.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$5.class
index b0e0d6c..0b74957 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$5.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$5.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$50.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$50.class
index 6a2a3db..95e9b92 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$50.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$50.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$51.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$51.class
index b6c3a3c..65e7955 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$51.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$51.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$52.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$52.class
index 4394bc0..d014e63 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$52.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$52.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$53.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$53.class
index 23735fb..174f4bc 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$53.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$53.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$54.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$54.class
index 50b9fff..10168bd 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$54.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$54.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$55.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$55.class
index f689e0a..8803c29 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$55.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$55.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$56.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$56.class
index ed377ae..d18fa55 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$56.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$56.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$57.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$57.class
index ac8c00d..1cc9058 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$57.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$57.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$58.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$58.class
index a1cd81d..0ed8b8e 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$58.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$58.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$59.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$59.class
index 951a187..245162f 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$59.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$59.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$6.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$6.class
index 3a01ac5..9165901 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$6.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$6.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$60.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$60.class
index 5498131..2e8dc0f 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$60.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$60.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$61.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$61.class
index a7a6cc2..177ac17 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$61.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$61.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$62.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$62.class
index 87e0bc0..e1d1d0d 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$62.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$62.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$63.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$63.class
index fd85c75..4b02f2f 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$63.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$63.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$64.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$64.class
index f8c8d60..44f5a24 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$64.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$64.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$65.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$65.class
index 7781d6e..b14ff8f 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$65.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$65.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$66.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$66.class
index c3a9afa..e2f3996 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$66.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$66.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$67.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$67.class
index 87a23c9..ca39d15 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$67.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$67.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$68.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$68.class
index 9ce90ce..71f81ce 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$68.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$68.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$69.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$69.class
index 43bc568..ec39257 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$69.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$69.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$7.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$7.class
index 2fc9673..5702ef9 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$7.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$7.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$70.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$70.class
index bfd3048..49562a9 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$70.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$70.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$71.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$71.class
index 3971229..0567158 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$71.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$71.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$72.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$72.class
index 6358618..1742d93 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$72.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$72.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$73.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$73.class
index 3616c4d..8609709 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$73.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$73.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$74.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$74.class
index 9d34cb9..8008bfd 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$74.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$74.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$75$1.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$75$1.class
index 658e3cd..3a87d55 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$75$1.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$75$1.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$75.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$75.class
index e1d78a4..f006b38 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$75.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$75.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$76.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$76.class
index ff0c47b..59d42d6 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$76.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$76.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$77.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$77.class
index f447045..fdd9a66 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$77.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$77.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$78.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$78.class
index c70848e..bc46670 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$78.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$78.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$79.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$79.class
index 34e8e47..a419d80 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$79.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$79.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$8.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$8.class
index bdd3ae6..5155b5e 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$8.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$8.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$9.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$9.class
index 5059553..07f2184 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$9.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$9.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base.class b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base.class
index c23e212..37fe85b 100644
--- a/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base.class
+++ b/Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/main/main_window_computer.class b/Device_Simulator_DTS_Tester/bin/main/main_window_computer.class
index d7eb9c7..415d2d0 100644
--- a/Device_Simulator_DTS_Tester/bin/main/main_window_computer.class
+++ b/Device_Simulator_DTS_Tester/bin/main/main_window_computer.class
Binary files differ
diff --git a/Device_Simulator_DTS_Tester/bin/version.txt b/Device_Simulator_DTS_Tester/bin/version.txt
index 1bdad64..b0c30f2 100644
--- a/Device_Simulator_DTS_Tester/bin/version.txt
+++ b/Device_Simulator_DTS_Tester/bin/version.txt
@@ -1,5 +1,7 @@
-
+智能电子锁
+V1.108 edit by lijun 2025-04-28
+ 1.添加锁具ID卡信息读取
智能电子锁
V1.107 edit by lijun 2025-04-10
diff --git a/Device_Simulator_DTS_Tester/src/com/dev/electlock/SPCommElectLock.java b/Device_Simulator_DTS_Tester/src/com/dev/electlock/SPCommElectLock.java
index 3ced3bc..998c2c3 100644
--- a/Device_Simulator_DTS_Tester/src/com/dev/electlock/SPCommElectLock.java
+++ b/Device_Simulator_DTS_Tester/src/com/dev/electlock/SPCommElectLock.java
@@ -244,11 +244,17 @@
if(++dt_cmd_cnt > 1000) {
dt_cmd_cnt = 0;
}
- rtu_rt.Cmd = MyModBusRtu.CMD_TYPE_READ_INPUT;
-
+ rtu_rt.Cmd = MyModBusRtu.CMD_TYPE_READ_INPUT;
rtu_rt.reg_addr = ElectLock_ComBase.LOCK_REAL_ADDR;
rtu_rt.reg_count = ElectLock_State.Reg_Count_Real;
+ if(dt_cmd_cnt%5 == 1) {
+ rtu_rt.reg_addr = ElectLock_ComBase.LOCK_IDCard1_ADDR;
+ rtu_rt.reg_count = ElectLock_State.Reg_Count_Card;
+ }else if(dt_cmd_cnt%5 == 2) {
+ rtu_rt.reg_addr = ElectLock_ComBase.LOCK_IDCard2_ADDR;
+ rtu_rt.reg_count = ElectLock_State.Reg_Count_Card;
+ }
} else {
//数据
@@ -446,6 +452,14 @@
if(m_ElectLock_State.putByteBuffer(bbf_rx)) {
isSuccess = true;
}
+ }else if(ElectLock_ComBase.LOCK_IDCard1_ADDR == rtu_rt.reg_addr) {
+ if(m_ElectLock_State.putCardByteBuffer(bbf_rx, 0)) {
+ isSuccess = true;
+ }
+ }else if(ElectLock_ComBase.LOCK_IDCard2_ADDR == rtu_rt.reg_addr) {
+ if(m_ElectLock_State.putCardByteBuffer(bbf_rx, 50)) {
+ isSuccess = true;
+ }
}
}else if(MyModBusRtu.CMD_TYPE_WRITE_YC == rtu_rx.Cmd){
if(ElectLock_ComBase.LOCK_CLEAR_AUTH_ADDR == rtu_rx.reg_addr) {
diff --git a/Device_Simulator_DTS_Tester/src/com/dev/electlock/data/ElectLock_ComBase.java b/Device_Simulator_DTS_Tester/src/com/dev/electlock/data/ElectLock_ComBase.java
index 265da00..f7849af 100644
--- a/Device_Simulator_DTS_Tester/src/com/dev/electlock/data/ElectLock_ComBase.java
+++ b/Device_Simulator_DTS_Tester/src/com/dev/electlock/data/ElectLock_ComBase.java
@@ -2,6 +2,7 @@
public class ElectLock_ComBase {
+ public static final int Lock_MaxCardCount = 100; //一个电子锁最大授权ID卡数量
public static final int Lock_Model_OffLine = 0; //离线模式
public static final int Lock_Model_OnLine = 1; //在线模式
@@ -50,6 +51,9 @@
public static final int RegCount_Sigle = 1; //单点控制时点位
public static final int RegCount_Double = 2; //ID卡控制时点位
+ public static final int LOCK_IDCard1_ADDR = 100; //已录入锁具ID卡
+ public static final int LOCK_IDCard2_ADDR = 200; //设置蓝牙开关地址
+
public static final int Control_Value = 0xFF00; //控制时写入值
diff --git a/Device_Simulator_DTS_Tester/src/com/dev/electlock/data/ElectLock_State.java b/Device_Simulator_DTS_Tester/src/com/dev/electlock/data/ElectLock_State.java
index a10ee9c..3b16f5e 100644
--- a/Device_Simulator_DTS_Tester/src/com/dev/electlock/data/ElectLock_State.java
+++ b/Device_Simulator_DTS_Tester/src/com/dev/electlock/data/ElectLock_State.java
@@ -20,6 +20,8 @@
// public static int Reg_Count_Real = 12; //寄存器数量
public static int Reg_Count_Real = 14; //寄存器数量
+ public static int Reg_Count_Card = 100; //读取已授权电池卡寄存器数量
+
private Date record_time = new Date(0); //'更新时间',
private String gprs_sn; //'gprs模块SN码',
private String client_ip; //'设备IP地址',
@@ -48,6 +50,8 @@
private int last_unlock_id; //'上一次刷开开锁卡号[仅刷开开锁时有效]',
private int[] mac_addr = new int[6]; //锁具蓝牙MAC地址
+
+ private long[] id_cards = new long[ElectLock_ComBase.Lock_MaxCardCount];
private String ctl_uname = ""; //操作用户名
@@ -111,6 +115,20 @@
}
record_time = new Date();
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;
}
@@ -415,6 +433,13 @@
}
err_count++;
}
+
+
+
+ public long[] getId_cards() {
+ return id_cards;
+ }
+
@Override
public String toString() {
diff --git a/Device_Simulator_DTS_Tester/src/com/dev/electlock/electlock_page_base.java b/Device_Simulator_DTS_Tester/src/com/dev/electlock/electlock_page_base.java
index a357998..5ef5bad 100644
--- a/Device_Simulator_DTS_Tester/src/com/dev/electlock/electlock_page_base.java
+++ b/Device_Simulator_DTS_Tester/src/com/dev/electlock/electlock_page_base.java
@@ -88,6 +88,12 @@
private JTextField tf_bluetooth_st_state; //蓝牙开关状态
private JTextField tf_bluetooth_state; //蓝牙状态
+ private JTable table_idcard;
+ private Vector<String> columnVector_idcard;
+ private Vector<Vector<String>> dataRow_idcard;
+
+
+
private JTextField tf_set_lock_addr; //设置锁具地址
private JButton btn_set_lock_addr; //设置锁具地址
@@ -737,11 +743,15 @@
tabbedPane.addTab("调试信息",null/*new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/target.png"))*/, panel_debug, null);
/************************ 电源遥测 ********************************************/
- panel_baseinfo.setLayout(new BorderLayout());
+ panel_baseinfo.setLayout(new BorderLayout());
+
+ JPanel panel_lockread = new JPanel();
+ panel_baseinfo.add(panel_lockread,BorderLayout.CENTER);
+ panel_lockread.setLayout(new BorderLayout());
//中间插件
JPanel panel_100 = new JPanel();
- panel_baseinfo.add(panel_100, BorderLayout.CENTER);
+ panel_lockread.add(panel_100, BorderLayout.CENTER);
panel_100.setLayout(new BorderLayout(0, 0));
// JScrollPane scrollPane_2 = new JScrollPane();
@@ -755,7 +765,7 @@
JPanel panel_101 = new JPanel();
panel_101.setLayout(new BorderLayout(0, 0));
- panel_baseinfo.add(panel_101,BorderLayout.NORTH);
+ panel_lockread.add(panel_101,BorderLayout.NORTH);
JPanel panel_102 = new JPanel();
panel_102.setLayout(new GridLayout(3,3,10,10));
@@ -877,11 +887,38 @@
panel_112.add(tf_bluetooth_state);
tf_bluetooth_state.setColumns(10);
+
+ columnVector_idcard = new Vector<String>();
+
+ String idcard_title = "编号";
+ columnVector_idcard.add(idcard_title);
+
+ idcard_title = "ID卡号";
+ columnVector_idcard.add(idcard_title);
+
+
+ dataRow_idcard = new Vector<Vector<String>>();
+
+ JScrollPane scrollPane_idcard = new JScrollPane();
+ scrollPane_idcard.setBorder(new TitledBorder(null, "已授权ID卡号", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+
+// panel_poweralm.add(scrollPane_7,BorderLayout.CENTER);
+
+ table_idcard = new JTable();
+ table_idcard.setModel(new DefaultTableModel(dataRow_idcard, columnVector_idcard));
+
+ scrollPane_idcard.setViewportView(table_idcard);
+
+
+ panel_baseinfo.add(scrollPane_idcard, BorderLayout.EAST);
+
+
+
//
JPanel panel_800 = new JPanel();
panel_800.setBorder(new TitledBorder(null, "锁具遥调", TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel_100.add(panel_800,BorderLayout.NORTH);
- panel_800.setLayout(new GridLayout(1,3,2,2));
+ panel_800.setLayout(new GridLayout(2,2,2,2));
//
JPanel panel_801 = new JPanel();
panel_801.setBorder(new TitledBorder(null, "锁具遥控", TitledBorder.LEADING, TitledBorder.TOP, null, null));
@@ -5764,6 +5801,28 @@
}
+ //更新已授权电子卡表格
+ int row_num_card = ElectLock_ComBase.Lock_MaxCardCount;
+ if(dataRow_idcard.size() != row_num_card && null != Comm_Lock.m_ElectLock_State)
+ {
+ dataRow_idcard.clear();
+ for(int n=0; n<row_num_card; n++) {
+ Vector<String> row = new Vector<String>();
+ row.addElement(String.format("%03d", n+1));
+
+ row.addElement(String.format("%s", Comm_Lock.m_ElectLock_State.getId_cards()[n]));
+
+ dataRow_idcard.add(row);
+ }
+ } else {
+
+ for(int n=0; n<row_num_card; n++) {
+ dataRow_idcard.get(n).setElementAt(String.format("%010d", Comm_Lock.m_ElectLock_State.getId_cards()[n]), 1);
+ }
+ }
+ table_idcard.updateUI();
+
+
if(null != Comm_Lock.m_RoadStateFromDev) {
this.jc_sysgate_st.setSelectedIndex(Comm_Lock.m_RoadStateFromDev.sysgate_st); //门磁状态
diff --git a/Device_Simulator_DTS_Tester/src/main/main_window_computer.java b/Device_Simulator_DTS_Tester/src/main/main_window_computer.java
index 393d559..68d7f97 100644
--- a/Device_Simulator_DTS_Tester/src/main/main_window_computer.java
+++ b/Device_Simulator_DTS_Tester/src/main/main_window_computer.java
@@ -112,7 +112,7 @@
//public String mTitle = "MSP&SAM&SWM&Curr_V1.523_220424G";
public String mTitle = "调试工具";
- public String mVerSioin = "_V1.107";
+ public String mVerSioin = "_V1.108";
public static int LANG_TYPE = LANG_TYPE_CN;
diff --git a/Device_Simulator_DTS_Tester/src/version.txt b/Device_Simulator_DTS_Tester/src/version.txt
index 1bdad64..b0c30f2 100644
--- a/Device_Simulator_DTS_Tester/src/version.txt
+++ b/Device_Simulator_DTS_Tester/src/version.txt
@@ -1,5 +1,7 @@
-
+智能电子锁
+V1.108 edit by lijun 2025-04-28
+ 1.添加锁具ID卡信息读取
智能电子锁
V1.107 edit by lijun 2025-04-10
--
Gitblit v1.9.1