1、修改通道功率因数显示不对问题

pro/src/app.c

@@ -543,7 +543,7 @@ void* power_thread(void* arg)
                         _globalPowerInfo._power_info.power += _pTreeACPowerMangerTemp->_PowerInfo.power;
                         _globalPowerInfo._power_info.freq = _pTreeACPowerMangerTemp->_PowerInfo.freq;
                         _globalPowerInfo._power_info.consumption += _pTreeACPowerMangerTemp->_PowerInfo.consumption;
-                        _globalPowerInfo._power_info.factor = _pTreeACPowerMangerTemp->_PowerInfo.factor;
+                        _globalPowerInfo._power_info.factor = _pTreeACPowerMangerTemp->_PowerInfo.factor > _globalPowerInfo._power_info.factor ? _pTreeACPowerMangerTemp->_PowerInfo.factor : _globalPowerInfo._power_info.factor;
 
                         __globalDeviceManage.triphasic_mmap->pw_o_chn[_chn].chn[k].o_consumption = _pTreeACPowerMangerTemp->_PowerInfo.consumption * 1000;
                         __globalDeviceManage.triphasic_mmap->pw_o_chn[_chn].chn[k].o_current = _pTreeACPowerMangerTemp->_PowerInfo.current * 1000;
@@ -627,7 +627,7 @@ void* power_thread(void* arg)
                     _globalTotalPowerInfo._power_info.voltage = _globalPowerInfo._power_info.voltage ;
                     _globalTotalPowerInfo._power_info.current += _globalPowerInfo._power_info.current ;
                     _globalTotalPowerInfo._power_info.power += _globalPowerInfo._power_info.power ;
-                    _globalTotalPowerInfo._power_info.freq = _globalPowerInfo._power_info.freq;
+                    _globalTotalPowerInfo._power_info.freq = _globalPowerInfo._power_info.freq> _globalTotalPowerInfo._power_info.freq?  _globalPowerInfo._power_info.freq:_globalTotalPowerInfo._power_info.freq;
                     _globalTotalPowerInfo._power_info.consumption += _globalPowerInfo._power_info.consumption ;
                     _globalTotalPowerInfo._power_info.factor = _globalPowerInfo._power_info.factor ;
                     _globalPowerInfo.product_status = _globalPowerInfo._power_info.status ;

pro/src/websocket_handle.c

@@ -267,12 +267,11 @@ void* websocket_thread(void* arg)
     wh->inited = 1;
 
     while(h->quit==0) {
-        mg_mgr_poll(&wh->mgr, 1000);                    // Infinite event loop
         if (wh->c)
         {
             web_update(wh);
         }
-    
+        mg_mgr_poll(&wh->mgr, 1000);                    // Infinite event loop
         usleep(500000);
     }
     wh->inited = 0;