Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -155,23 +155,17 @@
            frameBack.AddChidren(btnProgress1);



            //进度条

            var seekBar1 = new HorizontalSeekBar();

            var seekBar1 = new SeekBarControl();

            seekBar1.Y = Application.GetRealHeight(253);

            seekBar1.Gravity = Gravity.CenterHorizontal;

            seekBar1.Width = Application.GetRealWidth(962);

            seekBar1.Height = Application.GetRealHeight(81);

            seekBar1.Max = 100;

            seekBar1.BackgroundColor = 0xfff5f5f5;

            seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;

            seekBar1.ProgressColor = 0xff3e99f4;

            seekBar1.Progress = energyModeInfo.level;

            seekBar1.ProgressBarColor = 0xff3e99f4;

            frameBack.AddChidren(seekBar1);

            seekBar1.ProgressChanged += (sender, value) =>

            seekBar1.ProgressChangedEvent += (div, value) =>

            {

                btnProgress1.Text = value + "%";

                //数据变更

                energyModeInfo.level = value;

            };

            seekBar1.Progress = energyModeInfo.level;



            var btnTemp1 = new NormalViewControl(200, 49, true);

            btnTemp1.X = ControlCommonResourse.XXLeft;

@@ -236,27 +230,20 @@
            btnProgress1.Y = Application.GetRealHeight(52);

            btnProgress1.TextSize = 12;

            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";

            btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";

            frameBack.AddChidren(btnProgress1);



            //进度条

            var seekBar1 = new HorizontalSeekBar();

            var seekBar1 = new SeekBarControl();

            seekBar1.Y = Application.GetRealHeight(147);

            seekBar1.Gravity = Gravity.CenterHorizontal;

            seekBar1.Width = Application.GetRealWidth(962);

            seekBar1.Height = Application.GetRealHeight(81);

            seekBar1.Max = 100;

            seekBar1.BackgroundColor = 0xfff5f5f5;

            seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;

            seekBar1.ProgressColor = 0xfffdb500;

            seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;

            frameBack.AddChidren(seekBar1);

            seekBar1.ProgressChanged += (sender, value) =>

            seekBar1.ProgressChangedEvent += (div, value) =>

            {

                btnProgress1.Text = value + "%";

                //数据变更

                linghtLevelInfo.panelDirectionsLevel = value;

                linghtLevelInfo.panelBacklightLevel = value;

            };

            seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;



            var btnTemp1 = new NormalViewControl(200, 49, true);

            btnTemp1.X = ControlCommonResourse.XXLeft;

@@ -278,8 +265,8 @@
            var frameColor = new FrameLayoutControl();

            frameColor.UseClickStatu = false;

            frameColor.Width = Application.GetRealHeight(262);

            frameColor.Height = Application.GetMinRealAverage(69);

            frameColor.Y = Application.GetRealHeight(41);

            frameColor.Height = Application.GetMinRealAverage(79);

            frameColor.Y = Application.GetRealHeight(26);

            frameColor.X = frameLinght.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);

            frameBack.AddChidren(frameColor);

            //颜色

@@ -287,6 +274,7 @@
            btnColorView.Gravity = Gravity.CenterVertical;

            btnColorView.TextAlignment = TextAlignment.CenterRight;

            btnColorView.TextSize = 12;

            btnColorView.Y = Application.GetRealHeight(5);

            btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnColorView.TextID = R.MyInternationalizationString.uColor;

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);

@@ -295,14 +283,28 @@
            int G1 = Convert.ToInt32(this.keyColorData.CloseColorG, 16);

            int B1 = Convert.ToInt32(this.keyColorData.CloseColorB, 16);

            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);



            //颜色外框

            var btnColorLine = new NormalViewControl(Application.GetMinRealAverage(79), Application.GetMinRealAverage(79), false);

            btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);

            btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xff666666;

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);



            var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);

            btnColor.Y = Application.GetRealHeight(5);

            btnColor.X = btnColorView.Right + Application.GetRealHeight(23);

            btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;

            btnColor.BackgroundColor = backColor;

            frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);



            //变更滑动条的颜色

            seekBar1.ProgressBarColor = backColor;



            var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);

            btnRight.UnSelectedImagePath = "Item/Next.png";

            btnRight.UnSelectedImagePath = "Item/RightNext.png";

            btnRight.Y = Application.GetRealHeight(5);

            btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

            btnRight.Y += Application.GetMinRealAverage(8);

