|
|
@@ -546,6 +546,7 @@ char * makeJson()
|
|
|
//JSON数据解析
|
|
|
void parseDtu(char *json_string)
|
|
|
{
|
|
|
+ uint8_t gps_sta = 0;
|
|
|
cJSON* item_cmd = NULL; //嵌套ext
|
|
|
cJSON* item_ext = NULL; //嵌套ext
|
|
|
cJSON* item_data = NULL;
|
|
|
@@ -700,9 +701,15 @@ void parseDtu(char *json_string)
|
|
|
//如果DTU的ICCID和FLash中的不一样,保存到FLASH
|
|
|
if(strstr(device_status.iccid,iccid->valuestring)==RT_NULL)
|
|
|
{
|
|
|
- rt_kprintf("Change ICCID:new:%s-old:%s",iccid->valuestring,device_status.iccid);
|
|
|
- rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
|
|
|
- ef_set_env_blob("iccid", &device_status.iccid, sizeof(device_status.iccid)); //Iccid
|
|
|
+ if(sizeof(iccid->valuestring)==20)
|
|
|
+ {
|
|
|
+ rt_kprintf("Change ICCID:new:%s-old:%s",iccid->valuestring,device_status.iccid);
|
|
|
+ rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
|
|
|
+ ef_set_env_blob("iccid", &device_status.iccid, sizeof(device_status.iccid)); //Iccid
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ rt_sprintf(device_status.iccid,"%s","10000000000000000000");
|
|
|
+ }
|
|
|
}
|
|
|
else {
|
|
|
rt_sprintf(device_status.iccid,"%s",iccid->valuestring);
|
|
|
@@ -783,24 +790,43 @@ void parseDtu(char *json_string)
|
|
|
{
|
|
|
if(atoi(lat->valuestring)==-1||atoi(lat->valuestring)==1)
|
|
|
{
|
|
|
- sprintf(device_status.lat,"%s","34.8088073");
|
|
|
- sprintf(device_status.lng,"%s","113.6624298");
|
|
|
+ sprintf(device_status.lat,"%s","34.8088073");
|
|
|
+ sprintf(device_status.lng,"%s","113.6624298");
|
|
|
+
|
|
|
}
|
|
|
else {
|
|
|
+ if(lat->valuestring!=NULL||lng->valuestring!=NULL){
|
|
|
sprintf(device_status.lat,"%s",lat->valuestring);
|
|
|
sprintf(device_status.lng,"%s",lng->valuestring);
|
|
|
- }
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ sprintf(device_status.lat,"%s","34.8088073");
|
|
|
+ sprintf(device_status.lng,"%s","113.6624298");
|
|
|
+ }
|
|
|
+ if(gps_sta==0)
|
|
|
+ {
|
|
|
+ gps_sta = 1;
|
|
|
+ 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 if(atoi(gps->valuestring)==0)
|
|
|
{
|
|
|
- sprintf(device_status.lat,"%s","34.8088073");
|
|
|
- sprintf(device_status.lng,"%s","113.6624298");
|
|
|
+ if(sizeof(device_status.lat)<3)
|
|
|
+ {
|
|
|
+ sprintf(device_status.lat,"%s","34.8088073");
|
|
|
+ sprintf(device_status.lng,"%s","113.6624298");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
|
rt_sprintf(device_status.gps,"0");
|
|
|
- sprintf(device_status.lat,"%s","34.8088073");
|
|
|
- sprintf(device_status.lng,"%s","113.6624298");
|
|
|
+ if(sizeof(device_status.lat)<3)
|
|
|
+ {
|
|
|
+ sprintf(device_status.lat,"%s","34.8088073");
|
|
|
+ sprintf(device_status.lng,"%s","113.6624298");
|
|
|
+ }
|
|
|
}
|
|
|
sprintf(device_status.driver_4g,"%s",driver_4g->valuestring);
|
|
|
sprintf(device_status.project,"%s",project->valuestring);
|