|
|
@@ -30,7 +30,7 @@
|
|
|
|
|
|
|
|
|
#define DTU_THREAD_PRIORITY 6 //线程优先级
|
|
|
-#define DTU_THREAD_STACK_SIZE 1024 //线程栈空间大小
|
|
|
+#define DTU_THREAD_STACK_SIZE 2048 //线程栈空间大小
|
|
|
#define DTU_THREAD_TIMESLICE 5 //时间片
|
|
|
|
|
|
|
|
|
@@ -1051,23 +1051,29 @@ int parseDtu(char *json_string)
|
|
|
{
|
|
|
if(strstr(device_status.lat,lat->valuestring)==NULL)
|
|
|
{
|
|
|
+ memset(device_status.lat,0,sizeof(device_status.lat));
|
|
|
+ memset(device_status.lng,0,sizeof(device_status.lng));
|
|
|
rt_sprintf(device_status.lat,"%s",lat->valuestring);
|
|
|
rt_sprintf(device_status.lng,"%s",lng->valuestring);
|
|
|
ef_set_env_blob("lat", &device_status.lat, sizeof(device_status.lat)); //Iccid
|
|
|
ef_set_env_blob("lng", &device_status.lng, sizeof(device_status.lng)); //Iccid
|
|
|
}
|
|
|
else {
|
|
|
- rt_kprintf("经纬度信息同步:lat-%s,lng-%s\n",lat->valuestring,lng->valuestring);
|
|
|
+ LOG_I("经纬度信息同步:lat-%s,lng-%s",lat->valuestring,lng->valuestring);
|
|
|
}
|
|
|
|
|
|
}else if(atoi(gps->valuestring)==0)
|
|
|
{
|
|
|
- sprintf(device_status.lat,"%s",lat->valuestring);
|
|
|
- sprintf(device_status.lng,"%s",lng->valuestring);
|
|
|
+ memset(device_status.lat,0,sizeof(device_status.lat));
|
|
|
+ memset(device_status.lng,0,sizeof(device_status.lng));
|
|
|
+ rt_sprintf(device_status.lat,"%s",lat->valuestring);
|
|
|
+ rt_sprintf(device_status.lng,"%s",lng->valuestring);
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
|
rt_sprintf(device_status.gps,"0");
|
|
|
+ memset(device_status.lat,0,sizeof(device_status.lat));
|
|
|
+ memset(device_status.lng,0,sizeof(device_status.lng));
|
|
|
if(sizeof(device_status.lat)<3)
|
|
|
{
|
|
|
sprintf(device_status.lat,"%s","34.8088073");
|
|
|
@@ -1078,7 +1084,9 @@ int parseDtu(char *json_string)
|
|
|
sprintf(device_status.lng,"%s",lng->valuestring);
|
|
|
}
|
|
|
}
|
|
|
+ if(driver_4g!=RT_NULL)
|
|
|
sprintf(device_status.driver_4g,"%s",driver_4g->valuestring);
|
|
|
+ if(project!=RT_NULL)
|
|
|
sprintf(device_status.project,"%s",project->valuestring);
|
|
|
if(mqttcfg1!=NULL)
|
|
|
{
|