Bläddra i källkod

添加异常处理

guohui 2 år sedan
förälder
incheckning
b513cd3e01
2 ändrade filer med 5 tillägg och 1 borttagningar
  1. 3 0
      pro/src/cascade.c
  2. 2 1
      pro/src/json_handle.c

+ 3 - 0
pro/src/cascade.c

@@ -593,6 +593,9 @@ static int power_clear(cascade_handle_t *cas)
     GlobalPowerManger *tmp=NULL;
     GlobalDeviceManager *dm2=get_dm2();
 
+    if(list_empty(&dm2->_globalPowerManger.list))
+        return;
+
     list_for_each_entry(tmp, &dm2->_globalPowerManger.list, list)
     {
         if(tmp) {

+ 2 - 1
pro/src/json_handle.c

@@ -1976,7 +1976,8 @@ char* over_chn_pwr_monitor_to_json(_OverChnPwrAckInfo* _over_chn_pwr_back_info)
         cJSON* data_filed = cJSON_CreateObject();
         cJSON_AddStringToObject(data_filed,"productName",_chnPwrTemp->product_name);
         cJSON_AddStringToObject(data_filed,"productNumber",_chnPwrTemp->product_number);
-        cJSON_AddNumberToObject(data_filed,"productId",_chnPwrTemp->product_id);
+        sprintf(temp,"%d",_chnPwrTemp->product_id);
+        cJSON_AddStringToObject(data_filed,"productId",temp);
         cJSON_AddStringToObject(data_filed,"productChName",_chnPwrTemp->productChName);
         cJSON_AddNumberToObject(data_filed,"productChId",_chnPwrTemp->productChId);
         sprintf(temp,"%0.3f",_chnPwrTemp->voltage);