From ccd5b1c8dc2d0399745779fb4f9a261d24d75a6d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 23 十一月 2021 14:43:13 +0800
Subject: [PATCH] 备份
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 78 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index d521916..023a2d1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -8,9 +8,13 @@
public class LogicMethod
{
-
+ /// <summary>
+ /// 瀹氫箟涓�涓潤鎬佸璞�
+ /// </summary>
private static LogicMethod logicMethod = null;
-
+ /// <summary>
+ /// 鑾峰彇闈欐�佸璞�
+ /// </summary>
public static LogicMethod CurrLogicMethod
{
get
@@ -191,7 +195,7 @@
/// 鑾峰彇瀹夐槻鍒楄〃
/// </summary>
/// <returns></returns>
- public List<HDL_ON.Entity.SecurityAlarm> GetSecurityList()
+ public List<HDL_ON.Entity.SecurityAlarm> GetSecurityList()
{
return FunctionList.List.securities;
}
@@ -318,6 +322,18 @@
string strPath = "";
switch (functionType)
{
+
+ case SPK.AirSwitch:
+ {
+ strPath = "FunctionIcon/Icon/electricalbreaker.png";
+ }
+ break;
+ case SPK.PanelSocket:
+ case SPK.ElectricSocket:
+ {
+ strPath = "FunctionIcon/Icon/electricalsocket.png";
+ }
+ break;
case SPK.LightSwitch:
case SPK.LightRGB:
case SPK.LightRGBW:
@@ -340,7 +356,8 @@
strPath = "LogicIcon/airconditionerlogic.png";
}
break;
- case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
+ case SPK.FloorHeatStandard:
+ case SPK.HvacFloorHeat:
{
strPath = "LogicIcon/heatlogic.png";
}
@@ -355,6 +372,7 @@
case SPK.SensorWater:
case SPK.SensorGas:
case SPK.SensorDryContact:
+ case SPK.SensorDryContact2:
case SPK.SensorShanLan:
case SPK.SensorDuiShe:
case SPK.SensorPir:
@@ -388,17 +406,20 @@
{
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);
+ || 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
@@ -407,27 +428,30 @@
{
deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
}
-
+ ///绌鸿皟绫�
var ac = deviceList.Find((device) => device.spk == SPK.AcStandard || device.spk == SPK.HvacAC);
if (ac != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.AC));
}
+ ///鍦版殩绫�
var floorHeating = deviceList.Find((device) => device.spk == SPK.FloorHeatStandard || device.spk == SPK.HvacFloorHeat);
if (floorHeating != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating));
}
+ ///鏂伴绫�
var airFresh = deviceList.Find((device) => device.spk == SPK.AirFreshStandard || device.spk == SPK.HvacAirFresh);
if (airFresh != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.AirFresh));
}
+ ///浼犳劅鍣ㄧ被
var sensor = deviceList.Find((device) =>
device.spk == SPK.SensorWater
|| device.spk == SPK.SensorGas
|| device.spk == SPK.SensorSmoke
- || device.spk == SPK.SensorDryContact
+ || device.spk == SPK.SensorDryContact || device.spk == SPK.SensorDryContact2
|| device.spk == SPK.SensorShanLan
|| device.spk == SPK.SensorDuiShe
|| device.spk == SPK.SensorPir
@@ -449,6 +473,16 @@
{
deviceStrTypeList.Add(Language.StringByID(StringId.Sensor));
}
+ ///瀹剁數绫�
+ var electric = deviceList.Find((device) =>
+ device.spk == SPK.AirSwitch
+ || device.spk == SPK.PanelSocket
+ || device.spk == SPK.ElectricSocket
+ );
+ if (electric != null)
+ {
+ deviceStrTypeList.Add(Language.StringByID(StringId.Electric));
+ }
return deviceStrTypeList;
}
@@ -460,6 +494,7 @@
public List<string> GetDeviceTypeFunctionList(string deviceType)
{
List<string> functionTypeList = new List<string>();
+ ///鐏厜绫�
if (deviceType == Language.StringByID(StringId.Lights))
{
functionTypeList.Add(SPK.LightSwitch);
@@ -467,32 +502,40 @@
functionTypeList.Add(SPK.LightRGB);
functionTypeList.Add(SPK.LightRGBW);
functionTypeList.Add(SPK.LightCCT);
+ functionTypeList.Add(SPK.AirSwitch);
+ functionTypeList.Add(SPK.PanelSocket);
+ functionTypeList.Add(SPK.ElectricSocket);
}
+ ///绐楀笜绫�
else if (deviceType == Language.StringByID(StringId.Curtain))
{
functionTypeList.Add(SPK.CurtainSwitch);
functionTypeList.Add(SPK.CurtainRoller);
functionTypeList.Add(SPK.CurtainTrietex);
}
+ ///绌鸿皟绫�
else if (deviceType == Language.StringByID(StringId.AC))
{
functionTypeList.Add(SPK.AcStandard);
functionTypeList.Add(SPK.HvacAC);
}
+ ///鍦版殩绫�
else if (deviceType == Language.StringByID(StringId.FloorHeating))
{
- functionTypeList.Add(SPK.FloorHeatStandard);functionTypeList.Add(SPK.HvacFloorHeat);
+ functionTypeList.Add(SPK.FloorHeatStandard); functionTypeList.Add(SPK.HvacFloorHeat);
}
+ ///鏂伴绫�
else if (deviceType == Language.StringByID(StringId.AirFresh))
{
functionTypeList.Add(SPK.AirFreshStandard); functionTypeList.Add(SPK.HvacAirFresh);
}
+ ///浼犳劅鍣ㄧ被
else if (deviceType == Language.StringByID(StringId.Sensor))
{
functionTypeList.Add(SPK.SensorSmoke);
functionTypeList.Add(SPK.SensorWater);
functionTypeList.Add(SPK.SensorGas);
- functionTypeList.Add(SPK.SensorDryContact);
+ functionTypeList.Add(SPK.SensorDryContact); functionTypeList.Add(SPK.SensorDryContact2);
functionTypeList.Add(SPK.SensorShanLan);
functionTypeList.Add(SPK.SensorDuiShe);
functionTypeList.Add(SPK.SensorPir);
@@ -512,6 +555,15 @@
}
+ ///瀹剁數绫�
+ else if (deviceType == Language.StringByID(StringId.Electric))
+ {
+ functionTypeList.Add(SPK.AirSwitch);
+ functionTypeList.Add(SPK.PanelSocket);
+ functionTypeList.Add(SPK.ElectricSocket);
+ }
+
+
return functionTypeList;
}
@@ -540,7 +592,7 @@
deviceTypeList.Add(SPK.SensorSmoke);
deviceTypeList.Add(SPK.SensorWater);
deviceTypeList.Add(SPK.SensorGas);
- deviceTypeList.Add(SPK.SensorDryContact);
+ deviceTypeList.Add(SPK.SensorDryContact); deviceTypeList.Add(SPK.SensorDryContact2);
deviceTypeList.Add(SPK.SensorShanLan);
deviceTypeList.Add(SPK.SensorDuiShe);
deviceTypeList.Add(SPK.SensorPir);
@@ -557,6 +609,9 @@
deviceTypeList.Add(SPK.SensorPm25);
deviceTypeList.Add(SPK.SensorTVOC);
deviceTypeList.Add(SPK.SensorHcho);
+ deviceTypeList.Add(SPK.AirSwitch);
+ deviceTypeList.Add(SPK.PanelSocket);
+ deviceTypeList.Add(SPK.ElectricSocket);
}
break;
@@ -573,6 +628,9 @@
deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);
deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
+ deviceTypeList.Add(SPK.AirSwitch);
+ deviceTypeList.Add(SPK.PanelSocket);
+ deviceTypeList.Add(SPK.ElectricSocket);
}
break;
}
--
Gitblit v1.8.0