From 9508510f0b27da3278fa1161eb2ba3dd1e3e2030 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 26 七月 2023 13:14:00 +0800
Subject: [PATCH] 2023年07月26日13:12:21
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 173a736..5d331cd 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -187,7 +187,10 @@
var list2 = this.GetVideoDeviceList();
list.AddRange(list1);
list.AddRange(list2);
- //GetTestDevice(ref list, true);
+ list.AddRange(FunctionList.List.groupControls);
+#if DEBUG
+ GetTestDevice(ref list, true);
+#endif
return list;
}
/// <summary>
@@ -356,7 +359,7 @@
{
return "MusicIcon/localMusic.png";
}
- else if (SPK.SensorPm10 == device.spk || SPK.sensorPirhold == device.spk)
+ else if (SPK.SensorPm10 == device.spk || SPK.SensorPirHold == device.spk)
{
return "LogicIcon/sensor.png";
}
@@ -467,7 +470,7 @@
case SPK.SensorTVOC:
case SPK.SensorHcho:
case SPK.SensorHelp:
- case SPK.sensorPirhold:
+ case SPK.SensorPirHold:
{
strPath = "LogicIcon/sensor.png";
@@ -497,7 +500,15 @@
{
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
@@ -564,7 +575,7 @@
|| device.spk == SPK.SensorHcho
|| device.spk == SPK.SensorHelp
|| device.spk == SPK.SensorPm10
- || device.spk == SPK.sensorPirhold
+ || device.spk == SPK.SensorPirHold
);
if (sensor != null)
{
@@ -608,7 +619,7 @@
}
///鎽勫儚澶寸被
var camera = deviceList.Find((device) =>
- device.spk == SPK.IpCam_Imou);
+ device.spk == SPK.IpCam_Imou || device.spk == SPK.Ev_Ipcam || device.spk == SPK.Peephole);
if (camera != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.shexiangtou));
@@ -636,6 +647,11 @@
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))
@@ -689,7 +705,7 @@
functionTypeList.Add(SPK.SensorHcho);
functionTypeList.Add(SPK.SensorHelp);
functionTypeList.Add(SPK.SensorPm10);
- functionTypeList.Add(SPK.sensorPirhold);
+ functionTypeList.Add(SPK.SensorPirHold);
}
@@ -726,10 +742,15 @@
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);
@@ -785,7 +806,7 @@
functionTypeList.Add(SPK.SensorPm10);
functionTypeList.Add(SPK.VideoDoorLock);
functionTypeList.Add(SPK.AcIr);
- functionTypeList.Add(SPK.sensorPirhold);
+ functionTypeList.Add(SPK.SensorPirHold);
}
@@ -804,6 +825,8 @@
{
case condition_if:
{
+ deviceTypeList.Add(SPK.Ev_Ipcam);
+ deviceTypeList.Add(SPK.Peephole);
deviceTypeList.Add(SPK.LightSwitch);
deviceTypeList.Add(SPK.LightRGB);
deviceTypeList.Add(SPK.LightRGBW);
@@ -847,12 +870,13 @@
deviceTypeList.Add(SPK.SensorPm10);
deviceTypeList.Add(SPK.VideoDoorLock);
deviceTypeList.Add(SPK.AcIr);
- deviceTypeList.Add(SPK.sensorPirhold);
+ deviceTypeList.Add(SPK.SensorPirHold);
}
break;
case target_if:
{
+ deviceTypeList.Add(SPK.GroupControl);
deviceTypeList.Add(SPK.LightSwitch);
deviceTypeList.Add(SPK.LightRGB);
deviceTypeList.Add(SPK.LightRGBW);
@@ -1192,12 +1216,16 @@
// new Entity.Function { sid = "1234567892", name = "婀垮害浼犳劅鍣�", spk = Entity.SPK.SensorHumidity },
//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.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 = "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 = "12345678991234566", name = "娴锋浖鏈烘鎵�", spk = Entity.SPK.MechanicalArm },
+ 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 },
};
foreach (var function in functions)
{
--
Gitblit v1.8.0