合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

 ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs

@@ -186,24 +186,18 @@
            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;

                valueChanged = true;

            };

            seekBar1.Progress = energyModeInfo.level;



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

            btnTemp1.X = ControlCommonResourse.XXLeft;

@@ -258,24 +252,18 @@
            frameLinght.AddChidren(btnProgress1);



            //进度条

            var seekBar1 = new HorizontalSeekBar();

            var seekBar1 = new SeekBarControl();

            seekBar1.Y = Application.GetRealHeight(124);

            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;

            seekBar1.ProgressBarColor = 0xfffdb500;

            frameLinght.AddChidren(seekBar1);

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

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

            {

                btnProgress1.Text = value + "%";

                //数据变更

                linghtLevelInfo.panelDirectionsLevel = value;

                valueChanged = true;

            };

            seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;



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

            btnTemp1.X = ControlCommonResourse.XXLeft;

@@ -328,24 +316,18 @@
            frameLinght.AddChidren(btnProgress1);



            //进度条

            var seekBar1 = new HorizontalSeekBar();

            var seekBar1 = new SeekBarControl();

            seekBar1.Y = Application.GetRealHeight(464);

            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.panelBacklightLevel;

            seekBar1.ProgressBarColor = 0xfffdb500;

            frameLinght.AddChidren(seekBar1);

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

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

            {

                btnProgress1.Text = value + "%";

                //数据变更

                linghtLevelInfo.panelBacklightLevel = value;

                valueChanged = true;

            };

            seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;



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

            btnTemp1.X = ControlCommonResourse.XXLeft;