From 96e9ff2e5a54f54cdbb6b8b2f049fdf6a837de3c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 23 八月 2023 14:28:22 +0800
Subject: [PATCH] 备份1
---
OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 387 ------------------------------------------------------
1 files changed, 5 insertions(+), 382 deletions(-)
diff --git a/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 9496297..8ec62f5 100644
--- a/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/OnPro/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -184,38 +184,11 @@
{
var list = new List<HDL_ON.Entity.Function>();
var list1 = Entity.FunctionList.List.GetDeviceFunctionList();
- var list2 = this.GetVideoDeviceList();
list.AddRange(list1);
- list.AddRange(list2);
- list.AddRange(FunctionList.List.groupControls);
#if DEBUG
GetTestDevice(ref list, true);
#endif
return list;
- }
- /// <summary>
- /// 鑾峰彇鍙瀵硅璁惧鍒楄〃
- /// </summary>
- /// <returns></returns>
- public List<HDL_ON.Entity.Function> GetVideoDeviceList()
- {
- var functionList = new List<Function>();
- foreach (var videoDevice in FunctionList.List.videoIntercom)
- {
- Function function = new Function();
- function.spk = videoDevice.spk;
- function.name = videoDevice.deviceName;
- function.deviceId = videoDevice.deviceId;
- function.setOnine( videoDevice.status == "online");
- function.sid = videoDevice.sid;
- var video = functionList.Find((o) => o.deviceId == function.deviceId);
- if (video == null)
- {
- functionList.Add(function);
- }
-
- }
- return functionList;
}
/// <summary>
/// 鑾峰彇鍦烘櫙鍒楄〃
@@ -226,14 +199,6 @@
return HDL_ON.Entity.FunctionList.List.scenes;
}
- /// <summary>
- /// 鑾峰彇瀹夐槻鍒楄〃
- /// </summary>
- /// <returns></returns>
- public List<HDL_ON.Entity.SecurityAlarm> GetSecurityList()
- {
- return FunctionList.List.securities;
- }
/// <summary>
/// 鑾峰彇鎴块棿鐨勮澶囧垪琛�
/// </summary>
@@ -306,26 +271,6 @@
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>
/// 鑾峰彇鎴块棿鍚�(鍗虫槸=鍖哄煙鍚嶇О)
/// </summary>
/// <param name="device">璁惧</param>
@@ -354,21 +299,7 @@
/// <returns></returns>
public string GetDeviceIconPath(Function device)
{
- if (SPK.MusicStandard == device.spk
- || SPK.AvMusic == device.spk)
- {
- return "MusicIcon/localMusic.png";
- }
- else if (SPK.SensorPm10 == device.spk || SPK.SensorPirHold == device.spk)
- {
- return "LogicIcon/sensor.png";
- }
- else if (SPK.DoorLock == device.spk
- || SPK.VideoDoorLock == device.spk)
- {
- return "FunctionIcon/DoorLock/DoorLock.png";
- }
- //LogicIcon/heatlogic.png"
+
return $"FunctionIcon/Icon/{device.IconName}.png";
}
@@ -382,32 +313,6 @@
string strPath = "";
switch (spk)
{
- case SPK.IpCam_Imou:
- {
- strPath = $"FunctionIcon/Icon/{SPK.IpCam_Imou.Replace(".", "")}.png";
- }
- break;
- case SPK.MechanicalArm:
- {
- strPath = "LogicIcon/lightloguc.png";
- }
- break;
- case SPK.doorgate:
- {
- strPath = "VideoIcon/keshiduijiang.png";
- }
- break;
- 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:
@@ -432,9 +337,6 @@
strPath = "LogicIcon/airconditionerlogic.png";
}
break;
- case SPK.HvacCac:
- strPath = "FunctionIcon/Icon/hvaccac.png";
- break;
case SPK.FloorHeatStandard:
case SPK.HvacFloorHeat:
{
@@ -445,46 +347,6 @@
case SPK.HvacAirFresh:
{
strPath = "LogicIcon/heatlogic.png";
- }
- break;
- case SPK.SensorSmoke:
- case SPK.SensorWater:
- case SPK.SensorGas:
- case SPK.SensorDryContact:
- case SPK.SensorDryContact2:
- case SPK.SensorShanLan:
- case SPK.SensorDuiShe:
- case SPK.SensorPir:
- case SPK.SensorDoorWindow:
- case SPK.SensorUtrasonic:
- case SPK.SensorMmvPose:
- case SPK.SenesorMegahealth:
- case SPK.SenesorMegahealth2:
- case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
- case SPK.SensorEnvironment2:
- case SPK.SensorEnvironment3:
- case SPK.SensorTemperature:
- case SPK.SensorHumidity:
- case SPK.SensorCO2:
- case SPK.SensorPm25:
- case SPK.SensorTVOC:
- case SPK.SensorHcho:
- case SPK.SensorHelp:
- case SPK.SensorPirHold:
-
- {
- strPath = "LogicIcon/sensor.png";
- }
- break;
- case SPK.DoorLock:
- {
- strPath = "FunctionIcon/DoorLock/DoorLock.png";
- }
- break;
- case SPK.MusicStandard:
- case SPK.AvMusic:
- {
- strPath = "MusicIcon/localMusic.png";
}
break;
}
@@ -501,14 +363,7 @@
List<string> deviceStrTypeList = new List<string>();
deviceStrTypeList.Clear();
- //缇ゆ帶
- var gp = deviceList.Find((device) =>
- device.spk == SPK.GroupControl);
- if (gp != null)
- {
- deviceStrTypeList.Add(Language.StringByID(StringId.GroupControl));
- }
-
+
///鐏厜绫�
var lightjosn = deviceList.Find((device) =>
device.spk == SPK.LightSwitch
@@ -550,80 +405,6 @@
{
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.SensorDryContact2
- || device.spk == SPK.SensorShanLan
- || device.spk == SPK.SensorDuiShe
- || device.spk == SPK.SensorPir
- || device.spk == SPK.SensorDoorWindow
- || device.spk == SPK.SensorUtrasonic
- || device.spk == SPK.SensorMmvPose
- || device.spk == SPK.SenesorMegahealth
- || device.spk == SPK.SenesorMegahealth2
- || device.spk == SPK.SensorEnvironment || device.spk == SPK.SensorEnvironmentHailin
- || device.spk == SPK.SensorEnvironment2
- || device.spk == SPK.SensorEnvironment3
- || device.spk == SPK.SensorTemperature
- || device.spk == SPK.SensorHumidity
- || device.spk == SPK.SensorCO2
- || device.spk == SPK.SensorPm25
- || device.spk == SPK.SensorTVOC
- || device.spk == SPK.SensorHcho
- || device.spk == SPK.SensorHelp
- || device.spk == SPK.SensorPm10
- || device.spk == SPK.SensorPirHold
- );
- if (sensor != null)
- {
- 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));
- }
- ///闂ㄩ攣绫�
- var doorlock = deviceList.Find((device) => device.spk == SPK.DoorLock
- || device.spk == SPK.VideoDoorLock);
- if (doorlock != null)
- {
- deviceStrTypeList.Add(Language.StringByID(StringId.DoorLock));
- }
- ///闊充箰绫�
- var music = deviceList.Find((device) => device.spk == SPK.MusicStandard || device.spk == SPK.AvMusic);
- if (music != null)
- {
- deviceStrTypeList.Add(Language.StringByID(StringId.Music));
- }
- ///鍙瀵硅
- var doorgate = deviceList.Find((device) => device.spk == SPK.doorgate);
- if (doorgate != null)
- {
- deviceStrTypeList.Add(Language.StringByID(StringId.VideoIntercom));
- }
- ///鏈烘鎵嬬被
- var MechanicalArm = deviceList.Find((device) =>
- device.spk == SPK.MechanicalArm);
- if (MechanicalArm != null)
- {
- deviceStrTypeList.Add(Language.StringByID(StringId.jixieshou));
- }
- ///鎽勫儚澶寸被
- var camera = deviceList.Find((device) =>
- device.spk == SPK.IpCam_Imou || device.spk == SPK.Ev_Ipcam || device.spk == SPK.Peephole);
- if (camera != null)
- {
- deviceStrTypeList.Add(Language.StringByID(StringId.shexiangtou));
- }
return deviceStrTypeList;
}
@@ -644,14 +425,6 @@
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.GroupControl))
- {
- functionTypeList.Add(SPK.GroupControl);
}
///绐楀笜绫�
else if (deviceType == Language.StringByID(StringId.Curtain))
@@ -666,7 +439,6 @@
{
functionTypeList.Add(SPK.AcStandard);
functionTypeList.Add(SPK.HvacAC);
- functionTypeList.Add(SPK.HvacCac);
functionTypeList.Add(SPK.AcIr);
}
///鍦版殩绫�
@@ -679,86 +451,14 @@
{
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.SensorDryContact2);
- functionTypeList.Add(SPK.SensorShanLan);
- functionTypeList.Add(SPK.SensorDuiShe);
- functionTypeList.Add(SPK.SensorPir);
- functionTypeList.Add(SPK.SensorDoorWindow);
- functionTypeList.Add(SPK.SensorUtrasonic);
- functionTypeList.Add(SPK.SensorMmvPose);
- functionTypeList.Add(SPK.SenesorMegahealth);
- functionTypeList.Add(SPK.SenesorMegahealth2);
- functionTypeList.Add(SPK.SensorEnvironment); functionTypeList.Add(SPK.SensorEnvironmentHailin);
- functionTypeList.Add(SPK.SensorEnvironment2);
- functionTypeList.Add(SPK.SensorEnvironment3);
- functionTypeList.Add(SPK.SensorTemperature);
- functionTypeList.Add(SPK.SensorHumidity);
- functionTypeList.Add(SPK.SensorCO2);
- functionTypeList.Add(SPK.SensorPm25);
- functionTypeList.Add(SPK.SensorTVOC);
- functionTypeList.Add(SPK.SensorHcho);
- functionTypeList.Add(SPK.SensorHelp);
- functionTypeList.Add(SPK.SensorPm10);
- functionTypeList.Add(SPK.SensorPirHold);
-
-
- }
- ///瀹剁數绫�
- else if (deviceType == Language.StringByID(StringId.Electric))
- {
- functionTypeList.Add(SPK.AirSwitch);
- functionTypeList.Add(SPK.PanelSocket);
- functionTypeList.Add(SPK.ElectricSocket);
- }
- ///闂ㄩ攣绫�
- else if (deviceType == Language.StringByID(StringId.DoorLock))
- {
- functionTypeList.Add(SPK.DoorLock);
- functionTypeList.Add(SPK.VideoDoorLock);
- }
- ///闊充箰绫�
- else if (deviceType == Language.StringByID(StringId.Music))
- {
- functionTypeList.Add(SPK.MusicStandard);
- functionTypeList.Add(SPK.AvMusic);
- }
- ///HDL鍙瀵硅
- else if (deviceType == Language.StringByID(StringId.VideoIntercom))
- {
- functionTypeList.Add(SPK.doorgate);
- }
- ///鏈烘鎵嬬被
- else if (deviceType == Language.StringByID(StringId.jixieshou))
- {
- functionTypeList.Add(SPK.MechanicalArm);
- }
- ///鎽勫儚澶寸被
- else if (deviceType == Language.StringByID(StringId.shexiangtou))
- {
- functionTypeList.Add(SPK.IpCam_Imou);
- functionTypeList.Add(SPK.Ev_Ipcam);
- functionTypeList.Add(SPK.Peephole);
- }
else
{
//鍏ㄩ儴鍖哄煙
- functionTypeList.Add(SPK.GroupControl);
- functionTypeList.Add(SPK.Peephole);
- functionTypeList.Add(SPK.Ev_Ipcam);
functionTypeList.Add(SPK.LightSwitch);
functionTypeList.Add(SPK.LightDimming);
functionTypeList.Add(SPK.LightRGB);
functionTypeList.Add(SPK.LightRGBW);
functionTypeList.Add(SPK.LightCCT);
- functionTypeList.Add(SPK.AirSwitch);
- functionTypeList.Add(SPK.PanelSocket);
- functionTypeList.Add(SPK.ElectricSocket);
functionTypeList.Add(SPK.CurtainSwitch);
functionTypeList.Add(SPK.CurtainRoller);
functionTypeList.Add(SPK.CurtainTrietex);
@@ -769,44 +469,8 @@
functionTypeList.Add(SPK.HvacFloorHeat);
functionTypeList.Add(SPK.AirFreshStandard);
functionTypeList.Add(SPK.HvacAirFresh);
- functionTypeList.Add(SPK.SensorSmoke);
- functionTypeList.Add(SPK.SensorWater);
- functionTypeList.Add(SPK.SensorGas);
- functionTypeList.Add(SPK.SensorDryContact);
- functionTypeList.Add(SPK.SensorDryContact2);
- functionTypeList.Add(SPK.SensorShanLan);
- functionTypeList.Add(SPK.SensorDuiShe);
- functionTypeList.Add(SPK.SensorPir);
- functionTypeList.Add(SPK.SensorDoorWindow);
- functionTypeList.Add(SPK.SensorUtrasonic);
- functionTypeList.Add(SPK.SensorMmvPose);
- functionTypeList.Add(SPK.SenesorMegahealth);
- functionTypeList.Add(SPK.SenesorMegahealth2);
- functionTypeList.Add(SPK.SensorEnvironment); functionTypeList.Add(SPK.SensorEnvironmentHailin);
- functionTypeList.Add(SPK.SensorEnvironment2);
- functionTypeList.Add(SPK.SensorEnvironment3);
- functionTypeList.Add(SPK.SensorTemperature);
- functionTypeList.Add(SPK.SensorHumidity);
- functionTypeList.Add(SPK.SensorCO2);
- functionTypeList.Add(SPK.SensorPm25);
- functionTypeList.Add(SPK.SensorTVOC);
- functionTypeList.Add(SPK.SensorHcho);
- functionTypeList.Add(SPK.AirSwitch);
- functionTypeList.Add(SPK.PanelSocket);
- functionTypeList.Add(SPK.ElectricSocket);
- functionTypeList.Add(SPK.HvacCac);
- functionTypeList.Add(SPK.SensorHelp);
- functionTypeList.Add(SPK.DoorLock);
functionTypeList.Add(SPK.CurtainDream);
- functionTypeList.Add(SPK.MusicStandard);
- functionTypeList.Add(SPK.AvMusic);
- functionTypeList.Add(SPK.doorgate);
- functionTypeList.Add(SPK.MechanicalArm);
- functionTypeList.Add(SPK.IpCam_Imou);
- functionTypeList.Add(SPK.SensorPm10);
- functionTypeList.Add(SPK.VideoDoorLock);
functionTypeList.Add(SPK.AcIr);
- functionTypeList.Add(SPK.SensorPirHold);
}
@@ -825,8 +489,6 @@
{
case condition_if:
{
- deviceTypeList.Add(SPK.Ev_Ipcam);
- deviceTypeList.Add(SPK.Peephole);
deviceTypeList.Add(SPK.LightSwitch);
deviceTypeList.Add(SPK.LightRGB);
deviceTypeList.Add(SPK.LightRGBW);
@@ -838,45 +500,12 @@
deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);deviceTypeList.Add(SPK.AcIr);
deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
- deviceTypeList.Add(SPK.SensorSmoke);
- deviceTypeList.Add(SPK.SensorWater);
- deviceTypeList.Add(SPK.SensorGas);
- deviceTypeList.Add(SPK.SensorDryContact); deviceTypeList.Add(SPK.SensorDryContact2);
- deviceTypeList.Add(SPK.SensorShanLan);
- deviceTypeList.Add(SPK.SensorDuiShe);
- deviceTypeList.Add(SPK.SensorPir);
- deviceTypeList.Add(SPK.SensorDoorWindow);
- deviceTypeList.Add(SPK.SensorUtrasonic);
- deviceTypeList.Add(SPK.SensorMmvPose);
- deviceTypeList.Add(SPK.SenesorMegahealth);
- deviceTypeList.Add(SPK.SenesorMegahealth2);
- deviceTypeList.Add(SPK.SensorEnvironment); deviceTypeList.Add(SPK.SensorEnvironmentHailin);
- deviceTypeList.Add(SPK.SensorEnvironment2);
- deviceTypeList.Add(SPK.SensorEnvironment3);
- deviceTypeList.Add(SPK.SensorTemperature);
- deviceTypeList.Add(SPK.SensorHumidity);
- deviceTypeList.Add(SPK.SensorCO2);
- deviceTypeList.Add(SPK.SensorPm25);
- deviceTypeList.Add(SPK.SensorTVOC);
- deviceTypeList.Add(SPK.SensorHcho);
- deviceTypeList.Add(SPK.AirSwitch);
- deviceTypeList.Add(SPK.PanelSocket);
- deviceTypeList.Add(SPK.ElectricSocket);
- deviceTypeList.Add(SPK.HvacCac);
- deviceTypeList.Add(SPK.SensorHelp);
- deviceTypeList.Add(SPK.DoorLock);
- deviceTypeList.Add(SPK.doorgate);
- deviceTypeList.Add(SPK.IpCam_Imou);
- deviceTypeList.Add(SPK.SensorPm10);
- deviceTypeList.Add(SPK.VideoDoorLock);
deviceTypeList.Add(SPK.AcIr);
- deviceTypeList.Add(SPK.SensorPirHold);
}
break;
case target_if:
{
- deviceTypeList.Add(SPK.GroupControl);
deviceTypeList.Add(SPK.LightSwitch);
deviceTypeList.Add(SPK.LightRGB);
deviceTypeList.Add(SPK.LightRGBW);
@@ -888,13 +517,7 @@
deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC); deviceTypeList.Add(SPK.AcIr);
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);
deviceTypeList.Add(SPK.CurtainDream);
- deviceTypeList.Add(SPK.MusicStandard);
- deviceTypeList.Add(SPK.AvMusic);
- deviceTypeList.Add(SPK.MechanicalArm);
deviceTypeList.Add(SPK.AcIr);
}
break;
@@ -1217,13 +840,13 @@
//new Entity.Function { sid = "12345678933456", name = "闂ㄩ攣", spk = Entity.SPK.DoorLock },
// new Entity.Function { sid = "1234567895444", name = "瑙嗛闂ㄩ攣", spk = Entity.SPK.VideoDoorLock },
//new Entity.Function { sid = "12345678968888", name = "浜轰綋瀛樺湪浼犳劅鍣�", spk = Entity.SPK.SensorPirHold },
- new Entity.Function { sid = "12345678968888", name = "娴嬭瘯鐚溂", spk = Entity.SPK.Peephole },
- new Entity.Function { sid = "12345678968889", name = "娴嬭瘯钀ょ煶鎽勫儚澶�", spk = Entity.SPK.Ev_Ipcam },
+ //new Entity.Function { sid = "12345678968888", name = "娴嬭瘯鐚溂", spk = Entity.SPK.Peephole },
+ //new Entity.Function { sid = "12345678968889", name = "娴嬭瘯钀ょ煶鎽勫儚澶�", spk = Entity.SPK.Ev_Ipcam },
// new Entity.Function { sid = "1234567897", name = "姣背娉紶鎰熷櫒1", spk = Entity.SPK.SenesorMegahealth2 },
// new Entity.Function { sid = "1234567899", name = "闂ㄧ浼犳劅鍣�", spk = Entity.SPK.SensorDoorWindow },
// new Entity.Function { sid = "12345678991234", name = "HDL鏈烘鎵�", spk = Entity.SPK.MechanicalArm },
// new Entity.Function { sid = "123456789912345", name = "娴锋浖鏈烘鎵�", spk = Entity.SPK.MechanicalArm },
- new Entity.Function { sid = "12345678991234566844", name = "澶у崕鎽勫儚澶�", spk = Entity.SPK.IpCam_Imou },
+ //new Entity.Function { sid = "12345678991234566844", name = "澶у崕鎽勫儚澶�", spk = Entity.SPK.IpCam_Imou },
new Entity.Function { sid = "12345678991234567", name = "RGB", spk = Entity.SPK.LightRGB },
new Entity.Function { sid = "123456789912345678", name = "RGBW", spk = Entity.SPK.LightRGBW },
};
--
Gitblit v1.8.0