合并温居城代码

wxr

2021-07-01 b409ece9569247d7e7b44fc15e8a02556ca05a57

 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs

@@ -105,13 +105,33 @@
                {
                    lightTemp.SetRGBcolor(e2,function);
                    colorChangeTime = DateTime.Now;
                    btnCurColor.BackgroundColor = (uint)(0xFF000000 + lightTemp.GetRGBcolor(function));
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.RGB, lightTemp.GetRGBcolorString(function));
                    Control.Ins.SendWriteCommand(function, d);
                }

            };
            colorPicker.MouseDownEventHandler += (sender, e) =>
            {
                if (function.trait_on_off.curValue.ToString() == "off")
                {
                    return;
                }
                pointIsRight = this.CheckPoint(circleR, colorPicker.Width / 2, colorPicker.Height / 2, (int)e.X, (int)e.Y);
                if (pointIsRight == false)
                {
                    //点的区域不是圆盘内
                    return;
                }
                //显示白点
                btnWhiteRound.X = (int)e.X - btnWhiteRound.Width / 2;
                btnWhiteRound.Y = (int)e.Y - btnWhiteRound.Height / 2;
                if (btnWhiteRound.Visible == true)
                {
                    btnWhiteRound.Visible = false;
                }
            };
            colorPicker.MouseUpEventHandler += (sender, e) =>
            {
                if (function.trait_on_off.curValue.ToString() == "off")
                {
@@ -131,10 +151,30 @@
                    btnWhiteRound.Visible = true;
                }
            };



            colorPicker.MouseMoveEventHandler += (sender, e) =>
            {
                //当鼠标点下事件处理
                colorPicker.MouseDownEventHandler(sender, e);
                if (function.trait_on_off.curValue.ToString() == "off")
                {
                    return;
                }
                pointIsRight = this.CheckPoint(circleR, colorPicker.Width / 2, colorPicker.Height / 2, (int)e.X, (int)e.Y);
                if (pointIsRight == false)
                {
                    //点的区域不是圆盘内
                    return;
                }
                //显示白点
                btnWhiteRound.X = (int)e.X - btnWhiteRound.Width / 2;
                btnWhiteRound.Y = (int)e.Y - btnWhiteRound.Height / 2;
                if (btnWhiteRound.Visible == false)
                {
                    btnWhiteRound.Visible = true;
                }
                btnCurColor.BackgroundColor = (uint)(0xFF000000 + lightTemp.GetRGBcolor(function));
            };
        }