From b079d370b3c23751a5d200dc2d25f6c80977b4d4 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 11 三月 2022 15:03:50 +0800 Subject: [PATCH] 代码同步 --- HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 115 ++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 73 insertions(+), 42 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs index 8281d85..ef4bf1b 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs @@ -88,6 +88,16 @@ /// </summary> void LoadColorChangeEvent() { + if (!function.online) + { + new Tip() + { + CloseTime = 1, + Text = Language.StringByID(StringId.DeviceOfflineCannotOption), + Direction = AMPopTipDirection.None, + }.Show(MainPage.BaseView); + return; + } DateTime colorChangeTime = DateTime.MinValue; //bool send = false; @@ -202,11 +212,21 @@ /// </summary> void LoadEvent_DimmerBar() { - dimmerBar.OnStartTrackingTouchEvent = (sender, e)=>{ - onDimmerBar = true; - }; - dimmerBar.OnStopTrackingTouchEvent = (sender, e) => { - new System.Threading.Thread(() => { + + dimmerBar.OnStopTrackingTouchEvent = (sender, e) => + { + 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(200); onDimmerBar = false; }) @@ -214,47 +234,54 @@ 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()); - + Control.Ins.SendWriteCommand(function, d); }; - dimmerBar.OnProgressChangedEvent = (sender, e) => { - //function.fadeTime = 0; - //if (!btnSwitch.IsSelected) - //{ - // dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1; - //} - //btnSwitch.IsSelected = e > 0 ? true : false; - //function.brightness = e; - //function.trait_on_off.curValue = e > 0 ? "on" : "off"; + if (function.online) + { + dimmerBar.OnStartTrackingTouchEvent = (sender, e) => + { + onDimmerBar = true; + }; + dimmerBar.OnProgressChangedEvent = (sender, e) => + { + //function.fadeTime = 0; + //if (!btnSwitch.IsSelected) + //{ + // dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1; + //} + //btnSwitch.IsSelected = e > 0 ? true : false; + //function.brightness = e; + //function.trait_on_off.curValue = e > 0 ? "on" : "off"; - //if (e == 0 || e == 100) - //{ - // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); - // d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString()); - // Control.Ins.SendWriteCommand(function, d); - //} - //else - //{ - // if (200 < (DateTime.Now - function.refreshTime).TotalMilliseconds) - // { - // function.refreshTime = DateTime.Now; - // new System.Threading.Thread(() => - // { - // //Control.Send(CommandType_A.write, function); - // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); - // d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString()); - // Control.Ins.SendWriteCommand(function, d); - // }) - // { IsBackground = true }.Start(); - // } - // else - // { - // MainPage.Log("skip dimmer control!!"); - // } - //} - }; + //if (e == 0 || e == 100) + //{ + // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + // d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString()); + // Control.Ins.SendWriteCommand(function, d); + //} + //else + //{ + // if (200 < (DateTime.Now - function.refreshTime).TotalMilliseconds) + // { + // function.refreshTime = DateTime.Now; + // new System.Threading.Thread(() => + // { + // //Control.Send(CommandType_A.write, function); + // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); + // d.Add(FunctionAttributeKey.Brightness, function.brightness.ToString()); + // Control.Ins.SendWriteCommand(function, d); + // }) + // { IsBackground = true }.Start(); + // } + // else + // { + // MainPage.Log("skip dimmer control!!"); + // } + //} + }; + } } - /// <summary> /// 淇敼鐏厜娓愬彉鏃堕棿 /// </summary> @@ -309,6 +336,10 @@ { btnRestoredPoint.MouseUpEventHandler = (sender, e) => { + if (!function.online) + { + return; + } if(function.trait_on_off.curValue.ToString() == "off") { return; -- Gitblit v1.8.0