Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -47,8 +47,11 @@
            //设置标题信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uBackLight));



            HdlThreadLogic.Current.RunThread(() =>

            {

            //初始化中部控件

            this.InitMiddleFrame();

            });

        }



        /// <summary>
@@ -62,6 +65,8 @@
            {

                return;

            }

            HdlThreadLogic.Current.RunMain(() =>

            {

            //清空bodyFrame

            this.ClearBodyFrame();



@@ -87,6 +92,7 @@
                //保存面板数据

                this.SavePanelData();

            };

            });

        }



        #endregion

@@ -462,7 +468,7 @@
            //开启进度条

            this.ShowProgressBar();

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

            linghtLevelInfo = await HdlPanelLogic.Current.GetDeviceLightSettion(panelDevice);

            linghtLevelInfo = await HdlDevicePanelLogic.Current.GetDeviceLightSettion(panelDevice);

            if (linghtLevelInfo == null)

            {

                //关闭进度条

@@ -470,14 +476,14 @@
                return false;

            }

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

            energyModeInfo = await HdlPanelLogic.Current.GetDeviceEnergyConservationMode(panelDevice);

            energyModeInfo = await HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(panelDevice);

            if (energyModeInfo == null)

            {

                //关闭进度条

                this.CloseProgressBar(ShowReLoadMode.YES);

                return false;

            }

            keyColorData = await HdlPanelLogic.Current.GetPanelEpointColorInfo(panelDevice);

            keyColorData = await HdlDevicePanelLogic.Current.GetPanelEpointColorInfo(panelDevice);

            if (this.keyColorData == null)

            {

                //关闭进度条

@@ -501,21 +507,21 @@
        {

            this.ShowProgressBar();

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

            var result = await HdlPanelLogic.Current.SetDeviceLightSettion(panelDevice, linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);

            var result = await HdlDevicePanelLogic.Current.SetDeviceLightSettion(panelDevice, linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);

            if (result == false)

            {

                this.CloseProgressBar();

                return;

            }

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

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

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

            this.CloseProgressBar();

            if (result == false)

            {

                return;

            }

            //设置按键面板指定端点的【指示灯开关颜色】的信息

            result = await HdlPanelLogic.Current.SetPanelEpointColorInfo(panelDevice, this.keyColorData);

            result = await HdlDevicePanelLogic.Current.SetPanelEpointColorInfo(panelDevice, this.keyColorData);

            if (result == false)

            {

                return;