From 24dce73df68f96c4e7ae4ef82658d5fc89f31e0b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 23 八月 2021 09:58:33 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 443542a..8acfce2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -179,12 +179,21 @@
return Entity.FunctionList.List.GetDeviceFunctionList();
}
/// <summary>
- /// 鑾峰彇缃戝叧鍦烘櫙鍒楄〃
+ /// 鑾峰彇鍦烘櫙鍒楄〃
/// </summary>
/// <returns></returns>
public List<HDL_ON.Entity.Scene> GetSceneList()
{
return HDL_ON.Entity.FunctionList.List.scenes;
+ }
+
+ /// <summary>
+ /// 鑾峰彇瀹夐槻鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<HDL_ON.Entity.SecurityAlarm> GetSecurityList()
+ {
+ return FunctionList.List.securities;
}
/// <summary>
/// 鑾峰彇鎴块棿鐨勮澶囧垪琛�
@@ -217,7 +226,7 @@
return deviceLists;
}
/// <summary>
- /// 鑾峰彇褰撲釜璁惧
+ /// 鑾峰彇璁惧锛堝姛鑳斤級瀵硅薄
/// </summary>
/// <param name="sid">璁惧鍞竴鏍囪瘑</param>
/// <returns></returns>
@@ -238,7 +247,7 @@
}
/// <summary>
- /// 鑾峰彇褰撲釜鍦烘櫙
+ /// 鑾峰彇鍦烘櫙瀵硅薄
/// </summary>
/// <param name="sid">鍦烘櫙鍞竴鏍囪瘑</param>
/// <returns></returns>
@@ -256,6 +265,26 @@
}
}
return scene;
+ }
+ /// <summary>
+ /// 鑾峰彇瀹夐槻瀵硅薄
+ /// </summary>
+ /// <param name="sid">瀹夐槻鍞竴鏍囪瘑</param>
+ /// <returns></returns>
+ public HDL_ON.Entity.SecurityAlarm GetSecurity(string sid)
+ {
+ HDL_ON.Entity.SecurityAlarm security = new Entity.SecurityAlarm() { name = "Unknown" };
+ List<HDL_ON.Entity.SecurityAlarm> SecurityLists = GetSecurityList();
+ for (int i = 0; i < SecurityLists.Count; i++)
+ {
+ var sce = SecurityLists[i];
+ if (sce.sid == sid)
+ {
+ security = sce;
+ break;
+ }
+ }
+ return security;
}
/// <summary>
/// 鑾峰彇鎴块棿鍚�(鍗虫槸=鍖哄煙鍚嶇О)
@@ -326,6 +355,8 @@
case SPK.SensorUtrasonic:
case SPK.SenesorMegahealth:
case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment2:
+ case SPK.SensorEnvironment3:
{
strPath = "LogicIcon/sensor.png";
}
@@ -385,6 +416,8 @@
|| device.spk == SPK.SensorUtrasonic
|| device.spk == SPK.SenesorMegahealth
|| device.spk == SPK.SensorEnvironment
+ || device.spk == SPK.SensorEnvironment2
+ || device.spk == SPK.SensorEnvironment3
);
if (sensor != null)
{
@@ -436,6 +469,8 @@
functionTypeList.Add(SPK.SensorUtrasonic);
functionTypeList.Add(SPK.SenesorMegahealth);
functionTypeList.Add(SPK.SensorEnvironment);
+ functionTypeList.Add(SPK.SensorEnvironment2);
+ functionTypeList.Add(SPK.SensorEnvironment3);
}
@@ -474,6 +509,8 @@
deviceTypeList.Add(SPK.SensorUtrasonic);
deviceTypeList.Add(SPK.SenesorMegahealth);
deviceTypeList.Add(SPK.SensorEnvironment);
+ deviceTypeList.Add(SPK.SensorEnvironment2);
+ deviceTypeList.Add(SPK.SensorEnvironment3);
}
break;
--
Gitblit v1.8.0