V1.108 edit by lijun 2025-04-28 1.添加锁具ID卡信息读取

DELL

2025-04-28 e6eb7fb0af366e370f125668d62e89eb0004f517

 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) {
@@ -495,6 +509,16 @@
               }else {
                  op_result = "设置锁具工作模式失败" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
               }
            }else if(ElectLock_ComBase.LOCK_SET_Bluetooth_ADDR == rtu_rx.reg_addr) {
               if(rtu_rx.result == 1) {
                  isSuccess = true;
                  op_result = "锁具开启蓝牙成功" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
               }else if(rtu_rx.result == 0) {
                  isSuccess = true;
                  op_result = "锁具关闭蓝牙成功" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
               }else {
                  op_result = "锁具设置蓝牙失败" + Com.get_DTF(new Date(), Com.DTF_YMDhms);
               }
            }
            
//            if(Power_ComBase.PWD_DoorControl_RegAddr_Start == rtu_rx.reg_addr) {