add code
This commit is contained in:
parent
d8ff555c38
commit
eb1c97b60e
@ -244,11 +244,11 @@ std::string JsonData::JsonCmd_Cgi_09(Param_09 ¶m) {
|
|||||||
jsStaticData["ChannelType"] = "STATUS";
|
jsStaticData["ChannelType"] = "STATUS";
|
||||||
jsStaticData["ChannelId"] = vecRes[1];
|
jsStaticData["ChannelId"] = vecRes[1];
|
||||||
jsStaticData["TimeStamp"] = vecRes[8];
|
jsStaticData["TimeStamp"] = vecRes[8];
|
||||||
jsStaticData["battery"] = vecRes[13];
|
jsStaticData["battery"] = vecRes[14];
|
||||||
jsStaticData["MeasurementID"] = strMeasurementID;
|
jsStaticData["MeasurementID"] = strMeasurementID;
|
||||||
jsStaticData["dataNodeNo"] = arrResAll[i][0];
|
jsStaticData["dataNodeNo"] = arrResAll[i][0];
|
||||||
jsStaticData["ShortAddr"] = strShortAddr;
|
jsStaticData["ShortAddr"] = strShortAddr;
|
||||||
jsStaticData["status"] = vecRes[11];
|
jsStaticData["status"] = vecRes[12];
|
||||||
jsStaticData["loose"] = "0";
|
jsStaticData["loose"] = "0";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -559,6 +559,11 @@ int Uart::TaskResp(ScheduleTask scheduleTask){
|
|||||||
char localtimestamp[32] = {0x00};
|
char localtimestamp[32] = {0x00};
|
||||||
int millisecond = 0;
|
int millisecond = 0;
|
||||||
std::string rtcTime = GetRTC(localtimestamp, millisecond);
|
std::string rtcTime = GetRTC(localtimestamp, millisecond);
|
||||||
|
if (rtcTime == "")
|
||||||
|
{
|
||||||
|
GetTimeNet(localtimestamp, 1);
|
||||||
|
}
|
||||||
|
|
||||||
scheduleTask.timeStamp = atoi(localtimestamp);
|
scheduleTask.timeStamp = atoi(localtimestamp);
|
||||||
zlog_info(zct,"next taskID = %d\n",scheduleTask.next_taskID);
|
zlog_info(zct,"next taskID = %d\n",scheduleTask.next_taskID);
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user