Change #832

Comments

*CHG*[308]采集逻辑修改
*CHG*[308]添加其他加密方式
*CHG*[308]修改数据不齐时按照特征值和波形区分

Changed files

• src/NewWirelessDAQ/BHHelperDefine.h
• src/NewWirelessDAQ/BHPackage.h
• src/NewWirelessDAQ/ConcentratorComm.cpp
• src/NewWirelessDAQ/ConcentratorComm.h
• src/NewWirelessDAQ/DataMgr.cpp
• src/NewWirelessDAQ/DataMgr.h
• src/NewWirelessDAQ/DeviceInfoManager.cpp
• src/NewWirelessDAQ/DlgWirelessGateWaySet.cpp
• src/NewWirelessDAQ/HelperFunctions.hpp
• src/NewWirelessDAQ/HistoryDataCache.cpp
• src/NewWirelessDAQ/HistoryDataMgr.cpp
• src/NewWirelessDAQ/HistoryDataMgr.h
• src/NewWirelessDAQ/IConcentratorComm.h
• src/NewWirelessDAQ/ModbusCom.cpp
• src/NewWirelessDAQ/ModbusCom.h
• src/NewWirelessDAQ/ModbusWirelessDataSendThread.cpp
• src/NewWirelessDAQ/ModbusWirelessJson.cpp
• src/NewWirelessDAQ/ModbusWirelessParam.h
• src/NewWirelessDAQ/NewWirelessDAQ.aps
• src/NewWirelessDAQ/NewWirelessDAQ.rc
• src/NewWirelessDAQ/NewWirelessDAQ.vcproj
• src/NewWirelessDAQ/NewWirelessDAQDlg.cpp
• src/NewWirelessDAQ/SimConcentratorComm.cpp
• src/NewWirelessDAQ/SimConcentratorComm.h
• src/NewWirelessDAQ/ThreadDataProcess.cpp
• src/NewWirelessDAQ/ThreadDataProcess.h
• src/NewWirelessDAQ/ThreadWirelessDaq.cpp
• src/NewWirelessDAQ/ThreadWirelessDaq.h
• src/NewWirelessDAQ/WaveRequestMgr.cpp
• src/NewWirelessDAQ/WaveRequestMgr.h
• src/NewWirelessDAQ/WirelessDataCache.cpp
• src/NewWirelessDAQ/WirelessDataCache.h
• src/NewWirelessDAQ/WirelessGateway.cpp
• src/NewWirelessDAQ/WirelessGateway.h
• src/NewWirelessDAQ/WirelessSensor.cpp
• src/NewWirelessDAQ/WirelessSensor.h
• src/NewWirelessDAQ/stdafx.h