Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

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

@@ -159,32 +159,32 @@
                };
                dimmerControlBar.OnProgressChangedEvent = (sender, e) => {
                    dimmerControlBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
                    //light.brightness = e;
                    //light.trait_on_off.curValue = e > 0 ? "on" : "off";
                    function.SetAttrState(FunctionAttributeKey.Brightness, e);
                    function.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", e.ToString());
                        Control.Ins.SendWriteCommand(function, d);
                    }
                    else
                    {
                        var tm = (DateTime.Now - function.refreshTime).TotalMilliseconds;
                        Console.WriteLine("skip time " + tm);
                        if (500 < tm)
                        {
                            function.refreshTime = DateTime.Now;
                            new System.Threading.Thread(() =>
                            {
                                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                                d.Add("brightness", e.ToString());
                                Control.Ins.SendWriteCommand(function, d);
                            })
                            { IsBackground = true }.Start();
                        }
                    }
                };
            }

@@ -203,16 +203,16 @@
        {
            btnClose.MouseUpEventHandler = (sender, e) =>
            {
                if (!function.online)//离线不允许操作
                {
                    new Tip()
                    {
                        CloseTime = 1,
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                //if (!function.online)//离线不允许操作
                //{
                //    new Tip()
                //    {
                //        CloseTime = 1,
                //        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                //        Direction = AMPopTipDirection.None,
                //    }.Show(MainPage.BaseView);
                //    return;
                //}
                btnClose.IsSelected = true;
                btnStop.IsSelected = false;
                btnOpen.IsSelected = false;
@@ -225,16 +225,16 @@

            btnStop.MouseUpEventHandler = (sender, e) =>
            {
                if (!function.online)//离线不允许操作
                {
                    new Tip()
                    {
                        CloseTime = 1,
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                //if (!function.online)//离线不允许操作
                //{
                //    new Tip()
                //    {
                //        CloseTime = 1,
                //        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                //        Direction = AMPopTipDirection.None,
                //    }.Show(MainPage.BaseView);
                //    return;
                //}
                btnStop.IsSelected = true;
                btnClose.IsSelected = false;
                btnOpen.IsSelected = false;
@@ -246,16 +246,16 @@

            btnOpen.MouseUpEventHandler = (sender, e) =>
            {
                if (!function.online)//离线不允许操作
                {
                    new Tip()
                    {
                        CloseTime = 1,
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                //if (!function.online)//离线不允许操作
                //{
                //    new Tip()
                //    {
                //        CloseTime = 1,
                //        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                //        Direction = AMPopTipDirection.None,
                //    }.Show(MainPage.BaseView);
                //    return;
                //}
                btnOpen.IsSelected = true;
                btnClose.IsSelected = false;
                btnStop.IsSelected = false;
@@ -359,7 +359,7 @@
                a31player.SetAttrState("song_step", "up");
                Dictionary<string, string> dic = new Dictionary<string, string>();
                dic.Add("song_step", "up");
                SendMethod.mMethod.SendControlCommand(a31player, dic);
                SendMethod.Current.SendControlCommand(a31player, dic);
            };
            btnPrev.MouseUpEventHandler = (sender, e) =>
            {
@@ -382,7 +382,7 @@
                a31player.SetAttrState("on_off", status);
                Dictionary<string, string> dic = new Dictionary<string, string>();
                dic.Add("on_off", status);
                SendMethod.mMethod.SendControlCommand(a31player, dic);
                SendMethod.Current.SendControlCommand(a31player, dic);
            };
            ///下一曲点击事件
            btnNext.MouseDownEventHandler = (sender, e) =>
@@ -391,7 +391,7 @@
                a31player.SetAttrState("song_step", "down");
                Dictionary<string, string> dic = new Dictionary<string, string>();
                dic.Add("song_step", "down");
                SendMethod.mMethod.SendControlCommand(a31player, dic);
                SendMethod.Current.SendControlCommand(a31player, dic);
            };
            btnNext.MouseUpEventHandler = (sender, e) =>
            {
@@ -405,7 +405,18 @@
        /// </summary>
        void LoadEvent_DivSkipEvent()
        {
            var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor);
            if (function.spk == SPK.GroupControl)
            {
                EventHandler<MouseEventArgs> handler = (sender, e) => {
                    var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
                    dialog.ShowDialog();
                };
                this.MouseUpEventHandler = handler;
                btnName.MouseUpEventHandler = handler;
                btnFromFloor.MouseUpEventHandler = handler;
                return;
            }
            var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.room,this.action);
            this.MouseUpEventHandler = eventHandler;
            btnName.MouseUpEventHandler = eventHandler;
            btnFromFloor.MouseUpEventHandler = eventHandler;