|
|
@@ -2083,7 +2083,7 @@ cJSON* json_to_sensor_manage(const char* str,_OverSensorRequest* _overSensorRequ
|
|
|
|
|
|
cJSON* cjson_sensorId = cJSON_GetObjectItem(cjson,"sensorId");
|
|
|
if(cjson_sensorId!=NULL)
|
|
|
- _overSensorRequest->sensorId = cjson_sensorId->valueint;
|
|
|
+ _overSensorRequest->sensorId =atoi(cjson_sensorId->valuestring);
|
|
|
|
|
|
cJSON* cjson_sensorType = cJSON_GetObjectItem(cjson,"sensorType");
|
|
|
if(cjson_sensorType!=NULL)
|
|
|
@@ -2144,7 +2144,9 @@ char* over_all_sensor_info_to_json(_OverSensorBackInfo* _over_all_sensor_back_in
|
|
|
cJSON_AddNumberToObject(data_filed,"airPressureValue",_temp->airPressureValue);
|
|
|
cJSON_AddStringToObject(data_filed,"productName",__globalDeviceManage._global_device_info->product_name);
|
|
|
cJSON_AddNumberToObject(data_filed,"productId",__globalDeviceManage._global_device_info->product_id);
|
|
|
- cJSON_AddNumberToObject(data_filed,"airflowValue",_temp->airflowValue);
|
|
|
+ sprintf(temp,"%0.2f",_temp->airflowValue);
|
|
|
+ cJSON_AddStringToObject(data_filed,"airflowValue",temp);
|
|
|
+
|
|
|
cJSON_AddNumberToObject(data_filed,"alarmStatus",_temp->alarmStatus);
|
|
|
cJSON_AddNumberToObject(data_filed,"sensorBaud",_temp->sensorBaud);
|
|
|
cJSON_AddStringToObject(data_filed,"comSlogan",_temp->comSlogan);
|
|
|
@@ -2157,7 +2159,8 @@ char* over_all_sensor_info_to_json(_OverSensorBackInfo* _over_all_sensor_back_in
|
|
|
{
|
|
|
cJSON_AddStringToObject(data_filed, "connectionStatus", "");
|
|
|
}
|
|
|
- cJSON_AddNumberToObject(data_filed,"gasConcentration",_temp->gasConcentration);
|
|
|
+ sprintf(temp,"%0.2f",_temp->gasConcentration);
|
|
|
+ cJSON_AddStringToObject(data_filed,"gasConcentration",temp);
|
|
|
sprintf(temp,"%0.2f",_temp->humidityValue);
|
|
|
cJSON_AddStringToObject(data_filed,"humidityValue",temp);
|
|
|
//switch (_temp->sensorType)
|