2023年07月26日13:12:21

wjc

2023-07-26 9508510f0b27da3278fa1161eb2ba3dd1e3e2030

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

@@ -58,6 +58,20 @@
                        {
                            bodyView.btnCurColor.BorderColor = 0x00000000;
                        }
                        try
                        {
                            var colorfulState = updateTemp.GetAttribute(FunctionAttributeKey.Colorful);
                            if (colorfulState != null)
                            {
                                if(bodyView.btnColorfulSwitch!= null)
                                {
                                    bodyView.btnColorfulSwitch.IsSelected = colorfulState.curValue.ToString() == "on";
                                }
                            }
                        }catch(Exception ex)
                        {
                            MainPage.Log($"更新RGB 炫彩开关状态异常:{ex.Message}");
                        }
                    }
                }
                catch (Exception ex)
@@ -88,13 +102,23 @@
        /// </summary>
        void LoadColorChangeEvent()
        {
            if (!function.online)
            {
                new Tip()
                {
                    CloseTime = 1,
                    Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                    Direction = AMPopTipDirection.None,
                }.Show(MainPage.BaseView);
                return;
            }
            DateTime colorChangeTime = DateTime.MinValue;
            //bool send = false;

            //当前点击的【点】是否正确
            bool pointIsRight = false;
            //圆的半径(考虑边界,需要设置它的半径比较小一点)
            int circleR = colorPicker.Width / 2 - Application.GetRealWidth(12);
            int circleR = colorPicker.Width / 2 - Application.GetRealWidth(2);

            colorPicker.ColorChaged += (sender2, e2) => {
                if (function.trait_on_off.curValue.ToString() == "off" || pointIsRight == false)
@@ -138,24 +162,7 @@
            {
                //当鼠标点下事件处理
                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(() => {
@@ -175,6 +182,7 @@
                            lightTemp.SetRGBcolor(lastColor, function);
                            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                            d.Add(FunctionAttributeKey.RGB, lightTemp.GetRGBcolorString(function));
                            d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
                            Control.Ins.SendWriteCommand(function, d,false,0);
                            break;
                        }
@@ -197,64 +205,75 @@
            };
        }

        bool curDimmerStatus = false;
        /// <summary>
        /// 灯光调光事件
        /// </summary>
        void LoadEvent_DimmerBar()
        {
            dimmerBar.OnStartTrackingTouchEvent = (sender, e)=>{
                onDimmerBar = true;
            };
            dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
                new System.Threading.Thread(() => {
                    System.Threading.Thread.Sleep(200);
                    onDimmerBar = false;
                })
                { IsBackground = true }.Start();

            dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
            {
                if (!function.online)
                {
                    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>();
                d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
               

                Control.Ins.SendWriteCommand(function, d);
            };
            dimmerBar.OnProgressChangedEvent = (sender, e) => {
                //function.fadeTime = 0;
                //if (!btnSwitch.IsSelected)
                //{
                //    dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
                //}
                //btnSwitch.IsSelected = e > 0 ? true : false;
                //function.brightness = e;
                //function.trait_on_off.curValue = e > 0 ? "on" : "off";
            if (function.online)
            {
                dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
                {
                    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";

                //if (e == 0 || e == 100)
                //{
                //    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                //    d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString());
                //    Control.Ins.SendWriteCommand(function, d);
                //}
                //else
                //{
                //    if (200 < (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, function.brightness.ToString());
                //            Control.Ins.SendWriteCommand(function, d);
                //        })
                //        { IsBackground = true }.Start();
                //    }
                //    else
                //    {
                //        MainPage.Log("skip dimmer control!!");
                //    }
                //}
            };
                    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)
                        {
                            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!!");
                        }
                    }
                };
            }
        }

        /// <summary>
        /// 修改灯光渐变时间
        /// </summary>
@@ -265,6 +284,9 @@
                barFadeTime.OnStopTrackingTouchEvent = (sender, e) =>
                {
                    function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString());
                    var d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.FadeTime, e.ToString());
                    Control.Ins.SendWriteCommand(function, d);
                    function.SaveFunctionFile();
                };
            }
@@ -284,6 +306,10 @@
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
                    {
                        d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    }
                    if (btnSwitch.IsSelected)
                    {
                        if(function.lastBrightness == 0)
@@ -309,6 +335,10 @@
        {
            btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
            {
                if (!function.online)
                {
                    return;
                }
                if(function.trait_on_off.curValue.ToString() == "off")
                {
                    return;