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/2-Classification/FunctionControlZoneBLL.cs | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs index 9eba782..e75b636 100644 --- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs +++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs @@ -86,7 +86,7 @@ btnSwitch.MouseUpEventHandler = (sender, e) => { - if (!function.online)//绂荤嚎涓嶅厑璁告搷浣� + if (!function.isOnline())//绂荤嚎涓嶅厑璁告搷浣� { new Tip() { @@ -133,7 +133,7 @@ /// </summary> void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar) { - if (!function.online)//绂荤嚎涓嶅厑璁告搷浣� + if (!function.isOnline())//绂荤嚎涓嶅厑璁告搷浣� { //new Tip() //{ @@ -143,7 +143,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 +280,7 @@ }; btnUp.MouseUpEventHandler = (sender, e) => { - if (!function.online)//绂荤嚎涓嶅厑璁告搷浣� + if (!function.isOnline())//绂荤嚎涓嶅厑璁告搷浣� { new Tip() { @@ -311,7 +311,7 @@ }; btnDown.MouseUpEventHandler = (sender, e) => { - if (!function.online)//绂荤嚎涓嶅厑璁告搷浣� + if (!function.isOnline())//绂荤嚎涓嶅厑璁告搷浣� { new Tip() { -- Gitblit v1.8.0