V1.115 edit by lijun 2025-04-28 1.修复读取已授权的后50个卡ID信息地址错误bug

DELL

2025-04-28 03963fff577c2ed02954e8638a6ab959b32611f9

V1.115 edit by lijun 2025-04-28
	1.修复读取已授权的后50个卡ID信息地址错误bug

 ElectLock_Monitor/bin/com/dev/lock/comm/Lock_SocketClient_Thread.class

Binary files differ

 ElectLock_Monitor/bin/com/dev/lock/data/ElectLock_Array.class

Binary files differ

 ElectLock_Monitor/bin/com/dev/lock/data/ElectLock_ComBase.class

Binary files differ

 ElectLock_Monitor/bin/com/version_inf/version_inf.txt

@@ -7,6 +7,9 @@
        

    设备ID:10000001

    

V1.115 edit by lijun 2025-04-28

    1.修复读取已授权的后50个卡ID信息地址错误bug	
	
V1.114 edit by lijun 2025-04-22

    1.新增定时开启以及关闭蓝牙功能。

    2.添加读取锁具已授权ID卡信息功能。


 ElectLock_Monitor/bin/main/main_ElectLock_Monitor.class

Binary files differ

 ElectLock_Monitor/src/com/dev/lock/comm/Lock_SocketClient_Thread.java

@@ -271,7 +271,7 @@
                    int cnt = mLock_State[NowLockIdx].getReadCount()%4;

                    if(cnt == 0 || cnt == 1) {

                        logger.error(mLock_State[NowLockIdx].getLock_id() + " ReadIDCardCount " + cnt);

                        mRtu_Tx.mkBusRtu((mLock_State[NowLockIdx].getLockAddr()%255),MyModBusRtu.CMD_TYPE_READ_INPUT, (ElectLock_ComBase.LOCK_IDCard1_ADDR + cnt*50), ElectLock_State.Reg_Count_Card);

                        mRtu_Tx.mkBusRtu((mLock_State[NowLockIdx].getLockAddr()%255),MyModBusRtu.CMD_TYPE_READ_INPUT, (ElectLock_ComBase.LOCK_IDCard1_ADDR + cnt*100), ElectLock_State.Reg_Count_Card);

                        if(SocketComm(mRtu_Tx, ByteBuffer.allocate(0))) {

                            //更新当前锁具的ID卡

                            Lock_Task_SQL.updateLock_IdCard_Table(pool, mLock_State[NowLockIdx]);


 ElectLock_Monitor/src/com/dev/lock/data/ElectLock_Array.java

@@ -25,7 +25,7 @@


    

    public boolean initEleLockData(MysqlConnPool pool) {

        String sql_str = " SELECT * FROM " + Sql_Mysql.Lock_Inf_Table + " ORDER BY lock_id ";

        String sql_str = " SELECT * FROM " + Sql_Mysql.Lock_Inf_Table + " WHERE del_flag = 0  ORDER BY lock_id ";

        Sql_Mysql sql = new Sql_Mysql(pool.getConn());

        ResultSet res = null;

        boolean isChange = false;


 ElectLock_Monitor/src/com/dev/lock/data/ElectLock_ComBase.java

@@ -60,7 +60,7 @@
    

    

    public static final int LOCK_IDCard1_ADDR                = 100;        //已录入锁具ID卡

    public static final int LOCK_IDCard2_ADDR                = 150;        //设置蓝牙开关地址

    public static final int LOCK_IDCard2_ADDR                = 200;        //已录入锁具ID卡

    

    

    public static final int RegCount_Sigle                    = 1;        //单点控制时点位


 ElectLock_Monitor/src/com/version_inf/version_inf.txt

@@ -7,6 +7,9 @@
        

    设备ID:10000001

    

V1.115 edit by lijun 2025-04-28

    1.修复读取已授权的后50个卡ID信息地址错误bug	
	
V1.114 edit by lijun 2025-04-22

    1.新增定时开启以及关闭蓝牙功能。

    2.添加读取锁具已授权ID卡信息功能。


 ElectLock_Monitor/src/main/main_ElectLock_Monitor.java

@@ -18,7 +18,7 @@


public class main_ElectLock_Monitor {

    public static final boolean app_debug = false;

    public static final double m_VersionNum = 3.114D;

    public static final double m_VersionNum = 3.115D;

    public static final String m_Version = "Welcome To Use main_ElectLock_Monitor V" + m_VersionNum + " RC_20180324";

    public static int MysqlServer_Port;

    private static AppConfig m_AppConfig;