Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs

@@ -102,14 +102,14 @@
                {

                    this.ShowProgressBar();

                    //亮度调节更改(他们说随便一个回路就行)

                    result = await HdlPanelLogic.Current.SetDeviceLightSettion(listDevice[0], linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);

                    result = await HdlDevicePanelLogic.Current.SetDeviceLightSettion(listDevice[0], linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);

                    if (result == false)

                    {

                        this.CloseProgressBar();

                        return;

                    }

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

                    result = await HdlPanelLogic.Current.SetDeviceEnergyConservationMode(listDevice[0], energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);

                    result = await HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(listDevice[0], energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);

                    this.CloseProgressBar();

                    if (result == false)

                    {

@@ -385,7 +385,7 @@
            //开启进度条

            this.ShowProgressBar();

            //亮度调节(他们说随便拿一路回路就行了)

            linghtLevelInfo = await HdlPanelLogic.Current.GetDeviceLightSettion(listDevice[0]);

            linghtLevelInfo = await HdlDevicePanelLogic.Current.GetDeviceLightSettion(listDevice[0]);

            if (linghtLevelInfo == null)

            {

                //关闭进度条

@@ -393,7 +393,7 @@
                return false;

            }

            //节能模式(他们说随便拿一路回路就行了)

            energyModeInfo = await HdlPanelLogic.Current.GetDeviceEnergyConservationMode(listDevice[0]);

            energyModeInfo = await HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(listDevice[0]);

            if (energyModeInfo == null)

            {

                //关闭进度条