@@ -322,6 +324,8 @@
                    this.keyColorData.CloseColorB = Convert.ToString(Bcolor, 16);



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

                    //变更滑动条的颜色

                    seekBar1.ProgressBarColor = btnColor.BackgroundColor;

                };

            };

        }

@@ -363,27 +367,20 @@
            btnProgress1.Y = Application.GetRealHeight(52);

            btnProgress1.TextSize = 12;

            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";

            btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";

            frameBack.AddChidren(btnProgress1);



            //进度条

            var seekBar1 = new HorizontalSeekBar();

            var seekBar1 = new SeekBarControl();

            seekBar1.Y = Application.GetRealHeight(147);

            seekBar1.Gravity = Gravity.CenterHorizontal;

            seekBar1.Width = Application.GetRealWidth(962);

            seekBar1.Height = Application.GetRealHeight(81);

            seekBar1.Max = 100;

            seekBar1.BackgroundColor = 0xfff5f5f5;

            seekBar1.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;

            seekBar1.ProgressColor = 0xff2b62fd;

            seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;

            frameBack.AddChidren(seekBar1);

            seekBar1.ProgressChanged += (sender, value) =>

            seekBar1.ProgressChangedEvent += (div, value) =>

            {

                btnProgress1.Text = value + "%";

                //数据变更

                linghtLevelInfo.panelBacklightLevel = value;

                linghtLevelInfo.panelDirectionsLevel = value;

            };

            seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;



            var btnTemp1 = new NormalViewControl(200, 49, true);

            btnTemp1.X = ControlCommonResourse.XXLeft;

@@ -405,8 +402,8 @@
            var frameColor = new FrameLayoutControl();

            frameColor.UseClickStatu = false;

            frameColor.Width = Application.GetRealHeight(262);

            frameColor.Height = Application.GetMinRealAverage(69);

            frameColor.Y = Application.GetRealHeight(41);

            frameColor.Height = Application.GetMinRealAverage(79);

            frameColor.Y = Application.GetRealHeight(26);

            frameColor.X = frameLinght.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);

            frameBack.AddChidren(frameColor);

            //颜色

@@ -414,6 +411,7 @@
            btnColorView.Gravity = Gravity.CenterVertical;

            btnColorView.TextAlignment = TextAlignment.CenterRight;

            btnColorView.TextSize = 12;

            btnColorView.Y = Application.GetRealHeight(5);

            btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnColorView.TextID = R.MyInternationalizationString.uColor;

            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEventOnly);

@@ -422,14 +420,28 @@
            int G1 = Convert.ToInt32(this.keyColorData.OpenColorG, 16);

            int B1 = Convert.ToInt32(this.keyColorData.OpenColorB, 16);

            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);



            //颜色外框

            var btnColorLine = new NormalViewControl(Application.GetMinRealAverage(79), Application.GetMinRealAverage(79), false);

            btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);

            btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;

            btnColorLine.BorderWidth = 1;

            btnColorLine.BorderColor = 0xff666666;

            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);



            var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);

            btnColor.X = btnColorView.Right + Application.GetRealHeight(23);

            btnColor.Y = Application.GetRealHeight(5);

            btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;

            btnColor.BackgroundColor = backColor;

            frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);



            //变更滑动条的颜色

            seekBar1.ProgressBarColor = backColor;



            var btnRight = new NormalViewControl(Application.GetMinRealAverage(58), Application.GetMinRealAverage(58), false);

            btnRight.UnSelectedImagePath = "Item/Next.png";

            btnRight.UnSelectedImagePath = "Item/RightNext.png";

            btnRight.Y = Application.GetRealHeight(5);

            btnRight.X = frameColor.Width - Application.GetMinRealAverage(58);

            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);

            btnRight.Y += Application.GetMinRealAverage(8);

@@ -448,7 +460,9 @@
                    this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);

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



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

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

                    //变更滑动条的颜色

                    seekBar1.ProgressBarColor = btnColor.BackgroundColor;

                };

            };

        }

@@ -513,13 +527,14 @@
            }

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

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

            this.CloseProgressBar();

            if (result == false)

            {

                this.CloseProgressBar();

                return;

            }

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

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

            this.CloseProgressBar();

            if (result == false)

            {

                return;