diff --git a/common/global.hpp b/common/global.hpp index 2c2fc61..775fd95 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 diff --git a/jsonparse/web_cmd_parse.cpp b/jsonparse/web_cmd_parse.cpp index 9e87ffa..97294a0 100644 --- a/jsonparse/web_cmd_parse.cpp +++ b/jsonparse/web_cmd_parse.cpp @@ -246,11 +246,11 @@ std::string JsonData::JsonCmd_Cgi_09(Param_09 ¶m) { jsStaticData["ChannelType"] = "STATUS"; jsStaticData["ChannelId"] = vecRes[1]; jsStaticData["TimeStamp"] = vecRes[8]; - jsStaticData["battery"] = vecRes[15]; + jsStaticData["battery"] = vecRes[14]; jsStaticData["MeasurementID"] = strMeasurementID; jsStaticData["dataNodeNo"] = arrResAll[i][0]; jsStaticData["ShortAddr"] = strShortAddr; - jsStaticData["status"] = vecRes[13]; + jsStaticData["status"] = vecRes[12]; jsStaticData["loose"] = "0"; } else {