Revert "Merge branch 'dev-tzy' into DEV_GXC"

gxc

2019-10-28 1c4904d77f484c075080942d87785481b52b6fb2

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

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

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



            HdlThreadLogic.Current.RunThread(() =>

            {

                //初始化中部控件

                this.InitMiddleFrame();

            });

        }



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

                return;

            }

            HdlThreadLogic.Current.RunMain(() =>

            {

                //清空bodyFrame

                this.ClearBodyFrame();



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

                    this.SavePanelData();

                };

            });

        }



        #endregion

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

            this.ShowProgressBar();

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

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

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

            if (linghtLevelInfo == null)

            {

                //关闭进度条

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

            }

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

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

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

            if (energyModeInfo == null)

            {

                //关闭进度条

                this.CloseProgressBar(ShowReLoadMode.YES);

                return false;

            }

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

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

            if (this.keyColorData == null)

            {

                //关闭进度条

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

            this.ShowProgressBar();

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

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

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

            if (result == false)

            {

                this.CloseProgressBar();

                return;

            }

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

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

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

            this.CloseProgressBar();

            if (result == false)

            {

                return;

            }

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

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

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

            if (result == false)

            {

                return;