From 3db5c3218f405795dc9a2d0f6afdde8ab8ac9e73 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 23 十一月 2021 09:11:30 +0800
Subject: [PATCH] Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 4791f34..cdaef53 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -81,7 +81,7 @@
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
- if(function.spk == SPK.IrLearn || function.spk == SPK.TvIr)
+ if(SPK.NotStatusSpkList.Contains( function.spk ))
{
new System.Threading.Thread(() => {
System.Threading.Thread.Sleep(2000);
@@ -119,7 +119,7 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- if (function.Spk_Prefix == FunctionCategory.Light)
+ if (SPK.LightSpkList().Contains( function.spk))
{
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
Dictionary<string, string> d = new Dictionary<string, string>();
--
Gitblit v1.8.0