|
@@ -672,7 +672,12 @@ char * makeJson()
|
|
|
cJSON *coll_min = cJSON_CreateStringArray(device_status.coll_time,3);
|
|
cJSON *coll_min = cJSON_CreateStringArray(device_status.coll_time,3);
|
|
|
//工作状态
|
|
//工作状态
|
|
|
rt_sprintf(utos, "%d",device_status.work_status);
|
|
rt_sprintf(utos, "%d",device_status.work_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"work_sta",utos);
|
|
|
|
|
|
|
+ if(device_status.autotakepic==2){
|
|
|
|
|
+ cJSON_AddStringToObject(pSubJson,"work_sta","2"); //拍照
|
|
|
|
|
+ }else{
|
|
|
|
|
+ cJSON_AddStringToObject(pSubJson,"work_sta",utos);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
//电压状态-batStatus
|
|
//电压状态-batStatus
|
|
|
rt_sprintf(utos, "%d",device_status.bat_status);
|
|
rt_sprintf(utos, "%d",device_status.bat_status);
|
|
@@ -1285,6 +1290,7 @@ int parseDtu(char *json_string)
|
|
|
if( device_status.num_updata==0)
|
|
if( device_status.num_updata==0)
|
|
|
{
|
|
{
|
|
|
Beep_Tip(100);
|
|
Beep_Tip(100);
|
|
|
|
|
+ UpLoad_Data();
|
|
|
}
|
|
}
|
|
|
else if(device_status.num_updata!=0&&device_status.hmi_fresh==2)
|
|
else if(device_status.num_updata!=0&&device_status.hmi_fresh==2)
|
|
|
{
|
|
{
|