From b90d429e8b9a55f5ce56077754853a8cfed8b725 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 07 十二月 2022 10:57:26 +0800
Subject: [PATCH] Merge branch 'wjc' into Dev-Branch
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index c4db742..40ba375 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -187,7 +187,7 @@
var list2 = this.GetVideoDeviceList();
list.AddRange(list1);
list.AddRange(list2);
- GetTestDevice(ref list, true);
+ //GetTestDevice(ref list, true);
return list;
}
/// <summary>
@@ -349,13 +349,16 @@
/// </summary>
/// <param name="device">璁惧</param>
/// <returns></returns>
- public string GetDeviceIconPath(Function device)
+ public string GetDeviceIconPath(Function device)
{
-
if (SPK.MusicStandard == device.spk
|| SPK.AvMusic == device.spk)
{
return "MusicIcon/localMusic.png";
+ }
+ else if (SPK.SensorPm10 == device.spk)
+ {
+ return "LogicIcon/sensor.png";
}
//LogicIcon/heatlogic.png"
return $"FunctionIcon/Icon/{device.IconName}.png";
@@ -552,6 +555,7 @@
|| device.spk == SPK.SensorTVOC
|| device.spk == SPK.SensorHcho
|| device.spk == SPK.SensorHelp
+ || device.spk == SPK.SensorPm10
);
if (sensor != null)
{
@@ -673,6 +677,7 @@
functionTypeList.Add(SPK.SensorTVOC);
functionTypeList.Add(SPK.SensorHcho);
functionTypeList.Add(SPK.SensorHelp);
+ functionTypeList.Add(SPK.SensorPm10);
}
@@ -763,6 +768,7 @@
functionTypeList.Add(SPK.doorgate);
functionTypeList.Add(SPK.MechanicalArm);
functionTypeList.Add(SPK.IpCam_Imou);
+ functionTypeList.Add(SPK.SensorPm10);
}
@@ -821,6 +827,7 @@
deviceTypeList.Add(SPK.DoorLock);
deviceTypeList.Add(SPK.doorgate);
deviceTypeList.Add(SPK.IpCam_Imou);
+ deviceTypeList.Add(SPK.SensorPm10);
}
break;
@@ -1164,7 +1171,7 @@
// new Entity.Function { sid = "1234567892", name = "婀垮害浼犳劅鍣�", spk = Entity.SPK.SensorHumidity },
new Entity.Function { sid = "12345678933456", name = "璋冨厜鐏�", spk = Entity.SPK.LightDimming },
new Entity.Function { sid = "1234567895444", name = "闈㈡澘", spk = Entity.SPK.PanelSocket },
- //new Entity.Function { sid = "1234567896", name = "姣背娉紶鎰熷櫒", spk = Entity.SPK.SenesorMegahealth },
+ new Entity.Function { sid = "12345678968888", name = "pm10", spk = Entity.SPK.SensorPm10 },
// 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 },
--
Gitblit v1.8.0