zhangsheng/WLG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
zhangsheng 2025-02-13 11:16:57 +08:00
parent 63a8526505
commit da511f5e77
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jsonparse/cmt_parse.cpp
View File

@ -24,16 +24,20 @@ void JsonData::CmtCmd_80(char* send_data,int& send_length)
memcpy(gateway_ver.ip,GlobalConfig::IpAddr_G.c_str(),sizeof(gateway_ver.ip)); memcpy(gateway_ver.ip,GlobalConfig::IpAddr_G.c_str(),sizeof(gateway_ver.ip));
memcpy(gateway_ver.gateway_type,ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayProduct").c_str(),sizeof(gateway_ver.gateway_type)); memcpy(gateway_ver.gateway_type,ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayProduct").c_str(),sizeof(gateway_ver.gateway_type));
memcpy(gateway_ver.gateway_hw_ver,ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayHwVesion").c_str(),sizeof(gateway_ver.gateway_hw_ver)); memcpy(gateway_ver.gateway_hw_ver,ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayHwVesion").c_str(),sizeof(gateway_ver.gateway_hw_ver));
memcpy(gateway_ver.comm_mode,"以太网",sizeof(gateway_ver.comm_mode));
#ifdef NR5G_MODULE #ifdef NR5G_MODULE
memset(gateway_ver.comm_mode,0,sizeof(gateway_ver.comm_mode));
memcpy(gateway_ver.comm_mode,"5G",sizeof(gateway_ver.comm_mode)); memcpy(gateway_ver.comm_mode,"5G",sizeof(gateway_ver.comm_mode));
#endif #endif
#ifdef Q4G_MODULE #ifdef Q4G_MODULE
memset(gateway_ver.comm_mode,0,sizeof(gateway_ver.comm_mode));
memcpy(gateway_ver.comm_mode,"4G",sizeof(gateway_ver.comm_mode)); memcpy(gateway_ver.comm_mode,"4G",sizeof(gateway_ver.comm_mode));
#endif #endif
#ifdef WIFI_MODULE #ifdef WIFI_MODULE
memset(gateway_ver.comm_mode,0,sizeof(gateway_ver.comm_mode));
memcpy(gateway_ver.comm_mode,"WiFi",sizeof(gateway_ver.comm_mode)); memcpy(gateway_ver.comm_mode,"WiFi",sizeof(gateway_ver.comm_mode));
#endif #endif
memcpy(gateway_ver.comm_mode,"以太网",sizeof(gateway_ver.comm_mode));
std::string gatewayLocation = sqlite_db_ctrl::instance().GetData(T_GATEWAY_INFO(TNAME), "gatewayLocation", NULL); std::string gatewayLocation = sqlite_db_ctrl::instance().GetData(T_GATEWAY_INFO(TNAME), "gatewayLocation", NULL);
memcpy(gateway_ver.terminal_name,gatewayLocation.c_str(),sizeof(gateway_ver.terminal_name)); memcpy(gateway_ver.terminal_name,gatewayLocation.c_str(),sizeof(gateway_ver.terminal_name));
GetSysStatusCMT(gateway_ver.cpu_use,gateway_ver.memory_use,gateway_ver.disk_remain,gateway_ver.temperature); GetSysStatusCMT(gateway_ver.cpu_use,gateway_ver.memory_use,gateway_ver.disk_remain,gateway_ver.temperature);