2020.06.12

lss

2020-06-12 9c16d3614d9b88c637f967518a329f239fcd3aaf

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

@@ -315,7 +315,7 @@
            btnColorView.Y = Application.GetRealHeight(5);

            btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnColorView.TextID = R.MyInternationalizationString.uColor;

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEvent);



            int R1 = Convert.ToInt32(this.keyColorData.CloseColorR, 16);

            int G1 = Convert.ToInt32(this.keyColorData.CloseColorG, 16);

@@ -330,13 +330,13 @@
            btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);



            var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);

            btnColor.Gravity = Gravity.Center;

            btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;

            btnColor.BackgroundColor = backColor;

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);



            //变更滑动条的颜色

            seekBar1.ProgressBarColor = backColor;

@@ -345,27 +345,51 @@
            btnRight.UnSelectedImagePath = "Item/RightNext.png";

            btnRight.Y = Application.GetRealHeight(5);

            btnRight.X = frameColor.Width - this.GetPictrueRealSize(58);

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEvent);

            btnRight.Y += this.GetPictrueRealSize(8);



            frameColor.ButtonClickEvent += (sender, e) =>

            {

                var form = new PanelColorSelectForm();

                form.AddForm(R1, G1, B1);

                form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>

                {

                    R1 = Rcolor;

                    G1 = Gcolor;

                    B1 = Bcolor;

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

            btnColorView.ButtonClickEvent += (sender, e) =>

            {

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

            btnColor.ButtonClickEvent += (sender, e) =>

            {

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

            btnColorLine.ButtonClickEvent += (sender, e) =>

            {

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

            btnRight.ButtonClickEvent += (sender, e) =>

            {

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

        }



                    this.keyColorData.CloseColorR = Convert.ToString(Rcolor, 16);

                    this.keyColorData.CloseColorG = Convert.ToString(Gcolor, 16);

                    this.keyColorData.CloseColorB = Convert.ToString(Bcolor, 16);

        /// <summary>

        /// PanelColorBefore

        /// </summary>

        private void PanelColor(NormalViewControl btnColor, SeekBarControl seekBar1, int R1, int G1, int B1)

        {

            var form = new PanelColorSelectForm();

            form.AddForm(R1, G1, B1);

            form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>

            {

                R1 = Rcolor;

                G1 = Gcolor;

                B1 = Bcolor;



                    btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);

                    //变更滑动条的颜色

                    seekBar1.ProgressBarColor = btnColor.BackgroundColor;

                };

                this.keyColorData.CloseColorR = Convert.ToString(Rcolor, 16);

                this.keyColorData.CloseColorG = Convert.ToString(Gcolor, 16);

                this.keyColorData.CloseColorB = Convert.ToString(Bcolor, 16);



                btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);

                //变更滑动条的颜色

                seekBar1.ProgressBarColor = btnColor.BackgroundColor;

            };

        }



@@ -453,7 +477,7 @@
            btnColorView.Y = Application.GetRealHeight(5);

            btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnColorView.TextID = R.MyInternationalizationString.uColor;

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEvent);



            int R1 = Convert.ToInt32(this.keyColorData.OpenColorR, 16);

            int G1 = Convert.ToInt32(this.keyColorData.OpenColorG, 16);

@@ -468,13 +492,13 @@
            btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xffcccccc;

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);



            var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);

            btnColor.Gravity = Gravity.Center;

            btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;

            btnColor.BackgroundColor = backColor;

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);

            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);



            //变更滑动条的颜色

            seekBar1.ProgressBarColor = backColor;

@@ -483,30 +507,30 @@
            btnRight.UnSelectedImagePath = "Item/RightNext.png";

            btnRight.Y = Application.GetRealHeight(5);

            btnRight.X = frameColor.Width - this.GetPictrueRealSize(58);

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEvent);

            btnRight.Y += this.GetPictrueRealSize(8);



            frameColor.ButtonClickEvent += (sender, e) =>

            {

                var form = new PanelColorSelectForm();

                form.AddForm(R1, G1, B1);

                form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>

                {

                    R1 = Rcolor;

                    G1 = Gcolor;

                    B1 = Bcolor;



                    this.keyColorData.OpenColorR = Convert.ToString(Rcolor, 16);

                    this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);

                    this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);



                    btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);

                    //变更滑动条的颜色

                    seekBar1.ProgressBarColor = btnColor.BackgroundColor;

                };

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

            btnColorView.ButtonClickEvent += (sender, e) =>

            {

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

            btnColor.ButtonClickEvent += (sender, e) =>

            {

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

            btnColorLine.ButtonClickEvent += (sender, e) =>

            {

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

            btnRight.ButtonClickEvent += (sender, e) =>

            {

                PanelColor(btnColor, seekBar1, R1, G1, B1);

            };

        }



        #endregion



        #region ■ 获取初始数据_______________________

@@ -520,7 +544,7 @@
            //开启进度条

            this.ShowProgressBar();

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

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

            linghtLevelInfo = HdlDevicePanelLogic.Current.GetDeviceLightSettion(panelDevice);

            if (linghtLevelInfo == null)

            {

                //关闭进度条

@@ -536,14 +560,14 @@
                return false;

            }

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

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

            energyModeInfo = HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(panelDevice);

            if (energyModeInfo == null)

            {

                //关闭进度条

                this.CloseProgressBar(ShowReLoadMode.YES);

                return false;

            }

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

            keyColorData = HdlDevicePanelLogic.Current.GetPanelEpointColorInfo(panelDevice);

            if (this.keyColorData == null)

            {

                //关闭进度条

@@ -567,7 +591,7 @@
        {

            this.ShowProgressBar();

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

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

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

            if (result == false)

            {

                this.CloseProgressBar();

@@ -577,7 +601,7 @@
            //节能模式修改(他们说随便一个回路就行)

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

            energyModeInfo.time = 15;

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

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

            if (result == false)

            {

                this.CloseProgressBar();

@@ -591,7 +615,7 @@
                return;

            }

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

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

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

            this.CloseProgressBar();

            if (result == false)

            {