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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectLightForm.cs

@@ -135,23 +135,17 @@
            }



            //进度条

            var seekBar = new HorizontalSeekBar();

            seekBar.Enable = false;

            var seekBar = new SeekBarControl(919);

            seekBar.Y = Application.GetRealHeight(268);

            seekBar.Gravity = Gravity.CenterHorizontal;

            seekBar.Width = Application.GetRealWidth(919);

            seekBar.Height = Application.GetRealHeight(89);

            seekBar.Max = 100;

            seekBar.BackgroundColor = 0xfff5f5f5;

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

            seekBar.ProgressColor = 0xfffdb500;

            seekBar.ProgressBarColor = 0xfffdb500;

            seekBar.Enable = false;

            if (dicTaskinfo.ContainsKey(3) == true)

            {

                //3:亮度调节

                seekBar.Progress = dicTaskinfo[3].Data1;

            }

            detailBackFrame.AddChidren(seekBar);

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

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

            {

                btnPersent.Text = value + "%";

            };

@@ -196,7 +190,6 @@
                    btnOpenSelect.Visible = false;

                    btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;

                    seekBar.Enable = false;

                    seekBar.ProgressColor = 0xffe8e8e8;



                    dicTaskinfo.Remove(1);

                }

@@ -209,7 +202,6 @@
                    //开 可用

                    btnOpen.TextColor = UserCenterColor.Current.TextColor1;

                    seekBar.Enable = true;

                    seekBar.ProgressColor = 0xfffdb500;

                    if (seekBar.Progress == 0)

                    {

                        seekBar.Progress = 100;

@@ -247,7 +239,6 @@
                    //开 不可用

                    btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;

                    seekBar.Enable = false;

                    seekBar.ProgressColor = 0xffe8e8e8;



                    dicTaskinfo[1] = new Safeguard.TaskListInfo();

                    dicTaskinfo[1].TaskType = 1;

@@ -295,8 +286,6 @@


                this.CloseForm();

            };

            //动画效果

            frameTransparent.Animate = Animate.DownToUp;

        }



        #endregion