From f5b46f80546aac860ade6e4c53821e43df833b39 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 11:11:28 +0800
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/wxr4' into dev-tzy"
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index d40c649..461b095 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -308,7 +308,6 @@
case SPK.SensorPir:
case SPK.SensorDoorWindow:
case SPK.SensoruUtrasonic:
- case SPK.SenesorMegahealth:
{
strPath = "LogicIcon/sensor.png";
}
@@ -326,21 +325,13 @@
{
List<string> deviceStrTypeList = new List<string>();
deviceStrTypeList.Clear();
- var lightjosn = deviceList.Find((device) =>
- device.spk == SPK.LightSwitch
- || device.spk == SPK.LightDimming
- || device.spk == SPK.LightCCT
- || device.spk == SPK.LightRGB
- || device.spk == SPK.LightRGBW);
+ var lightjosn = deviceList.Find((device) => device.spk == SPK.LightSwitch || device.spk == SPK.LightDimming || device.spk == SPK.LightCCT || device.spk == SPK.LightRGB || device.spk == SPK.LightRGBW);
if (lightjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Lights));
}
- var curtainjosn = deviceList.Find((device) =>
- device.spk == SPK.CurtainSwitch
- || device.spk == SPK.CurtainTrietex
- || device.spk == SPK.CurtainRoller);
+ var curtainjosn = deviceList.Find((device) => device.spk == SPK.CurtainSwitch || device.spk == SPK.CurtainTrietex || device.spk == SPK.CurtainRoller);
if (curtainjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
@@ -366,7 +357,6 @@
|| device.spk == SPK.SensorPir
|| device.spk == SPK.SensorDoorWindow
|| device.spk == SPK.SensoruUtrasonic
- || device.spk == SPK.SenesorMegahealth
);
if (sensor != null)
{
@@ -416,8 +406,7 @@
functionTypeList.Add(SPK.SensorPir);
functionTypeList.Add(SPK.SensorDoorWindow);
functionTypeList.Add(SPK.SensoruUtrasonic);
- functionTypeList.Add(SPK.SenesorMegahealth);
-
+
}
return functionTypeList;
@@ -452,7 +441,6 @@
deviceTypeList.Add(SPK.SensorPir);
deviceTypeList.Add(SPK.SensorDoorWindow);
deviceTypeList.Add(SPK.SensoruUtrasonic);
- deviceTypeList.Add(SPK.SenesorMegahealth);
}
break;
case target_if:
--
Gitblit v1.8.0