Merge branch '测试2' of http://192.168.1.22:3000/zhangwen/front_linux into 测试2
This commit is contained in:
@@ -89,6 +89,7 @@ void process_received_message(string mac, string id,const char* data, size_t len
|
||||
std::cout << "cloud login: " << mac << " state: " << static_cast<int>(udata[16]) << static_cast<int>(udata[17]) << static_cast<int>(udata[18]) << static_cast<int>(udata[19]) << std::endl;
|
||||
if (udata[19] == 0x10) {
|
||||
std::cout << "cloud login: " << mac << " state: success!" << std::endl;
|
||||
DIY_INFOLOG_CODE(id,1, static_cast<int>(LogCode::LOG_CODE_COMM),"云前置登录成功");
|
||||
//装置登录成功
|
||||
ClientManager::instance().set_cloud_status(id, 1); //设置了云前置登录状态为已登录
|
||||
ClientManager::instance().read_devversion_action_to_device(id);//主动触发,读取装置版本配置信息,仅在装置登录后执行一次,当前获取版本信息确认对时报文结构。
|
||||
@@ -501,6 +502,7 @@ void process_received_message(string mac, string id,const char* data, size_t len
|
||||
data_time,
|
||||
mac,
|
||||
avg_data.name);
|
||||
DIY_INFOLOG_CODE(id, 1, static_cast<int>(LogCode::LOG_CODE_REPORT), "装置推送统计数据完毕");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user