1、添加阈值批量设置、耗电量复位延时；2、修改阈值超限使能逻辑。

pro/src/appweb_handle.c

@@ -1781,7 +1781,6 @@ static void channelStatusMonitoring(void* conn)
         // 其他版本功能
         while (pCHlist != NULL)
         {
-            
             int g_pwr_ch_id = atoi(pCHlist);
             _globalPowerMangerTemp=NULL;
             list_for_each_entry(_globalPowerMangerTemp, &__globalDeviceManage._globalPowerManger.list, list)
@@ -1799,7 +1798,6 @@ static void channelStatusMonitoring(void* conn)
                     GlobalTreeACManager *_globalTACManager = NULL;
                     list_for_each_entry(_globalTACManager, &_globalPowerMangerTemp->list_Tree_AC, list_Tree_AC)
                     {
-
                         if (g_switch_set_t_ac_phchn_reset(&__globalDeviceManage._globalRelaySampManger, _globalTACManager->product_saddr, _globalTACManager->product_ch_addr) < 0)
                         {
                             log_e("Error: phchn_reset");
@@ -1808,6 +1806,7 @@ static void channelStatusMonitoring(void* conn)
                  }
             }
             pCHlist = strtok_r(NULL, ",", &pCHListSave);
+            usleep(30000);//延时50ms，等待控制板串口写完
         }
     }
 quit:
@@ -2464,72 +2463,76 @@ char* setThresholdToCh(_AlarmRequestInfo* _alarm_request_info,int nChID)
         }
     }
 
-    // 更新参数
+    // 更新参数，使能全部放在控制板上判断，表头不做判断，统一发1
     if (_alarm_request_info->_pwr_info.voltageUpperValue)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_vol_upper_threshold = atof(_alarm_request_info->_pwr_info.voltageUpperValue);
     }
-    if (_globalPowerMangerSaveTemp->global_over_manager->product_vol_upper_threshold != 0)
+     _globalPowerMangerSaveTemp->global_over_manager->product_vol_upper_enable = 1;
+    /*if (_globalPowerMangerSaveTemp->global_over_manager->product_vol_upper_threshold != 0)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_vol_upper_enable = 1;
     }
     else
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_vol_upper_enable = 0;
-    }
+    }*/
 
     if (_alarm_request_info->_pwr_info.voltageDownValue)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_vol_lower_threshold = atof(_alarm_request_info->_pwr_info.voltageDownValue);
     }
-    if (_globalPowerMangerSaveTemp->global_over_manager->product_vol_lower_threshold != 0)
+    _globalPowerMangerSaveTemp->global_over_manager->product_vol_lower_enable = 1;
+    /*if (_globalPowerMangerSaveTemp->global_over_manager->product_vol_lower_threshold != 0)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_vol_lower_enable = 1;
     }
     else
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_vol_lower_enable = 0;
-    }
+    }*/
 
     if (_alarm_request_info->_pwr_info.currentUpperValue)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_cur_upper_threshold = atof(_alarm_request_info->_pwr_info.currentUpperValue);
     }
-
-    if (_globalPowerMangerSaveTemp->global_over_manager->product_cur_upper_threshold != 0)
+    _globalPowerMangerSaveTemp->global_over_manager->product_cur_upper_enable = 1;
+    /*if (_globalPowerMangerSaveTemp->global_over_manager->product_cur_upper_threshold != 0)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_cur_upper_enable = 1;
     }
     else
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_cur_upper_enable = 0;
-    }
+    }*/
 
     if (_alarm_request_info->_pwr_info.powerUpperValue)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_pwr_upper_threshold = atof(_alarm_request_info->_pwr_info.powerUpperValue);
     }
-    if (_globalPowerMangerSaveTemp->global_over_manager->product_pwr_upper_threshold != 0)
+    _globalPowerMangerSaveTemp->global_over_manager->product_pwr_upper_enable = 1;
+    /*if (_globalPowerMangerSaveTemp->global_over_manager->product_pwr_upper_threshold != 0)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_pwr_upper_enable = 1;
     }
     else
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_pwr_upper_enable = 0;
-    }
+    }*/
 
     if (_alarm_request_info->_pwr_info.alarmContentUpperValue)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_threshold = atof(_alarm_request_info->_pwr_info.alarmContentUpperValue);
     }
-    if (_globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_threshold != 0)
+    _globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_enable = 1;
+   /* if (_globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_threshold != 0)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_enable = 1;
     }
     else
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_enable = 0;
-    }
+    }*/
     //_globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_enable = 1 ;
 
     char Alarm_Ctrl_type[16];
@@ -2938,6 +2941,7 @@ static void alarmProtect(void *conn)
             int g_pwr_ch_id = atoi(pCHlist);
             ack_str = setThresholdToCh(&_alarm_request_info, g_pwr_ch_id);
             pCHlist = strtok_r(NULL, ",", &pCHListSave);
+            usleep(30000);//延时30ms，等待控制板串口写完
         }
     }
     else if(strcmp(_alarm_request_info.type,"sensorThresholdList")==0)//传感器阈值查询