From 145b157ba183ebf877c93ed2dbb01ec737c993d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 十二月 2020 18:59:33 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 5474311..ce1e8f8 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -46,12 +46,12 @@
case FunctionType.Dimmer:
case FunctionType.RGB:
case FunctionType.RGBW:
- case FunctionType.CCT:
+ case FunctionType.ColorTemperature:
case FunctionType.Relay:
//绐楀笜
case FunctionType.Curtain:
- case FunctionType.RollerCurtain:
- case FunctionType.TrietexCurtain:
+ case FunctionType.RollingShutter:
+ case FunctionType.MotorCurtain:
//绌鸿皟
case FunctionType.AC:
//鍦扮儹
@@ -166,12 +166,12 @@
case FunctionType.Dimmer:
case FunctionType.RGB:
case FunctionType.RGBW:
- case FunctionType.CCT:
+ case FunctionType.ColorTemperature:
case FunctionType.Relay:
//绐楀笜
case FunctionType.Curtain:
- case FunctionType.RollerCurtain:
- case FunctionType.TrietexCurtain:
+ case FunctionType.RollingShutter:
+ case FunctionType.MotorCurtain:
//绌鸿皟
case FunctionType.AC:
//鍦扮儹
--
Gitblit v1.8.0