2024年07月25日17:24:45

mac

2024-07-25 3f6685c77beeb12baf840733fb890860f4c26e7c

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

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

            btnSwitch.MouseUpEventHandler = (sender, e) =>
            {
                if (!function.online)//离线不允许操作
                {
                    new Tip()
                    {
                        CloseTime = 1,
                        Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
                        Direction = AMPopTipDirection.None,
                    }.Show(MainPage.BaseView);
                    return;
                }
                //DriverLayer.Control.Ins.GatewayOnline_Cloud = false;
                //DriverLayer.Control.Ins.GatewayOnline_Local = true;
                //if (!function.isOnline())//离线不允许操作
                //{
                //    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,7 +135,7 @@
        /// </summary>
        void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
        {
            if (!function.online)//离线不允许操作
            if (!function.isOnline())//离线不允许操作
            {
                //new Tip()
                //{
@@ -143,7 +145,7 @@
                //}.Show(MainPage.BaseView);
                return;
            }
            if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
            if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB || function.spk == SPK.LightCCT)
            {
                dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
                    onDimmerBar = true;
@@ -280,7 +282,7 @@
            };
            btnUp.MouseUpEventHandler = (sender, e) =>
            {
                if (!function.online)//离线不允许操作
                if (!function.isOnline())//离线不允许操作
                {
                    new Tip()
                    {
@@ -311,7 +313,7 @@
            };
            btnDown.MouseUpEventHandler = (sender, e) =>
            {
                if (!function.online)//离线不允许操作
                if (!function.isOnline())//离线不允许操作
                {
                    new Tip()
                    {
@@ -405,7 +407,18 @@
        /// </summary>
        void LoadEvent_DivSkipEvent()
        {
            var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor,Comerom.function);
            //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;