合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

 ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectCurtainForm.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(5) == true)

            {

                //5:百分比调节

                seekBar.Progress = dicTaskinfo[5].Data2;

            }

            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(0);

                }

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

                    btnOpen.TextColor = UserCenterColor.Current.TextColor1;

                    seekBar.Enable = true;

                    seekBar.ProgressColor = 0xfffdb500;

                    if (seekBar.Progress == 0)

                    {

                        seekBar.Progress = 100;

@@ -249,7 +241,6 @@
                    //开 不可用

                    btnOpen.TextColor = UserCenterColor.Current.TextGrayColor3;

                    seekBar.Enable = false;

                    seekBar.ProgressColor = 0xffe8e8e8;



                    //移除打开

                    dicTaskinfo.Remove(0);