Просмотр исходного кода

mod:修改部分未初始化的数据

chenyuanjie лет назад: 2
Родитель
Сommit
9ad997f9d0
3 измененных файлов с 8 добавлено и 4 удалено
  1. 1 1
      pro/src/app.c
  2. 6 3
      pro/src/json_handle.c
  3. 1 0
      pro/src/sqlite_handle.c

+ 1 - 1
pro/src/app.c

@@ -660,7 +660,7 @@ void* power_thread(void* arg)
             //sleep(1);
         ///usleep(500*1000);  
         //延时
-        //usleep(samp_time*1000);
+        usleep(samp_time*1000);
     }
     free_hash_table(_globalDeviceManager->_global_alarmLanguage);
     log_e("Error!!!!!!!!!!!!!!Thread End");

+ 6 - 3
pro/src/json_handle.c

@@ -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)

+ 1 - 0
pro/src/sqlite_handle.c

@@ -1508,6 +1508,7 @@ int dev_get_sensor_manage_info(sqlite3 *db,int product_id,GlobalSensorManger* _g
         GlobalSensorManger* _globalSensorMangerTemp = (GlobalSensorManger*)malloc(sizeof(GlobalSensorManger));
         if(_globalSensorMangerTemp==NULL)
             return -1 ;
+        memset(_globalSensorMangerTemp,0,sizeof(GlobalSensorManger));            
         _globalSensorMangerTemp->over_manager = (GlobalSensorOverManage*)malloc(sizeof(GlobalSensorOverManage));
         if(_globalSensorMangerTemp->over_manager==NULL)
             return -1 ;