|
@@ -1776,23 +1776,25 @@ int parseDtu(char *json_string)
|
|
|
LOG_I("解析到温湿度stamp:%s",stamp_server->valuestring);
|
|
LOG_I("解析到温湿度stamp:%s",stamp_server->valuestring);
|
|
|
struct tm *tm_time = parseTimestamp(stamp_server->valuestring);
|
|
struct tm *tm_time = parseTimestamp(stamp_server->valuestring);
|
|
|
time_t timestamp;
|
|
time_t timestamp;
|
|
|
- timestamp = mktime(tm_time);
|
|
|
|
|
- LOG_I("服务器时间戳:{}",timestamp);
|
|
|
|
|
- //获取当前系统时间戳
|
|
|
|
|
- struct timeval tv;
|
|
|
|
|
- gettimeofday(&tv,NULL);
|
|
|
|
|
- LOG_I("系统当前时间戳:{}",tv.tv_sec);
|
|
|
|
|
- time_t timestamp_diff;
|
|
|
|
|
- if(timestamp>tv.tv_sec)
|
|
|
|
|
- {
|
|
|
|
|
- timestamp_diff = timestamp - tv.tv_sec;
|
|
|
|
|
- }else
|
|
|
|
|
- {
|
|
|
|
|
- timestamp_diff = tv.tv_sec - timestamp;
|
|
|
|
|
- }
|
|
|
|
|
- if (tm_time != NULL&×tamp_diff>60) {
|
|
|
|
|
- setSystemTime(tm_time);
|
|
|
|
|
- free(tm_time); // Free the allocated memory
|
|
|
|
|
|
|
+ if(tm_time!=NULL){
|
|
|
|
|
+ timestamp = mktime(tm_time);
|
|
|
|
|
+ LOG_I("服务器时间戳:%d",timestamp);
|
|
|
|
|
+ //获取当前系统时间戳
|
|
|
|
|
+ struct timeval tv;
|
|
|
|
|
+ gettimeofday(&tv,NULL);
|
|
|
|
|
+ LOG_I("系统当前时间戳:%d",tv.tv_sec);
|
|
|
|
|
+ time_t timestamp_diff;
|
|
|
|
|
+ if(timestamp>tv.tv_sec)
|
|
|
|
|
+ {
|
|
|
|
|
+ timestamp_diff = timestamp - tv.tv_sec;
|
|
|
|
|
+ }else
|
|
|
|
|
+ {
|
|
|
|
|
+ timestamp_diff = tv.tv_sec - timestamp;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (tm_time != NULL&×tamp_diff>60) {
|
|
|
|
|
+ setSystemTime(tm_time);
|
|
|
|
|
+ free(tm_time); // Free the allocated memory
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
if(hum!=NULL&&tmp!=NULL)
|
|
if(hum!=NULL&&tmp!=NULL)
|