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

modify code

Browse Source
This commit is contained in:
zhangsheng 2025-02-08 11:05:27 +08:00
parent e80578dbee
commit cece1b16ec
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jsonparse/cmt_parse.cpp
View File

@ -33,8 +33,9 @@ void JsonData::CmtCmd_80(char* send_data,int& send_length)
#ifdef WIFI_MODULE #ifdef WIFI_MODULE
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)); memcpy(gateway_ver.comm_mode,"以太网",sizeof(gateway_ver.comm_mode));
memcpy(gateway_ver.terminal_name,ReadStrByOpt(NETWORKCONFIG, "eth0", "hostName").c_str(),sizeof(gateway_ver.terminal_name)); 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));
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);
memcpy(send_data,&gateway_ver,sizeof(GatewayVersion)); memcpy(send_data,&gateway_ver,sizeof(GatewayVersion));
send_length = sizeof(GatewayVersion); send_length = sizeof(GatewayVersion);

2
jsonparse/mqtt_cmd_parse.cpp
View File

@ -491,7 +491,7 @@ int JsonData::JsonCmd_29() {
jsonVal["GateWayVersion"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayVersion"); jsonVal["GateWayVersion"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayVersion");
jsBody["localIP"] = GlobalConfig::IpAddr_G; jsBody["localIP"] = GlobalConfig::IpAddr_G;
jsBody["dataNodeGatewayType"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayProduct"); jsBody["dataNodeGatewayType"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayProduct");
jsBody["CommMode"] = "有线"; jsBody["CommMode"] = "以太网";
#ifdef NR5G_MODULE #ifdef NR5G_MODULE
jsBody["CommMode"] = "5G"; jsBody["CommMode"] = "5G";
#endif #endif