20201224-2

wei

2020-12-24 22fcd0d263770c8371bd03ca53f097a6ec1678f7

 HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs

@@ -66,14 +66,14 @@
            btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
            {
                btnCollectionIcon.IsSelected = function.collect = !btnCollectionIcon.IsSelected;
                function.SaveFunctionData(true);
                function.CollectFunction();
            };
        }

        /// <summary>
        /// 开关事件
        /// </summary>
        void LoadEvent_SwitchFunction(Button btnSwitch)
        void LoadEvent_SwitchFunction(Button btnSwitch,FunctionAttributes fadeTime = null)
        {
            btnSwitch.MouseUpEventHandler = (sender, e) =>
            {
@@ -81,9 +81,14 @@
                new System.Threading.Thread(() =>
                {
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    //Control.Send(CommandType_A.write, function);
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add("on_off", function.trait_on_off.curValue.ToString());
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    if(fadeTime!= null)
                    {
                        int result = 0;
                        int.TryParse(fadeTime.curValue.ToString(), out result);
                        d.Add(FunctionAttributeKey.FadeTime, result.ToString());
                    }
                    Control.Ins.SendWriteCommand(function, d);
                })
                { IsBackground = true }.Start();
@@ -136,32 +141,33 @@
                    Control.Ins.SendWriteCommand(light, d);
                };
                dimmerControlBar.OnProgressChangedEvent = (sender, e) => {
                    light.brightness = e;
                    light.trait_on_off.curValue = e > 0 ? "on" : "off";
                    dimmerControlBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
                    //light.brightness = e;
                    //light.trait_on_off.curValue = e > 0 ? "on" : "off";

                    if (e == 0 || e == 100)
                    {
                        //Control.Send(CommandType_A.write, light);
                        System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                        d.Add("brightness", light.brightness.ToString());
                        Control.Ins.SendWriteCommand(light, d);
                    }
                    else
                    {
                        var tm = (DateTime.Now - light.refreshTime).TotalMilliseconds;
                        Console.WriteLine("skip time "+tm);
                        if (300 < tm)
                        {
                            light.refreshTime = DateTime.Now;
                            new System.Threading.Thread(() =>
                            {
                                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                                d.Add("brightness", light.brightness.ToString());
                                Control.Ins.SendWriteCommand(light, d);
                            })
                            { IsBackground = true }.Start();
                        }
                    }
                    //if (e == 0 || e == 100)
                    //{
                    //    //Control.Send(CommandType_A.write, light);
                    //    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    //    d.Add("brightness", light.brightness.ToString());
                    //    Control.Ins.SendWriteCommand(light, d);
                    //}
                    //else
                    //{
                    //    var tm = (DateTime.Now - light.refreshTime).TotalMilliseconds;
                    //    Console.WriteLine("skip time "+tm);
                    //    if (300 < tm)
                    //    {
                    //        light.refreshTime = DateTime.Now;
                    //        new System.Threading.Thread(() =>
                    //        {
                    //            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    //            d.Add("brightness", light.brightness.ToString());
                    //            Control.Ins.SendWriteCommand(light, d);
                    //        })
                    //        { IsBackground = true }.Start();
                    //    }
                    //}
                };
            }