From 427a6e93b8946b9d91727166a352b2ee2ef75d19 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:10:08 +0800
Subject: [PATCH] Delete .DS_Store
---
HDL_ON/Entity/FunctionList.cs | 133 +++++++++++++++++++++++++++++++------------
1 files changed, 95 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
old mode 100644
new mode 100755
index 3e7152d..a6b3d33
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -67,10 +67,20 @@
{
tVs = new List<TV>();
}
+ if (airCleaners == null)
+ {
+ airCleaners = new List<AirCleaner>();
+ }
+ if (weepRobots == null)
+ {
+ weepRobots = new List<WeepRobot>();
+ }
var list = new List<Function>();
list.AddRange(fans);
list.AddRange(switchSockets);
- list.AddRange(tVs);
+ list.AddRange(tVs);
+ list.AddRange(airCleaners);
+ list.AddRange(weepRobots);
return list;
}
}
@@ -85,12 +95,25 @@
/// <summary>
/// 瀹剁數鍒楄〃
/// </summary>
- public List<SwitchSocket> switchSockets = new List<SwitchSocket>();
+ public List<SwitchSocket> switchSockets = new List<SwitchSocket>();
+ /// <summary>
+ /// 绌烘皵鍑�鍖栧櫒鍒楄〃
+ /// </summary>
+ public List<AirCleaner> airCleaners = new List<AirCleaner>();
+ /// <summary>
+ /// 鎵湴鏈哄櫒浜哄垪琛�
+ /// </summary>
+ public List<WeepRobot> weepRobots = new List<WeepRobot>();
+
#endregion
/// <summary>
/// 鐜浼犳劅鍣ㄥ垪琛�
/// </summary>
public List<Sensor> sensorsEnvironmentalScience = new List<Sensor>();
+ /// <summary>
+ /// 瀹夐槻璁惧鍒楄〃
+ /// </summary>
+ public List<Sensor> sensorsArm = new List<Sensor>();
public List<Scene> scenes = new List<Scene>();
/// <summary>
@@ -141,7 +164,7 @@
case SPK.LightRGBW:
case SPK.LightCCT:
var light = Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString);
- _FunctionList.lights.Add(light);
+ List.lights.Add(light);
deviceFunctionList.Add(light);
break;
case SPK.CurtainRoller:
@@ -149,17 +172,17 @@
case SPK.CurtainSwitch:
case SPK.CurtainTrietex:
var curtain = Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString);
- _FunctionList.curtains.Add(curtain);
+ List.curtains.Add(curtain);
deviceFunctionList.Add(curtain);
break;
case SPK.AcStandard:
var ac = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString);
- _FunctionList.aCs.Add(ac);
+ List.aCs.Add(ac);
deviceFunctionList.Add(ac);
break;
case SPK.FloorHeatStandard:
var fh = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString);
- _FunctionList.floorHeatings.Add(fh);
+ List.floorHeatings.Add(fh);
deviceFunctionList.Add(fh);
break;
case SPK.SensorPm25:
@@ -168,23 +191,45 @@
case SPK.SensorTemperature:
case SPK.SensorHumidity:
var sensor = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString);
- _FunctionList.sensorsEnvironmentalScience.Add(sensor);
+ List.sensorsEnvironmentalScience.Add(sensor);
deviceFunctionList.Add(sensor);
break;
case SPK.ElectricSocket:
var ele = Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString);
- _FunctionList.switchSockets.Add(ele);
+ List.switchSockets.Add(ele);
deviceFunctionList.Add(ele);
break;
case SPK.ElectricTV:
var tv = Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString);
- _FunctionList.tVs.Add(tv);
+ List.tVs.Add(tv);
deviceFunctionList.Add(tv);
break;
case SPK.ElectricFan:
- var fan = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString);
- _FunctionList.fans.Add(fan);
+ var fan = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString);
+ List.fans.Add(fan);
deviceFunctionList.Add(fan);
+ break;
+ case SPK.ElectricTuyaAirCleaner:
+ var airCleaner = Newtonsoft.Json.JsonConvert.DeserializeObject<AirCleaner>(functionDataString);
+ List.airCleaners.Add(airCleaner);
+ deviceFunctionList.Add(airCleaner);
+ break;
+ case SPK.ElectricTuyaFan:
+ var tuyaFan = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString);
+ List.fans.Add(tuyaFan);
+ deviceFunctionList.Add(tuyaFan);
+ break;
+ case SPK.ElectricTuyaWeepRobot:
+ var tuyaWeepRobot = Newtonsoft.Json.JsonConvert.DeserializeObject<WeepRobot>(functionDataString);
+ List.weepRobots.Add(tuyaWeepRobot);
+ deviceFunctionList.Add(tuyaWeepRobot);
+ break;
+ case SPK.SensorSmoke:
+ case SPK.SensorWater:
+ case SPK.SensorGas:
+ var ser = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString);
+ List.sensorsArm.Add(ser);
+ deviceFunctionList.Add(ser);
break;
}
}
@@ -212,6 +257,7 @@
deviceFunctionList.AddRange(floorHeatings);
deviceFunctionList.AddRange(electricals);
deviceFunctionList.AddRange(sensorsEnvironmentalScience);
+ deviceFunctionList.AddRange(sensorsArm);
deviceFunctionList.AddRange(UI.Music.A31MusicModel.A31MusicModelList);
}
try
@@ -229,16 +275,16 @@
/// </summary>
public void Clear()
{
- _FunctionList.aCs = new List<AC>();
- _FunctionList.lights = new List<Light>();
- _FunctionList.curtains = new List<Curtain>();
- _FunctionList.floorHeatings = new List<FloorHeating>();
- _FunctionList.tVs = new List<TV>();
- _FunctionList.switchSockets = new List<SwitchSocket>();
- _FunctionList.fans = new List<Fan>();
- _FunctionList.sensorsEnvironmentalScience = new List<Sensor>();
- _FunctionList.scenes = new List<Scene>();
- _FunctionList.deviceFunctionList = null;
+ List.aCs = new List<AC>();
+ List.lights = new List<Light>();
+ List.curtains = new List<Curtain>();
+ List.floorHeatings = new List<FloorHeating>();
+ List.tVs = new List<TV>();
+ List.switchSockets = new List<SwitchSocket>();
+ List.fans = new List<Fan>();
+ List.sensorsEnvironmentalScience = new List<Sensor>();
+ List.scenes = new List<Scene>();
+ List.deviceFunctionList = null;
_FunctionList = null;
}
@@ -317,7 +363,7 @@
switch (f.spk)
{
case SPK.AcStandard:
- _FunctionList.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(obj.ToString()));
+ List.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(obj.ToString()));
break;
}
break;
@@ -325,39 +371,50 @@
switch (f.spk)
{
case SPK.FloorHeatStandard:
- _FunctionList.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(obj.ToString()));
+ List.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(obj.ToString()));
break;
}
break;
case FunctionCategory.Light:
- _FunctionList.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(obj.ToString()));
+ List.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(obj.ToString()));
break;
case FunctionCategory.Curtain:
- _FunctionList.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(obj.ToString()));
+ List.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(obj.ToString()));
break;
case FunctionCategory.Electric:
switch(f.spk)
{
case SPK.ElectricTV:
- _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(obj.ToString()));
+ List.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(obj.ToString()));
break;
case SPK.ElectricSocket:
- _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(obj.ToString()));
+ List.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(obj.ToString()));
break;
case SPK.ElectricFan:
- _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(obj.ToString()));
+ List.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(obj.ToString()));
break;
}
break;
case FunctionCategory.Sensor:
- switch(f.spk)
+ switch (f.spk)
{
case SPK.SensorTVOC:
case SPK.SensorCO2:
case SPK.SensorPm25:
case SPK.SensorHumidity:
case SPK.SensorTemperature:
- _FunctionList.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString()));
+ List.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString()));
+ break;
+ case SPK.SensorWater:
+ case SPK.SensorSmoke:
+ case SPK.SensorGas:
+ case SPK.SensorDryContact:
+ case SPK.SensorShanLan:
+ case SPK.SensorDuiShe:
+ case SPK.SensorPir:
+ case SPK.SensorDoorWindow:
+ case SPK.SensoruUtrasonic:
+ List.sensorsArm.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString()));
break;
}
break;
@@ -420,35 +477,35 @@
case SPK.LightRGB:
case SPK.LightRGBW:
case SPK.LightCCT:
- _FunctionList.lights.Remove(_FunctionList.lights.Find((obj) => obj.deviceId == delTemp.deviceId));
+ List.lights.Remove(List.lights.Find((obj) => obj.deviceId == delTemp.deviceId));
break;
case SPK.CurtainRoller:
case SPK.CurtainShades:
case SPK.CurtainSwitch:
case SPK.CurtainTrietex:
- _FunctionList.curtains.Remove(_FunctionList.curtains.Find((obj) => obj.deviceId == delTemp.deviceId));
+ List.curtains.Remove(List.curtains.Find((obj) => obj.deviceId == delTemp.deviceId));
break;
case SPK.AcStandard:
- _FunctionList.aCs.Remove(_FunctionList.aCs.Find((obj) => obj.deviceId == delTemp.deviceId));
+ List.aCs.Remove(List.aCs.Find((obj) => obj.deviceId == delTemp.deviceId));
break;
case SPK.FloorHeatStandard:
- _FunctionList.floorHeatings.Remove(_FunctionList.floorHeatings.Find((obj) => obj.deviceId == delTemp.deviceId));
+ List.floorHeatings.Remove(List.floorHeatings.Find((obj) => obj.deviceId == delTemp.deviceId));
break;
case SPK.SensorPm25:
case SPK.SensorCO2:
case SPK.SensorTVOC:
case SPK.SensorTemperature:
case SPK.SensorHumidity:
- _FunctionList.sensorsEnvironmentalScience.Remove(_FunctionList.sensorsEnvironmentalScience.Find((obj) => obj.deviceId == delTemp.deviceId));
+ List.sensorsEnvironmentalScience.Remove(List.sensorsEnvironmentalScience.Find((obj) => obj.deviceId == delTemp.deviceId));
break;
case SPK.ElectricSocket:
- _FunctionList.switchSockets.Remove(_FunctionList.switchSockets.Find((obj) => obj.deviceId == delTemp.deviceId));
+ List.switchSockets.Remove(List.switchSockets.Find((obj) => obj.deviceId == delTemp.deviceId));
break;
case SPK.ElectricTV:
- _FunctionList.tVs.Remove(_FunctionList.tVs.Find((obj) => obj.deviceId == delTemp.deviceId));
+ List.tVs.Remove(List.tVs.Find((obj) => obj.deviceId == delTemp.deviceId));
break;
case SPK.ElectricFan:
- _FunctionList.fans.Remove(_FunctionList.fans.Find((obj) => obj.deviceId == delTemp.deviceId));
+ List.fans.Remove(List.fans.Find((obj) => obj.deviceId == delTemp.deviceId));
break;
}
var removeTemp = deviceFunctionList.Find((obj) => obj.deviceId == delTemp.deviceId);
--
Gitblit v1.8.0