From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 29 八月 2023 09:22:38 +0800 Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc --- HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs index 2654e0b..124ed5f 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs @@ -102,7 +102,7 @@ /// </summary> void LoadColorChangeEvent() { - if (!function.online) + if (!function.isOnline()) { new Tip() { @@ -182,7 +182,6 @@ lightTemp.SetRGBcolor(lastColor, function); System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add(FunctionAttributeKey.RGB, lightTemp.GetRGBcolorString(function)); - d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString()); Control.Ins.SendWriteCommand(function, d,false,0); break; } @@ -214,7 +213,7 @@ dimmerBar.OnStopTrackingTouchEvent = (sender, e) => { - if (!function.online) + if (!function.isOnline()) { new Tip() { @@ -224,14 +223,26 @@ }.Show(MainPage.BaseView); return; } - curDimmerStatus = false; + if(dimmerBar.Progress==0|| dimmerBar.Progress == 100) + { + if (dimmerBar.Progress == 0) + { + //瑙e喅閮ㄥ垎瀹夊崜鎵嬫満锛屽埛鏂板浘鐗囨椂浼氬彉灏忛棶棰� + if (bodyView.colorPicker.ColorImagePath != "FunctionIcon/Light/ColorWheelGray.png") + { + bodyView.colorPicker.ColorImagePath = "FunctionIcon/Light/ColorWheelGray.png"; + } + } + return; + } + onDimmerBar = 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()); Control.Ins.SendWriteCommand(function, d); }; - if (function.online) + if (function.isOnline()) { dimmerBar.OnStartTrackingTouchEvent = (sender, e) => { @@ -286,7 +297,7 @@ function.SetAttrState(FunctionAttributeKey.FadeTime, e.ToString()); var d = new System.Collections.Generic.Dictionary<string, string>(); d.Add(FunctionAttributeKey.FadeTime, e.ToString()); - Control.Ins.SendWriteCommand(function, d); + //Control.Ins.SendWriteCommand(function, d); function.SaveFunctionFile(); }; } @@ -335,7 +346,7 @@ { btnRestoredPoint.MouseUpEventHandler = (sender, e) => { - if (!function.online) + if (!function.isOnline()) { return; } -- Gitblit v1.8.0