From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 49 ++++++++++++++++++-------------------------------
1 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 0ccaaaf..18d4a41 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -189,7 +189,7 @@
list.AddRange(list2);
list.AddRange(FunctionList.List.groupControls);
#if DEBUG
- GetTestDevice(ref list, true);
+ //GetTestDevice(ref list, true);
#endif
return list;
}
@@ -366,7 +366,7 @@
return "LogicIcon/sensor.png";
}
else if (SPK.DoorLock == device.spk
- || SPK.VideoDoorLock == device.spk)
+ )
{
return "FunctionIcon/DoorLock/DoorLock.png";
}
@@ -418,13 +418,13 @@
deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
}
///绌鸿皟绫�
- var ac = deviceList.Find((device) => device.spk == SPK.AcStandard || device.spk == SPK.HvacAC|| device.spk == SPK.AcIr);
+ var ac = deviceList.Find((device) => device.spk == SPK.AcStandard || device.spk == SPK.HvacAC|| device.spk == SPK.AcIr || device.spk == SPK.HvacAcPanel);
if (ac != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.AC));
}
///鍦版殩绫�
- var floorHeating = deviceList.Find((device) => device.spk == SPK.FloorHeatStandard || device.spk == SPK.HvacFloorHeat);
+ var floorHeating = deviceList.Find((device) => device.spk == SPK.FloorHeatStandard || device.spk == SPK.HvacFloorHeat || device.spk == SPK.HvacFloorHeatPanel);
if (floorHeating != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating));
@@ -472,7 +472,6 @@
device.spk == SPK.AirSwitch
|| device.spk == SPK.PanelSocket
|| device.spk == SPK.ElectricSocket
- || device.spk == SPK.ElectricalTvHisense
);
if (electric != null)
{
@@ -480,7 +479,7 @@
}
///闂ㄩ攣绫�
var doorlock = deviceList.Find((device) => device.spk == SPK.DoorLock
- || device.spk == SPK.VideoDoorLock);
+ );
if (doorlock != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.DoorLock));
@@ -506,7 +505,7 @@
}
///鎽勫儚澶寸被
var camera = deviceList.Find((device) =>
- device.spk == SPK.IpCam_Imou || device.spk == SPK.Ev_Ipcam || device.spk == SPK.Peephole);
+ device.spk == SPK.IpCam_Imou || device.spk == SPK.Peephole);
if (camera != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.shexiangtou));
@@ -553,14 +552,14 @@
else if (deviceType == Language.StringByID(StringId.AC))
{
functionTypeList.Add(SPK.AcStandard);
- functionTypeList.Add(SPK.HvacAC);
+ functionTypeList.Add(SPK.HvacAC); functionTypeList.Add(SPK.HvacAcPanel);
functionTypeList.Add(SPK.HvacCac);
functionTypeList.Add(SPK.AcIr);
}
///鍦版殩绫�
else if (deviceType == Language.StringByID(StringId.FloorHeating))
{
- functionTypeList.Add(SPK.FloorHeatStandard); functionTypeList.Add(SPK.HvacFloorHeat);
+ functionTypeList.Add(SPK.FloorHeatStandard); functionTypeList.Add(SPK.HvacFloorHeat); functionTypeList.Add(SPK.HvacFloorHeatPanel);
}
///鏂伴绫�
else if (deviceType == Language.StringByID(StringId.AirFresh))
@@ -604,13 +603,11 @@
functionTypeList.Add(SPK.AirSwitch);
functionTypeList.Add(SPK.PanelSocket);
functionTypeList.Add(SPK.ElectricSocket);
- functionTypeList.Add(SPK.ElectricalTvHisense);
}
///闂ㄩ攣绫�
else if (deviceType == Language.StringByID(StringId.DoorLock))
{
functionTypeList.Add(SPK.DoorLock);
- functionTypeList.Add(SPK.VideoDoorLock);
}
///闊充箰绫�
else if (deviceType == Language.StringByID(StringId.Music))
@@ -632,7 +629,6 @@
else if (deviceType == Language.StringByID(StringId.shexiangtou))
{
functionTypeList.Add(SPK.IpCam_Imou);
- functionTypeList.Add(SPK.Ev_Ipcam);
functionTypeList.Add(SPK.Peephole);
}
else
@@ -640,7 +636,6 @@
//鍏ㄩ儴鍖哄煙
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);
@@ -653,10 +648,10 @@
functionTypeList.Add(SPK.CurtainRoller);
functionTypeList.Add(SPK.CurtainTrietex);
functionTypeList.Add(SPK.AcStandard);
- functionTypeList.Add(SPK.HvacAC);
+ functionTypeList.Add(SPK.HvacAC); functionTypeList.Add(SPK.HvacAcPanel);
functionTypeList.Add(SPK.AcIr);
functionTypeList.Add(SPK.FloorHeatStandard);
- functionTypeList.Add(SPK.HvacFloorHeat);
+ functionTypeList.Add(SPK.HvacFloorHeat); functionTypeList.Add(SPK.HvacFloorHeatPanel);
functionTypeList.Add(SPK.AirFreshStandard);
functionTypeList.Add(SPK.HvacAirFresh);
functionTypeList.Add(SPK.SensorSmoke);
@@ -694,10 +689,8 @@
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);
- functionTypeList.Add(SPK.ElectricalTvHisense);
functionTypeList.Add(SPK.SensorLight);
functionTypeList.Add(SPK.OtherCommon);
@@ -718,7 +711,6 @@
{
case condition_if:
{
- deviceTypeList.Add(SPK.Ev_Ipcam);
deviceTypeList.Add(SPK.Peephole);
deviceTypeList.Add(SPK.LightSwitch);
deviceTypeList.Add(SPK.LightRGB);
@@ -728,9 +720,9 @@
deviceTypeList.Add(SPK.CurtainSwitch);
deviceTypeList.Add(SPK.CurtainRoller);
deviceTypeList.Add(SPK.CurtainTrietex);
- deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);deviceTypeList.Add(SPK.AcIr);
+ deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);deviceTypeList.Add(SPK.AcIr); deviceTypeList.Add(SPK.HvacAcPanel);
deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
- deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
+ deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat); deviceTypeList.Add(SPK.HvacFloorHeatPanel);
deviceTypeList.Add(SPK.SensorSmoke);
deviceTypeList.Add(SPK.SensorWater);
deviceTypeList.Add(SPK.SensorGas);
@@ -761,7 +753,6 @@
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);
deviceTypeList.Add(SPK.SensorLight);
@@ -779,8 +770,8 @@
deviceTypeList.Add(SPK.CurtainSwitch);
deviceTypeList.Add(SPK.CurtainRoller);
deviceTypeList.Add(SPK.CurtainTrietex);
- deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC); deviceTypeList.Add(SPK.AcIr);
- deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
+ deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC); deviceTypeList.Add(SPK.AcIr); deviceTypeList.Add(SPK.HvacAcPanel);
+ deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat); deviceTypeList.Add(SPK.HvacFloorHeatPanel);
deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
deviceTypeList.Add(SPK.AirSwitch);
deviceTypeList.Add(SPK.PanelSocket);
@@ -790,7 +781,6 @@
deviceTypeList.Add(SPK.AvMusic);
deviceTypeList.Add(SPK.MechanicalArm);
deviceTypeList.Add(SPK.AcIr);
- deviceTypeList.Add(SPK.ElectricalTvHisense);
deviceTypeList.Add(SPK.OtherCommon);
}
break;
@@ -1076,18 +1066,17 @@
//涓嶆槸涓昏处鍙风洿鎺ヨ繑鍥�
return;
}
- List<LogicData> logicDataList = new List<LogicData>();
+ List<LogicIdData> logicDataList = new List<LogicIdData>();
logicDataList.Clear();
System.Threading.Tasks.Task.Run(() =>
{
try
{
//鑾峰彇閫昏緫ID鍒楄〃锛岀洰鍓嶉拡瀵规墍鏈�<澶囨敞:濡傛灉鍙拡瀵瑰綋鍓嶆墜鏈虹殑璇濓紝鍙互鐩存帴鎷跨紦瀛樻暟鎹嚜鍔ㄥ寲鍒楄〃閬嶅巻>
- var idStr = Send.Current.GetLogicIdList();
- if (idStr != null)
+ var idStrList = Send.Current.GetLogicIdList();
+ if (idStrList != null)
{
- var date = Newtonsoft.Json.JsonConvert.SerializeObject(idStr.Data);
- logicDataList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<LogicData>>(date);
+ logicDataList.AddRange(idStrList);
}
///鏈夎嚜鍔ㄥ垪琛ㄦ墠澶勭悊
if (logicDataList.Count > 0)
@@ -1172,7 +1161,6 @@
// new Entity.Function { sid = "1234567895444", name = "瑙嗛闂ㄩ攣", spk = Entity.SPK.VideoDoorLock },
new Entity.Function { sid = "123456789688889", 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 },
@@ -1180,7 +1168,6 @@
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 },
- new Function { spk = SPK.ElectricalTvHisense, name = "娴蜂俊鐢佃1",sid="123456789"},
};
foreach (var function in functions)
{
--
Gitblit v1.8.0