Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

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

@@ -86,16 +86,16 @@

            btnSwitch.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;
                }
                btnSwitch.IsSelected = !btnSwitch.IsSelected;

                if(SPK.NotStatusSpkList.Contains( function.spk ))
@@ -133,16 +133,16 @@
        /// </summary>
        void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
        {
            //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;
            }
            if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
            {
                dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
@@ -280,16 +280,16 @@
            };
            btnUp.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;
                }
                new System.Threading.Thread(() =>
                {
                    System.Threading.Thread.Sleep(2000);
@@ -311,16 +311,16 @@
            };
            btnDown.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;
                }
                new System.Threading.Thread(() =>
                {
                    System.Threading.Thread.Sleep(2000);
@@ -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;