合并代码

xm

2020-04-22 dfa6733793434bdcfd394f978ae72f1628b2260f

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs

old mode 100755
new mode 100644
@@ -575,15 +575,15 @@
            }



            //节能模式修改(他们说随便一个回路就行)

            //设备同事说默认去秒时间，这样接近感应功能才合理

            energyModeInfo.time = 1;

            //肖志豪给按键控制面板（四开八控）设备，说默认15秒时间，这样接近感应功能才合理

            energyModeInfo.time = 15;

            result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);

            if (result == false)

            {

                this.CloseProgressBar();

                return;

            }

            //接近修改(他们说随便一个回路就行)

            //接近传感设置  (肖志豪给按键控制面板（四开八控）设备，传感距离和触发延迟时间默认用最大值)

            result = await HdlDevicePanelLogic.Current.SetProximitySensorStatus(panelDevice, proximitySensorsInfo.enable);

            if (result == false)

            {