备份

wxr

2023-09-11 ec5a167e0366a75642e45dbd30817c1c8ae57e79

 OnPro/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs

@@ -88,16 +88,6 @@
        /// </summary>
        void LoadColorChangeEvent()
        {
            if (!function.isOnline())
            {
                new Tip()
                {
                    CloseTime = 1,
                    Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                    Direction = AMPopTipDirection.None,
                }.Show(MainPage.BaseView);
                return;
            }
            DateTime colorChangeTime = DateTime.MinValue;
            //bool send = false;

@@ -120,10 +110,6 @@
                //    send = false;
                //}
            };

            //colorPicker.MouseUpEventHandler += (sender, e) => {
            //    send = true;
            //};

            colorPicker.MouseDownEventHandler += (sender, e) =>
            {
@@ -150,24 +136,6 @@
            {
                //当鼠标点下事件处理
                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));
            };

            var colorChangeEvent = new System.Threading.Thread(() => {
@@ -218,16 +186,6 @@

            dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
            {
                if (!function.isOnline())
                {
                    new Tip()
                    {
                        CloseTime = 1,
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                curDimmerStatus = false;
                function.SetAttrState(FunctionAttributeKey.Brightness, dimmerBar.Progress);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -235,8 +193,6 @@

                Control.Ins.SendWriteCommand(function, d);
            };
            if (function.isOnline())
            {
                dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
                {
                    curDimmerStatus = onDimmerBar = true;
@@ -276,7 +232,6 @@
                        }
                    }
                };
            }
        }
        /// <summary>
        /// 修改灯光渐变时间
@@ -339,10 +294,6 @@
        {
            btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
            {
                if (!function.isOnline())
                {
                    return;
                }
                if (function.trait_on_off.curValue.ToString() == "off")
                {
                    return;