From 452e8cef1c740d18ee398be6971d9952e41dbd4a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 四月 2023 16:11:50 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 243 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 205 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index c0f23e1..6435a0c 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -10,20 +10,20 @@
{
/// <summary>
/// 瀹氫箟涓�涓潤鎬佸璞�
- /// </summary>
- private static LogicMethod logicMethod = null;
+ /// </summary>
+ private static LogicMethod s_Current = null;
/// <summary>
/// 鑾峰彇闈欐�佸璞�
/// </summary>
- public static LogicMethod CurrLogicMethod
+ public static LogicMethod Current
{
get
{
- if (logicMethod == null)
+ if (s_Current == null)
{
return new LogicMethod();
}
- return logicMethod;
+ return s_Current;
}
}
@@ -147,9 +147,9 @@
/// <returns></returns>
public List<HDL_ON.Entity.Room> GetGatewayRoomList()
{
- return HDL_ON.Entity.SpatialInfo.CurrentSpatial.RoomList;
+ return HDL_ON.Entity.SpatialInfo.CurrentSpatial.RoomList;
-
+
}
/// <summary>
/// 鑾峰彇缃戝叧鎴块棿鍒楄〃
@@ -182,9 +182,37 @@
/// <returns></returns>
public List<HDL_ON.Entity.Function> GetGatewayDeviceList()
{
- var list = Entity.FunctionList.List.GetDeviceFunctionList();
- return GetTestDevice(list, true);
- //return list;
+ var list = new List<HDL_ON.Entity.Function>();
+ var list1 = Entity.FunctionList.List.GetDeviceFunctionList();
+ var list2 = this.GetVideoDeviceList();
+ list.AddRange(list1);
+ list.AddRange(list2);
+ //GetTestDevice(ref list, true);
+ 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.online = 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>
/// 鑾峰彇鍦烘櫙鍒楄〃
@@ -315,18 +343,57 @@
return roomName.TrimEnd(',');
}
- #region 鍔ㄤ竴鏀瑰洓
+
/// <summary>
/// 鑾峰彇璁惧绫诲瀷鍥炬爣
/// </summary>
+ /// <param name="device">璁惧</param>
+ /// <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)
+ {
+ 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";
+
+ }
+ /// <summary>
+ /// 鑾峰彇璁惧绫诲瀷鍥炬爣(宸插純鐢� 2022骞�11鏈�25鏃�14:07:30)
+ /// </summary>
/// <param name="functionType">璁惧绫诲瀷</param>
/// <returns></returns>
- public string GetIconPath(string functionType)
+ public string GetIconPath(string spk)
{
string strPath = "";
- switch (functionType)
+ 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";
@@ -356,6 +423,7 @@
}
break;
case SPK.AcStandard:
+ case SPK.AcIr:
case SPK.HvacAC:
{
strPath = "LogicIcon/airconditionerlogic.png";
@@ -386,9 +454,10 @@
case SPK.SensorPir:
case SPK.SensorDoorWindow:
case SPK.SensorUtrasonic:
+ 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:
@@ -407,10 +476,16 @@
strPath = "FunctionIcon/DoorLock/DoorLock.png";
}
break;
-
+ case SPK.MusicStandard:
+ case SPK.AvMusic:
+ {
+ strPath = "MusicIcon/localMusic.png";
+ }
+ break;
}
return strPath;
}
+ #region 鍔ㄤ竴鏀逛笁
/// <summary>
/// 璁惧绫诲瀷鐨勫垪琛�(鐏厜绫伙紝绐楀笜绫汇�傘�傘��)
/// </summary>
@@ -420,6 +495,7 @@
{
List<string> deviceStrTypeList = new List<string>();
deviceStrTypeList.Clear();
+
///鐏厜绫�
var lightjosn = deviceList.Find((device) =>
device.spk == SPK.LightSwitch
@@ -444,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));
@@ -472,9 +548,10 @@
|| 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.SensorEnvironment || device.spk == SPK.SensorEnvironmentHailin
|| device.spk == SPK.SensorEnvironment2
|| device.spk == SPK.SensorEnvironment3
|| device.spk == SPK.SensorTemperature
@@ -484,6 +561,7 @@
|| device.spk == SPK.SensorTVOC
|| device.spk == SPK.SensorHcho
|| device.spk == SPK.SensorHelp
+ || device.spk == SPK.SensorPm10
);
if (sensor != null)
{
@@ -500,10 +578,37 @@
deviceStrTypeList.Add(Language.StringByID(StringId.Electric));
}
///闂ㄩ攣绫�
- var doorlock = deviceList.Find((device) => device.spk == SPK.DoorLock);
+ 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);
+ if (camera != null)
+ {
+ deviceStrTypeList.Add(Language.StringByID(StringId.shexiangtou));
}
return deviceStrTypeList;
@@ -516,6 +621,7 @@
public List<string> GetDeviceTypeFunctionList(string deviceType)
{
List<string> functionTypeList = new List<string>();
+
///鐏厜绫�
if (deviceType == Language.StringByID(StringId.Lights))
{
@@ -542,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))
@@ -565,9 +672,10 @@
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.SensorEnvironment); functionTypeList.Add(SPK.SensorEnvironmentHailin);
functionTypeList.Add(SPK.SensorEnvironment2);
functionTypeList.Add(SPK.SensorEnvironment3);
functionTypeList.Add(SPK.SensorTemperature);
@@ -577,6 +685,7 @@
functionTypeList.Add(SPK.SensorTVOC);
functionTypeList.Add(SPK.SensorHcho);
functionTypeList.Add(SPK.SensorHelp);
+ functionTypeList.Add(SPK.SensorPm10);
}
@@ -591,6 +700,28 @@
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);
}
else
{
@@ -608,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);
@@ -622,9 +754,10 @@
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.SensorEnvironment); functionTypeList.Add(SPK.SensorEnvironmentHailin);
functionTypeList.Add(SPK.SensorEnvironment2);
functionTypeList.Add(SPK.SensorEnvironment3);
functionTypeList.Add(SPK.SensorTemperature);
@@ -640,6 +773,15 @@
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);
+
}
@@ -665,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);
@@ -677,9 +819,10 @@
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.SensorEnvironment); deviceTypeList.Add(SPK.SensorEnvironmentHailin);
deviceTypeList.Add(SPK.SensorEnvironment2);
deviceTypeList.Add(SPK.SensorEnvironment3);
deviceTypeList.Add(SPK.SensorTemperature);
@@ -694,6 +837,11 @@
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);
}
break;
@@ -707,13 +855,17 @@
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);
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;
}
@@ -750,15 +902,15 @@
/// <returns></returns>
public List<Entity.Function> GetFunctionDeviceList(Entity.Room room, string str)
{
- List<string> functionTypeList = GetSupportEquipment(str);
+ List<string> functionTypeList = this.GetSupportEquipment(str);
//杩斿洖鎴块棿璁惧鍒楄〃
- var roomDeviceList = GetRoomDevice(room);
+ var roomDeviceList = this.GetRoomDevice(room);
//杩斿洖鏈�缁堟敮鎸佹樉绀哄嚭鏉ョ殑璁惧鍒楄〃
- var list = GetShowDeviceList(functionTypeList, roomDeviceList);
+ var list =this.GetShowDeviceList(functionTypeList, roomDeviceList);
return list;
}
/// <summary>
- /// 缃戝叧ID(鑾峰彇鍢変箰缃戝叧ID)
+ /// 缃戝叧ID(鑾峰彇缃戝叧ID)
/// </summary>
public string GatewayId
{
@@ -948,8 +1100,8 @@
try
{
//鑾峰彇閫昏緫ID鍒楄〃锛岀洰鍓嶉拡瀵规墍鏈�<澶囨敞:濡傛灉鍙拡瀵瑰綋鍓嶆墜鏈虹殑璇濓紝鍙互鐩存帴鎷跨紦瀛樻暟鎹嚜鍔ㄥ寲鍒楄〃閬嶅巻>
- var idStr = Send.GetLogicIdList();
- if (idStr.Code == "0" && idStr.Data != null && idStr.Data.ToString() != "")
+ var idStr = Send.Current.GetLogicIdList();
+ if (idStr != null)
{
var date = Newtonsoft.Json.JsonConvert.SerializeObject(idStr.Data);
logicDataList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<LogicData>>(date);
@@ -978,7 +1130,7 @@
//瀹氫箟涓�涓眬閮ㄥ彉閲�
string direction = string.Empty;
//涓ょ偣璺濈灏忎簬閰嶇疆璺濈<鏃㈣嚜鍔ㄥ寲閰嶇疆杈撳叆鏉′欢鍦扮悊鍥存爮鍗婂緞>,璇存槑杩涘叆鍖哄煙
- if (r < radius)
+ if (r * 1000 < radius)
{
//鍒拌揪鏌愬湴
direction = "arrive";
@@ -993,7 +1145,7 @@
if (isPush == null)
{
//鎺ㄩ�佺粰浜戠鏄惁鎴愬姛
- bool push = Send.GeoFenceStateReport(logicDate.userLogicId, logicDate.sid, direction);
+ bool push = Send.Current.GetFenceStateReport(logicDate.userLogicId, logicDate.sid, direction);
if (push)
{
///娣诲姞鍒版帹閫佸垪琛�
@@ -1023,20 +1175,35 @@
/// </summary>
/// <param name="isBool">鏄惁寮�鍚�</param>
/// <returns></returns>
- private List<Entity.Function> GetTestDevice(List<HDL_ON.Entity.Function> list, bool isBool)
+ private List<Entity.Function> GetTestDevice(ref List<HDL_ON.Entity.Function> list, bool isBool)
{
if (isBool)
{
- Entity.Function function = new Entity.Function { sid = "0123456789", name = "瓒呭０娉紶鎰熷櫒", spk = Entity.SPK.SensorUtrasonic };
- var device = list.Find((o) => { return o.sid == function.sid; });
- if (device == null)
+ //妯℃嫙璁惧
+ var functions = new List<Function> {
+ //new Entity.Function { sid = "1234567890", name = "瓒呭０娉紶鎰熷櫒", spk = Entity.SPK.SensorUtrasonic },
+ // new Entity.Function { sid = "1234567891", name = "娓╁害浼犳劅鍣�", spk = Entity.SPK.SensorTemperature },
+ // 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 = "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 },
+ // new Entity.Function { sid = "123456789912345", name = "娴锋浖鏈烘鎵�", spk = Entity.SPK.MechanicalArm },
+ // new Entity.Function { sid = "12345678991234566", name = "娴锋浖鏈烘鎵�", spk = Entity.SPK.MechanicalArm },
+ };
+ foreach (var function in functions)
{
- list.Add(function);
+ var device = list.Find((o) => { return o.sid == function.sid; });
+ if (device == null)
+ {
+ list.Add(function);
+ }
}
}
return list;
-
}
--
Gitblit v1.8.0