diff --git a/common/global.hpp b/common/global.hpp index ec1f193..3567c20 100644 --- a/common/global.hpp +++ b/common/global.hpp @@ -18,7 +18,7 @@ enum enumZigBeeTransmitStatus { //#define NR5G_MODULE -#define Q4G_MODULE +//#define Q4G_MODULE //#define WIFI_MODULE //#define NR5G_MEIGE //#define BLUETEETH_MODULE diff --git a/platform/platform_init.cpp b/platform/platform_init.cpp index 69e4148..daa42aa 100644 --- a/platform/platform_init.cpp +++ b/platform/platform_init.cpp @@ -14,7 +14,7 @@ int GlobalConfig::LinkStatus_G = 0; int GlobalConfig::LinkCount = 0; int GlobalConfig::net0Status = 1; -std::string GlobalConfig::Version = "5.6"; +std::string GlobalConfig::Version = "5.7"; std::string GlobalConfig::MacAddr_G = ""; std::string GlobalConfig::MacAddr_G2 = ""; std::string GlobalConfig::IpAddr_G = ""; diff --git a/uart/uart_feature_parse.cpp b/uart/uart_feature_parse.cpp index 45e70ea..a392621 100644 --- a/uart/uart_feature_parse.cpp +++ b/uart/uart_feature_parse.cpp @@ -354,7 +354,7 @@ int Uart::DealDataNodeFeature(const char *pData, int flag) { valNodeFeature["Phase2"] = dataDymX.Phase2; valNodeFeature["Phase3"] = dataDymX.Phase3; valNodeFeature["Phase4"] = dataDymX.Phase4; - valNodeFeature["timeStamp"] = nowTimetamp; + valNodeFeature["timeStamp"] = localtimestamp; if (Feature_x) { valNodeData.append(valNodeFeature); @@ -444,7 +444,7 @@ int Uart::DealDataNodeFeature(const char *pData, int flag) { valNodeFeature["Phase2"] = dataDymY.Phase2; valNodeFeature["Phase3"] = dataDymY.Phase3; valNodeFeature["Phase4"] = dataDymY.Phase4; - valNodeFeature["timeStamp"] = nowTimetamp; + valNodeFeature["timeStamp"] = localtimestamp; if (Feature_y) { valNodeData.append(valNodeFeature); @@ -544,7 +544,7 @@ int Uart::DealDataNodeFeature(const char *pData, int flag) { valNodeFeature["Phase2"] = dataDymZ.Phase2; valNodeFeature["Phase3"] = dataDymZ.Phase3; valNodeFeature["Phase4"] = dataDymZ.Phase4; - valNodeFeature["timeStamp"] = nowTimetamp; + valNodeFeature["timeStamp"] = localtimestamp; if (Feature_z) { valNodeData.append(valNodeFeature); @@ -572,14 +572,14 @@ int Uart::DealDataNodeFeature(const char *pData, int flag) { valdatastatic["Voltage"] = dataStatic.Voltage; valdatastatic["ChannelType"] = "STATUS"; valdatastatic["ChannelId"] = strMeasurementID + "-S"; - valdatastatic["TimeStamp"] = nowTimetamp; + valdatastatic["TimeStamp"] = localtimestamp; valdatastatic["bateryProportion"] = atof(vBattery[1].c_str()) / atof(vBattery[0].c_str()); valdatastatic["batteryRemainDay"] = atof(vBattery[1].c_str()); valdatastatic["dataNodeNo"] = strMeasurementID; valNodeData.append(valdatastatic); root["data"] = valNodeData; - root["TimeStamp"] = nowTimetamp; + root["TimeStamp"] = localtimestamp; root["dataNodeNo"] = strMeasurementID; root["dataNodeGatewayNo"] = GlobalConfig::MacAddr_G; Json::FastWriter featureValue;