备份

wxr

2023-09-11 ec5a167e0366a75642e45dbd30817c1c8ae57e79

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

@@ -102,16 +102,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;

@@ -211,19 +201,8 @@
        /// </summary>
        void LoadEvent_DimmerBar()
        {

            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>();
@@ -231,48 +210,45 @@

                Control.Ins.SendWriteCommand(function, d);
            };
            if (function.isOnline())
            dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
            {
                dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
                curDimmerStatus = onDimmerBar = true;
            };
            dimmerBar.OnProgressChangedEvent = (sender, e) =>
            {
                if (!btnSwitch.IsSelected)
                {
                    curDimmerStatus = onDimmerBar = true;
                };
                dimmerBar.OnProgressChangedEvent = (sender, e) =>
                {
                    if (!btnSwitch.IsSelected)
                    {
                        dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
                    }
                    btnSwitch.IsSelected = e > 0 ? true : false;
                    function.trait_on_off.curValue = e > 0 ? "on" : "off";
                    dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
                }
                btnSwitch.IsSelected = e > 0 ? true : false;
                function.trait_on_off.curValue = e > 0 ? "on" : "off";

                    if (e == 0 || e == 100)
                if (e == 0 || e == 100)
                {
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.Brightness, e.ToString());
                    Control.Ins.SendWriteCommand(function, d);
                }
                else
                {
                    if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                    {
                        System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                        d.Add(FunctionAttributeKey.Brightness, e.ToString());
                        Control.Ins.SendWriteCommand(function, d);
                        function.refreshTime = DateTime.Now;
                        new System.Threading.Thread(() =>
                        {
                            //Control.Send(CommandType_A.write, function);
                            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                            d.Add(FunctionAttributeKey.Brightness, e.ToString());
                            Control.Ins.SendWriteCommand(function, d);
                        })
                        { IsBackground = true }.Start();
                    }
                    else
                    {
                        if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                        {
                            function.refreshTime = DateTime.Now;
                            new System.Threading.Thread(() =>
                            {
                                //Control.Send(CommandType_A.write, function);
                                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                                d.Add(FunctionAttributeKey.Brightness, e.ToString());
                                Control.Ins.SendWriteCommand(function, d);
                            })
                            { IsBackground = true }.Start();
                        }
                        else
                        {
                            MainPage.Log("skip dimmer control!!");
                        }
                        MainPage.Log("skip dimmer control!!");
                    }
                };
            }
                }
            };
        }
        /// <summary>
        /// 修改灯光渐变时间
@@ -335,10 +311,6 @@
        {
            btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
            {
                if (!function.isOnline())
                {
                    return;
                }
                if(function.trait_on_off.curValue.ToString() == "off")
                {
                    return;