From cd70a2a8a2bdebf51259d8f39ed110a34b9be9e5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 四月 2023 14:50:21 +0800
Subject: [PATCH] 修改启动屏幕
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 6e55a2f..6435a0c 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>
@@ -423,6 +423,7 @@
}
break;
case SPK.AcStandard:
+ case SPK.AcIr:
case SPK.HvacAC:
{
strPath = "LogicIcon/airconditionerlogic.png";
@@ -456,7 +457,7 @@
case SPK.SensorMmvPose:
case SPK.SenesorMegahealth:
case SPK.SenesorMegahealth2:
- case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
case SPK.SensorEnvironment2:
case SPK.SensorEnvironment3:
case SPK.SensorTemperature:
@@ -519,7 +520,7 @@
deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
}
///绌鸿皟绫�
- var ac = deviceList.Find((device) => device.spk == SPK.AcStandard || device.spk == SPK.HvacAC);
+ var ac = deviceList.Find((device) => device.spk == SPK.AcStandard || device.spk == SPK.HvacAC|| device.spk == SPK.AcIr);
if (ac != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.AC));
@@ -550,7 +551,7 @@
|| device.spk == SPK.SensorMmvPose
|| device.spk == SPK.SenesorMegahealth
|| device.spk == SPK.SenesorMegahealth2
- || device.spk == SPK.SensorEnvironment
+ || device.spk == SPK.SensorEnvironment || device.spk == SPK.SensorEnvironmentHailin
|| device.spk == SPK.SensorEnvironment2
|| device.spk == SPK.SensorEnvironment3
|| device.spk == SPK.SensorTemperature
@@ -647,6 +648,7 @@
functionTypeList.Add(SPK.AcStandard);
functionTypeList.Add(SPK.HvacAC);
functionTypeList.Add(SPK.HvacCac);
+ functionTypeList.Add(SPK.AcIr);
}
///鍦版殩绫�
else if (deviceType == Language.StringByID(StringId.FloorHeating))
@@ -673,7 +675,7 @@
functionTypeList.Add(SPK.SensorMmvPose);
functionTypeList.Add(SPK.SenesorMegahealth);
functionTypeList.Add(SPK.SenesorMegahealth2);
- functionTypeList.Add(SPK.SensorEnvironment);
+ functionTypeList.Add(SPK.SensorEnvironment); functionTypeList.Add(SPK.SensorEnvironmentHailin);
functionTypeList.Add(SPK.SensorEnvironment2);
functionTypeList.Add(SPK.SensorEnvironment3);
functionTypeList.Add(SPK.SensorTemperature);
@@ -737,6 +739,7 @@
functionTypeList.Add(SPK.CurtainTrietex);
functionTypeList.Add(SPK.AcStandard);
functionTypeList.Add(SPK.HvacAC);
+ functionTypeList.Add(SPK.AcIr);
functionTypeList.Add(SPK.FloorHeatStandard);
functionTypeList.Add(SPK.HvacFloorHeat);
functionTypeList.Add(SPK.AirFreshStandard);
@@ -754,7 +757,7 @@
functionTypeList.Add(SPK.SensorMmvPose);
functionTypeList.Add(SPK.SenesorMegahealth);
functionTypeList.Add(SPK.SenesorMegahealth2);
- functionTypeList.Add(SPK.SensorEnvironment);
+ functionTypeList.Add(SPK.SensorEnvironment); functionTypeList.Add(SPK.SensorEnvironmentHailin);
functionTypeList.Add(SPK.SensorEnvironment2);
functionTypeList.Add(SPK.SensorEnvironment3);
functionTypeList.Add(SPK.SensorTemperature);
@@ -777,6 +780,7 @@
functionTypeList.Add(SPK.IpCam_Imou);
functionTypeList.Add(SPK.SensorPm10);
functionTypeList.Add(SPK.VideoDoorLock);
+ functionTypeList.Add(SPK.AcIr);
}
@@ -803,7 +807,7 @@
deviceTypeList.Add(SPK.CurtainSwitch);
deviceTypeList.Add(SPK.CurtainRoller);
deviceTypeList.Add(SPK.CurtainTrietex);
- deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);
+ 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);
@@ -818,7 +822,7 @@
deviceTypeList.Add(SPK.SensorMmvPose);
deviceTypeList.Add(SPK.SenesorMegahealth);
deviceTypeList.Add(SPK.SenesorMegahealth2);
- deviceTypeList.Add(SPK.SensorEnvironment);
+ deviceTypeList.Add(SPK.SensorEnvironment); deviceTypeList.Add(SPK.SensorEnvironmentHailin);
deviceTypeList.Add(SPK.SensorEnvironment2);
deviceTypeList.Add(SPK.SensorEnvironment3);
deviceTypeList.Add(SPK.SensorTemperature);
@@ -837,6 +841,7 @@
deviceTypeList.Add(SPK.IpCam_Imou);
deviceTypeList.Add(SPK.SensorPm10);
deviceTypeList.Add(SPK.VideoDoorLock);
+ deviceTypeList.Add(SPK.AcIr);
}
break;
@@ -850,7 +855,7 @@
deviceTypeList.Add(SPK.CurtainSwitch);
deviceTypeList.Add(SPK.CurtainRoller);
deviceTypeList.Add(SPK.CurtainTrietex);
- deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);
+ 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);
@@ -860,6 +865,7 @@
deviceTypeList.Add(SPK.MusicStandard);
deviceTypeList.Add(SPK.AvMusic);
deviceTypeList.Add(SPK.MechanicalArm);
+ deviceTypeList.Add(SPK.AcIr);
}
break;
}
--
Gitblit v1.8.0