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

DELL

2025-04-28 e6eb7fb0af366e370f125668d62e89eb0004f517

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

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/SPCommElectLock.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/data/ElectLock_ComBase.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/data/ElectLock_State.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$1$1.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$1.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$10.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$11.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$12.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$13.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$14.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$15.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$16.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$17.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$18.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$19.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$2.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$20.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$21.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$22.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$23.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$24.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$25.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$26.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$27.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$28.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$29.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$3.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$30.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$31.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$32.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$33.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$34.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$35.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$36.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$37.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$38.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$39.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$4.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$40.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$41.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$42.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$43.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$44.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$45.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$46.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$47.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$48.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$49.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$5.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$50.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$51.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$52.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$53.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$54.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$55.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$56.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$57.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$58.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$59.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$6.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$60.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$61.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$62.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$63.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$64.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$65.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$66.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$67.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$68.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$69.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$7.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$70.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$71.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$72.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$73.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$74.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$75$1.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$75.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$76.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$77.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$78.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$79.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$8.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base$9.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/com/dev/electlock/electlock_page_base.class

Binary files differ

 Device_Simulator_DTS_Tester/bin/main/main_window_computer.class

Binary files differ

 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

 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) {

 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;    //控制时写入值

    

    


 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() {


 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);            //门磁状态


 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;

 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