备份

wxr

2023-09-11 ec5a167e0366a75642e45dbd30817c1c8ae57e79

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

@@ -93,63 +93,60 @@
        /// </summary>
        void LoadEvent_DimmerBar()
        {
            if (function.isOnline())
            dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
            {
                dimmerBar.OnStartTrackingTouchEvent = (sender, e) =>
                {
                    curDimmerStatus = onDimmerBar = true;
                    dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                };
                dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
                {
                curDimmerStatus = onDimmerBar = true;
                dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
            };
            dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
            {

                    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());
                    //if(dimmerBar.Progress > 0)
                    //{
                    //    d.Add(FunctionAttributeKey.OnOff, "on");
                    //}
                    Control.Ins.SendWriteCommand(function, d);
                    btnBrightnessText.Text = dimmerBar.Progress + "%";
                };
                //20201223 删除滑动发送命令，防止控件跳动
                dimmerBar.OnProgressChangedEvent = (sender, e) =>
                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());
                //if(dimmerBar.Progress > 0)
                //{
                //    d.Add(FunctionAttributeKey.OnOff, "on");
                //}
                Control.Ins.SendWriteCommand(function, d);
                btnBrightnessText.Text = dimmerBar.Progress + "%";
            };
            //20201223 删除滑动发送命令，防止控件跳动
            dimmerBar.OnProgressChangedEvent = (sender, e) =>
            {

                if (!btnSwitch.IsSelected)
                {
                   
                    if (!btnSwitch.IsSelected)
                    dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                }
                btnSwitch.IsSelected = e > 0 ? true : false;
                function.SetAttrState(FunctionAttributeKey.Brightness, e);
                function.trait_on_off.curValue = e > 0 ? "on" : "off";
                if (e == 0 || e == 100)
                {
                    //Control.Send(CommandType_A.write, this.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);
                }
                else
                {
                    if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                    {
                        dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                    }
                    btnSwitch.IsSelected = e > 0 ? true : false;
                    function.SetAttrState(FunctionAttributeKey.Brightness, e);
                    function.trait_on_off.curValue = e > 0 ? "on" : "off";
                    if (e == 0 || e == 100)
                    {
                        //Control.Send(CommandType_A.write, this.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);
                    }
                    else
                    {
                        if (350 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
                        function.refreshTime = DateTime.Now;
                        new System.Threading.Thread(() =>
                        {
                            function.refreshTime = DateTime.Now;
                            new System.Threading.Thread(() =>
                            {
                                System.Collections.Generic.Dictionary<string, string> dic = new System.Collections.Generic.Dictionary<string, string>();
                                dic.Add(FunctionAttributeKey.Brightness, e.ToString());
                                Control.Ins.SendWriteCommand(function, dic);
                            })
                            { IsBackground = true }.Start();
                        }
                            System.Collections.Generic.Dictionary<string, string> dic = new System.Collections.Generic.Dictionary<string, string>();
                            dic.Add(FunctionAttributeKey.Brightness, e.ToString());
                            Control.Ins.SendWriteCommand(function, dic);
                        })
                        { IsBackground = true }.Start();
                    }
                    btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
                    btnBrightnessText.Text = dimmerBar.Progress + "%";
                };
            }
                }
                btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
                btnBrightnessText.Text = dimmerBar.Progress + "%";
            };
        }
        /// <summary>
        /// 加载开关事件
@@ -158,16 +155,6 @@
        {
            btnSwitch.MouseUpEventHandler += (sender, e) =>
            {
                if (!function.isOnline())
                {
                    new Tip()
                    {
                        CloseTime = 1,
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                if (btnSwitch.IsSelected)
                {
@@ -186,18 +173,6 @@
                    {
                        d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                    }
                    //if (btnSwitch.IsSelected)
                    //{
                    //    if(function.lastBrightness == 0)
                    //    {
                    //        function.lastBrightness = 100;
                    //    }
                    //    d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
                    //}
                    //else
                    //{
                    //    function.lastBrightness = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.Brightness));
                    //}
                    Control.Ins.SendWriteCommand(function, d);
                })
                { IsBackground = true }.Start();