延时修改不完全

pro/src/cascade.c

@@ -149,7 +149,7 @@ static int slave_get_info(cascade_handle_t *cas, int hardread)
 
     return 0;
 }
-static int get_ac_info(int nCh, int nType, PowerInfo *info)
+static int get_ac_info(int nCh, int nType, power_info_t *info)
 {
     GlobalDeviceManager *dm=get_dm();
     GlobalTreeACManager *tmp = NULL;
@@ -160,7 +160,10 @@ static int get_ac_info(int nCh, int nType, PowerInfo *info)
             continue;
         }
 
-        *info = tmp->_PowerInfo;
+        info->pwrinfo = tmp->_PowerInfo;
+        //info->start_delay = tmp->product_ch_start_delay;
+        //info->stop_delay  = tmp->product_ch_start_delay;
+
         return 0;
     }
 
@@ -887,7 +890,7 @@ static int master_query(cascade_handle_t *cas)
 #endif
             {
                 cas->chInfo.cnt = 0;
-                rdata.dlen = sizeof(uint8_t)+sizeof(PowerInfo)*cas->info.cnt;
+                rdata.dlen = sizeof(uint8_t)+sizeof(power_info_t)*cas->info.cnt;
                 rdata.data = (uint8_t*)&cas->chInfo;
             }
             

pro/src/json_handle.c

@@ -2659,7 +2659,12 @@ char* ws_chn_status_ack_to_json(int type,_OverChnPwrAckInfo* _over_chn_pwr_back_
     {
         //添加第一条记录
         cJSON* data_filed = cJSON_CreateObject();
-        sprintf(temp,"%s %d",_chnPwrTemp->product_name, _chnPwrTemp->product_id);
+        if(_chnPwrTemp->product_id==0) {
+            sprintf(temp,"%s",_chnPwrTemp->product_name);
+        }
+        else {
+            sprintf(temp,"%s %d",_chnPwrTemp->product_name, _chnPwrTemp->product_id);
+        }
         cJSON_AddStringToObject(data_filed,"productName",temp);
         cJSON_AddStringToObject(data_filed,"productNumber",_chnPwrTemp->product_number);
         sprintf(temp,"%d",_chnPwrTemp->product_id);