Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDCode

pro/src/app.c

@@ -1503,6 +1503,14 @@ static void* sensor_thread(void* arg)
                     g_switch_get_gpio_status(_globalSensorMangerTemp->sensor_addr+GPIO_PD11,&nStatus);
                     _globalSensorInfo.val1=nStatus;
                     _globalSensorInfo.val2=-1;
+                    if (nStatus == 0)
+                    {
+                        _globalSensorMangerTemp->sensor_status = 1;
+                    }
+                    else
+                    {
+                        _globalSensorMangerTemp->sensor_status = 0;
+                    }
                     _globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
                 }                
             }

pro/src/appweb_handle.c

@@ -2163,7 +2163,7 @@ static void sensorStatusMonitoring(void* conn)
             }
             else
             {
-                _overSensorBackInfoTemp->connectionStatus = -1;
+                //_overSensorBackInfoTemp->connectionStatus = -1;
                 strcpy(_overSensorBackInfoTemp->sensorvaluech,_overSensorBackInfoTemp->comSlogan);
                 _overSensorBackInfoTemp->nodeNumber =_globalSensorManagerTemp->sensor_addr;
             }

pro/src/json_handle.c

@@ -3074,7 +3074,7 @@ char *ws_sensor_status_ack_to_json(GlobalSensorManger *_globalSensorManger)
             }
             else
             {
-                _overSensorBackInfoTemp->connectionStatus = -1;
+                //_overSensorBackInfoTemp->connectionStatus = -1;
                 strcpy(_overSensorBackInfoTemp->sensorvaluech, _overSensorBackInfoTemp->comSlogan);
                 _overSensorBackInfoTemp->nodeNumber = _globalSensorManagerTemp->sensor_addr;
             }

pro/src/switch_ctrl.c

@@ -1339,6 +1339,9 @@ int g_switch_get_dcpdu_all_out_info(void* manger,int saddr,int nNumb,PowerInfo*
 
         value = (data_temp[7 + Index] << 16) + data_temp[6 + Index];
         _power[i].consumption = value / 1000.0;
+
+        _power[i].freq = 0;
+        _power[i].factor = 1;
     }
 
     offset = _SWITCH_DCPDU_STS_INFO;