From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/Entity/FunctionList.cs | 787 ++++++++++++++-----------------------------------------
1 files changed, 202 insertions(+), 585 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index e963308..1f2fe17 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -16,11 +16,11 @@
{
get
{
- if(_FunctionList == null)
+ if (_FunctionList == null)
{
_FunctionList = new FunctionList();
#region 鎭㈠鏁版嵁
- var filePathList = Common.FileUtlis.Files.ReadFiles();
+ var filePathList = FileUtlis.Files.ReadFiles();
foreach (var filePath in filePathList)
{
_FunctionList.IniFunctionList(filePath);
@@ -30,225 +30,193 @@
return _FunctionList;
}
}
+ /// <summary>
+ /// 鍔熻兘鍒楄〃
+ /// </summary>
+ public List<Function> Functions = new List<Function>();
/// <summary>
/// 绌鸿皟鍒楄〃
/// </summary>
- public List<AC> aCs = new List<AC>();
+ /// <returns></returns>
+ public List<Function> GetAcList()
+ {
+ var spkList = SPK.AcSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
/// <summary>
/// 鐏厜鍒楄〃
/// </summary>
- public List<Light> lights = new List<Light>();
+ public List<Function> GetLightList()
+ {
+ var spkList = SPK.LightSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
/// <summary>
/// 绐楀笜鍒楄〃
/// </summary>
- public List<Curtain> curtains = new List<Curtain>();
+ public List<Function> GetCurtainList()
+ {
+ var spkList = SPK.CurtainSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
/// <summary>
/// 鍦扮儹鍒楄〃
/// </summary>
- public List<FloorHeating> floorHeatings = new List<FloorHeating>();
+ public List<Function> GetFloorHeatingList()
+ {
+ var spkList = SPK.FhSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
+ /// <summary>
+ /// 鏂伴鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetAirFreshList()
+ {
+ var spkList = SPK.AirFreshSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
+ /// <summary>
+ /// 鑳芥簮鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetEnergyList()
+ {
+ var spkList = SPK.EnergySpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
#region 瀹剁數鍒楄〃 electricals
/// <summary>
/// 瀹剁數鍒楄〃
/// </summary>
- public List<Function> electricals
+ public List<Function> GetElectricals()
{
- get
- {
- if(fans == null)
- {
- fans = new List<Fan>();
- }
- if(switchSockets == null)
- {
- switchSockets = new List<SwitchSocket>();
- }
- if(tVs == null)
- {
- tVs = new List<TV>();
- }
- if (airCleaners == null)
- {
- airCleaners = new List<AirCleaner>();
- }
- if (weepRobots == null)
- {
- weepRobots = new List<WeepRobot>();
- }
- if(waterValveList == null)
- {
- waterValveList = new List<Function>();
- }
- var list = new List<Function>();
- list.AddRange(fans);
- list.AddRange(switchSockets);
- list.AddRange(tVs);
- list.AddRange(airCleaners);
- list.AddRange(weepRobots);
- list.AddRange(waterValveList);
- return list;
- }
+ var spkList = SPK.ElectricalSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
+
+
/// <summary>
- /// 椋庢墖鍒楄〃
+ /// 绾㈠瀹濆垪琛�
/// </summary>
- public List<Fan> fans = new List<Fan>();
- /// <summary>
- /// 鐢佃鍒楄〃
- /// </summary>
- public List<TV> tVs = new List<TV>();
- /// <summary>
- /// 瀹剁數鍒楄〃
- /// </summary>
- 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>();
- /// <summary>
- /// 姘撮榾鍒楄〃
- /// </summary>
- public List<Function> waterValveList = new List<Function>();
-
+ public List<Function> GetIrModuleList()
+ {
+ return Functions.FindAll((obj) => obj.spk == SPK.IrModule);
+ }
#endregion
+
+ /// <summary>
+ /// 闊充箰鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetMusicList()
+ {
+ var spkList = SPK.MusicSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
+
/// <summary>
/// 鐜浼犳劅鍣ㄥ垪琛�
/// </summary>
- public List<Sensor> sensorsEnvironmentalScience = new List<Sensor>();
+ public List<Function> GetEnvirSensorsList()
+ {
+ var spkList = SPK.EnvironSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
/// <summary>
/// 瀹夐槻璁惧鍒楄〃
/// </summary>
- public List<Sensor> sensorsArm = new List<Sensor>();
+ public List<Function> GetArmSensorList()
+ {
+ var spkList = SPK.ArmSensorSpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
- public List<Scene> scenes = new List<Scene>();
+ /// <summary>
+ /// 鍙瀵硅鍒楄〃,褰撲负null鎴杝ize涓�0鍒欎笉鏄剧ず鍙瀵硅icon
+ /// </summary>
+ // public UI.UI2.FuntionControlView.Video.VideoClouds videoIntercom;
+ public List<UI.UI2.FuntionControlView.Video.Video> videoIntercom = new List<UI.UI2.FuntionControlView.Video.Video>();
+
+ List<Function> _OtherBrandFunction;
+ /// <summary>
+ /// 绗笁鏂瑰搧鐗屽姛鑳�
+ /// </summary>
+ public List<Function> OtherBrandFunction
+ {
+ get
+ {
+ if(_OtherBrandFunction == null)
+ {
+ _OtherBrandFunction = new List<Function>();
+ var spkList = SPK.GetAll3tySPK();
+ _OtherBrandFunction = Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+ return _OtherBrandFunction;
+ }
+ }
+
+
/// <summary>
/// 鍦烘櫙鍒楄〃
/// </summary>
- //public List<Scene> Scenes
- //{
- // get
- // {
- // List.scenes = List.scenes.OrderByDescending(o => o.createTime).ToList();
- // return List.scenes;
- // }
- //}
- /// <summary>
- /// 鍔熻兘鍒楄〃
- /// </summary>
- List<Function> deviceFunctionList = new List<Function>();
+ public List<Scene> scenes = new List<Scene>();
+ /// <summary>
+ /// 瀹夐槻鍒楄〃
+ /// </summary>
+ public List<SecurityAlarm> securities = new List<SecurityAlarm>();
/// <summary>
/// 鍔犺浇鍔熻兘鍒楄〃
- /// todo 闇�瑕佷紭鍖栵紝鍚庢湡涓嶈兘淇濊瘉鑳戒娇鐢╯id瑙ｆ瀽鍑烘槸浠�涔堢被鍨嬬殑璁惧
/// </summary>
/// <param name="filePath"></param>
- public void IniFunctionList(string filePath)
+ /// <param name="checkRepeat">
+ /// <para>鑰冭檻鍒版�ц兘闂杩藉姞姝ゅ彉閲�,鏄惁妫�娴嬮噸澶�,鍙function鏈夋晥</para>
+ /// <para>true:褰撻噸澶嶅瓨鍦ㄦ椂,鏇挎崲鎺�</para>
+ /// <para>false:鐩存帴鏃犳潯浠舵坊鍔�</para></param>
+ public void IniFunctionList(string filePath, bool checkRepeat = false)
{
+ //MainPage.Log("12346890sdkxghjkl");
// todo 澧炲姞璁惧锛屽鍔犲姛鑳借繘鍔熻兘鍒楄〃
if (filePath.StartsWith("FunctionData_"))
{
- var functionDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
+ var functionDataBytes = FileUtlis.Files.ReadFile(filePath);
var functionDataString = System.Text.Encoding.UTF8.GetString(functionDataBytes);
var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
if (tempFunction == null)
{
- Common.FileUtlis.Files.DeleteFile(filePath);
+ MainPage.Log("null");
+ FileUtlis.Files.DeleteFile(filePath);
return;
}
- if (tempFunction.DeleteSign)
+ //闊充箰閮ㄥ垎瑕佷慨鏀�
+ //if(tempFunction.spk.ToString() == SPK.MusicStandard)
+ //{
+ // UI.Music.A31MusicModel.A31MusicModelList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<UI.Music.A31MusicModel>(functionDataString));
+ //}
+ if (checkRepeat == true)
{
- //todo 鍒犻櫎浜戠鏁版嵁 20201203--App涓嶈兘鍒犻櫎鍔熻兘鏁版嵁
- }
- else
- {
- switch (tempFunction.spk)
+ //妫�娴嬮噸澶�
+ for (int i = 0; i < Functions.Count; i++)
{
- case SPK.LightSwitch:
- case SPK.LightDimming:
- case SPK.LightRGB:
- case SPK.LightRGBW:
- case SPK.LightCCT:
- var light = Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString);
- List.lights.Add(light);
- deviceFunctionList.Add(light);
- break;
- case SPK.CurtainRoller:
- case SPK.CurtainShades:
- case SPK.CurtainSwitch:
- case SPK.CurtainTrietex:
- var curtain = Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString);
- List.curtains.Add(curtain);
- deviceFunctionList.Add(curtain);
- break;
- case SPK.AcStandard:
- var ac = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString);
- List.aCs.Add(ac);
- deviceFunctionList.Add(ac);
- break;
- case SPK.FloorHeatStandard:
- var fh = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString);
- List.floorHeatings.Add(fh);
- deviceFunctionList.Add(fh);
- break;
- case SPK.SensorPm25:
- case SPK.SensorCO2:
- case SPK.SensorTVOC:
- case SPK.SensorTemperature:
- case SPK.SensorHumidity:
- var sensor = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString);
- List.sensorsEnvironmentalScience.Add(sensor);
- deviceFunctionList.Add(sensor);
- break;
- case SPK.ElectricSocket:
- var ele = Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString);
- List.switchSockets.Add(ele);
- deviceFunctionList.Add(ele);
- break;
- case SPK.ElectricTV:
- var tv = Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString);
- List.tVs.Add(tv);
- deviceFunctionList.Add(tv);
- break;
- case SPK.ElectricFan:
- 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.ElectricTuyaWaterValve:
- var tuyaWaterValve = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
- List.waterValveList.Add(tuyaWaterValve);
- deviceFunctionList.Add(tuyaWaterValve);
- break;
- case SPK.SensorSmoke:
- case SPK.SensorWater:
- case SPK.SensorGas:
- case SPK.SensorPir:
- var ser = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString);
- List.sensorsArm.Add(ser);
- deviceFunctionList.Add(ser);
- break;
+ if (Functions[i].deviceId == tempFunction.deviceId)
+ {
+ //鍏堢Щ闄ゆ帀鍐嶅姞
+ Functions.RemoveAt(i);
+ Functions.Add(tempFunction);
+ return;
+ }
}
}
+ Functions.Add(tempFunction);
}
if (filePath.StartsWith("SceneData_"))
{
@@ -257,6 +225,33 @@
var tempScene = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(sceneDataString);
List.scenes.Add(tempScene);
}
+ else if (filePath.StartsWith("SecurityData_"))
+ {
+ var dataBytes = FileUtlis.Files.ReadFile(filePath);
+ var dataString = System.Text.Encoding.UTF8.GetString(dataBytes);
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityAlarm>(dataString);
+ if (temp == null)
+ {
+ MainPage.Log("null");
+ FileUtlis.Files.DeleteFile(filePath);
+ return;
+ }
+ if (checkRepeat == true)
+ {
+ //妫�娴嬮噸澶�
+ for (int i = 0; i < securities.Count; i++)
+ {
+ if (securities[i].sid == temp.sid)
+ {
+ //鍏堢Щ闄ゆ帀鍐嶅姞
+ securities.RemoveAt(i);
+ securities.Add(temp);
+ return;
+ }
+ }
+ }
+ securities.Add(temp);
+ }
}
/// <summary>
@@ -264,27 +259,6 @@
/// </summary>
public List<Function> GetDeviceFunctionList(SPK.BrandType brandType = SPK.BrandType.All)
{
- if (deviceFunctionList == null || deviceFunctionList.Count == 0)
- {
- deviceFunctionList = new List<Function>();
- deviceFunctionList.AddRange(aCs);
- deviceFunctionList.AddRange(lights);
- deviceFunctionList.AddRange(curtains);
- deviceFunctionList.AddRange(floorHeatings);
- deviceFunctionList.AddRange(electricals);
- deviceFunctionList.AddRange(sensorsEnvironmentalScience);
- deviceFunctionList.AddRange(sensorsArm);
- deviceFunctionList.AddRange(UI.Music.A31MusicModel.A31MusicModelList);
- try
- {
- deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList();
- }
- catch (Exception ex)
- {
- MainPage.Log($"璁惧鍔熻兘鎺掑簭寮傚父锛歿ex.Message}");
- }
- }
-
List<Function> resultFunctions = new List<Function>();
if (brandType == SPK.BrandType.All)
{
@@ -294,7 +268,7 @@
switch (brandType)
{
case SPK.BrandType.Hdl:
- foreach (var function in deviceFunctionList)
+ foreach (var function in Functions)
{
if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(function.spk))
{
@@ -304,7 +278,7 @@
break;
case SPK.BrandType.Tuya:
- foreach (var function in deviceFunctionList)
+ foreach (var function in Functions)
{
if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(function.spk))
{
@@ -316,158 +290,19 @@
return resultFunctions;
}
- return deviceFunctionList;
+ return Functions;
}
+
+
+
/// <summary>
/// 娓呯┖璁惧鍔熻兘鍒楄〃
/// </summary>
public void Clear()
{
- 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;
+ Functions = new List<Function>();
_FunctionList = null;
- }
-
- /// <summary>
- /// 鎺ユ敹bus杞欢涓婁紶鐨勫姛鑳�
- /// tcp鏂瑰紡
- /// </summary>
- /// <param name="sidObj"></param>
- public void AddDeviceFunction(Function sidObj0)
- {
- switch (sidObj0.spk)
- {
- case SPK.AcStandard:
- var sidObj = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.aCs.Add(sidObj);
- sidObj.SaveFunctionFile();
- break;
- case SPK.FloorHeatStandard:
- var sidObj1 = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.floorHeatings.Add(sidObj1);
- sidObj1.SaveFunctionFile();
- break;
- case SPK.LightDimming:
- case SPK.LightRGB:
- case SPK.LightSwitch:
- var sidObj2 = Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.lights.Add(sidObj2);
- sidObj2.SaveFunctionFile();
- break;
- case SPK.CurtainSwitch:
- case SPK.CurtainRoller:
- case SPK.CurtainTrietex:
- var sidObj3 = Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.curtains.Add(sidObj3 );
- sidObj3.SaveFunctionFile();
- break;
- case SPK.ElectricTV:
- var sidObj4 = Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.tVs.Add(sidObj4);
- sidObj4.SaveFunctionFile();
- break;
- case SPK.ElectricSocket:
- var sidObj5 = Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.switchSockets.Add(sidObj5);
- sidObj5.SaveFunctionFile();
- break;
- case SPK.ElectricFan:
- var sidObj6 = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.fans.Add(sidObj6);
- sidObj6.SaveFunctionFile();
- break;
- case SPK.SensorCO2:
- case SPK.SensorTVOC:
- case SPK.SensorPm25:
- case SPK.SensorTemperature:
- case SPK.SensorHumidity:
- var sidObj7 = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.sensorsEnvironmentalScience.Add(sidObj7);
- sidObj7.SaveFunctionFile();
- break;
- }
- }
- /// <summary>
- /// 鎺ユ敹bus杞欢涓婁紶鐨勫姛鑳�
- /// http udp
- /// </summary>
- /// <param name="obj"></param>
- public void AddFunction(object obj)
- {
- var f = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(obj.ToString());
- if (f == null)
- return;
- switch (f.Spk_Prefix)
- {
- case FunctionCategory.AC:
- switch (f.spk)
- {
- case SPK.AcStandard:
- List.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(obj.ToString()));
- break;
- }
- break;
- case FunctionCategory.FloorHeat:
- switch (f.spk)
- {
- case SPK.FloorHeatStandard:
- List.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(obj.ToString()));
- break;
- }
- break;
- case FunctionCategory.Light:
- List.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(obj.ToString()));
- break;
- case FunctionCategory.Curtain:
- List.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(obj.ToString()));
- break;
- case FunctionCategory.Electric:
- switch(f.spk)
- {
- case SPK.ElectricTV:
- List.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(obj.ToString()));
- break;
- case SPK.ElectricSocket:
- List.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(obj.ToString()));
- break;
- case SPK.ElectricFan:
- List.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(obj.ToString()));
- break;
- }
- break;
- case FunctionCategory.Sensor:
- switch (f.spk)
- {
- case SPK.SensorTVOC:
- case SPK.SensorCO2:
- case SPK.SensorPm25:
- case SPK.SensorHumidity:
- case SPK.SensorTemperature:
- 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;
- }
}
/// <summary>
@@ -514,55 +349,14 @@
List.scenes.Remove(scene);
}
}
+
/// <summary>
/// 鍒犻櫎鏈湴鍔熻兘鍙婃枃浠�
/// </summary>
public void DeleteFunction(Function delTemp)
{
- switch (delTemp.spk)
- {
- case SPK.LightSwitch:
- case SPK.LightDimming:
- case SPK.LightRGB:
- case SPK.LightRGBW:
- case SPK.LightCCT:
- List.lights.Remove(List.lights.Find((obj) => obj.deviceId == delTemp.deviceId));
- break;
- case SPK.CurtainRoller:
- case SPK.CurtainShades:
- case SPK.CurtainSwitch:
- case SPK.CurtainTrietex:
- List.curtains.Remove(List.curtains.Find((obj) => obj.deviceId == delTemp.deviceId));
- break;
- case SPK.AcStandard:
- List.aCs.Remove(List.aCs.Find((obj) => obj.deviceId == delTemp.deviceId));
- break;
- case SPK.FloorHeatStandard:
- 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:
- List.sensorsEnvironmentalScience.Remove(List.sensorsEnvironmentalScience.Find((obj) => obj.deviceId == delTemp.deviceId));
- break;
- case SPK.ElectricSocket:
- List.switchSockets.Remove(List.switchSockets.Find((obj) => obj.deviceId == delTemp.deviceId));
- break;
- case SPK.ElectricTV:
- List.tVs.Remove(List.tVs.Find((obj) => obj.deviceId == delTemp.deviceId));
- break;
- case SPK.ElectricFan:
- List.fans.Remove(List.fans.Find((obj) => obj.deviceId == delTemp.deviceId));
- break;
- }
- var removeTemp = deviceFunctionList.Find((obj) => obj.deviceId == delTemp.deviceId);
- if(removeTemp!= null)
- {
- deviceFunctionList.Remove(removeTemp);
- }
- Common.FileUtlis.Files.DeleteFile(delTemp.savePath);
+ Functions.Remove(Functions.Find((obj) => obj.deviceId == delTemp.deviceId));
+ FileUtlis.Files.DeleteFile(delTemp.savePath);
}
bool lockReadFunctionStatus = false;
@@ -616,7 +410,31 @@
{
Read3tyFunctionStatus();
- if (DriverLayer.Control.Ins.IsRemote)
+ if(DriverLayer.Control.Ins.GatewayOnline_Local)
+ {
+ foreach (var function in GetDeviceFunctionList(SPK.BrandType.Hdl))
+ {
+ switch (function.Spk_Prefix)
+ {
+ case FunctionCategory.Music:
+ case FunctionCategory.DryContact:
+ continue;
+ }
+ DriverLayer.Control.Ins.SendReadCommand(function);
+ //switch (function.Spk_Prefix)
+ //{
+ // case FunctionCategory.Light:
+ // case FunctionCategory.Electric:
+ // case FunctionCategory.Curtain:
+ // case FunctionCategory.AC:
+ // case FunctionCategory.FloorHeat:
+ // case FunctionCategory.Sensor:
+ // DriverLayer.Control.Ins.SendReadCommand(function);
+ // break;
+ //}
+ }
+ }
+ else
{
var page = new List<string>();
int count = 0;
@@ -634,22 +452,6 @@
}
DriverLayer.Control.Ins.SendApiReadCommand(page);
}
- else
- {
- foreach (var function in GetDeviceFunctionList(SPK.BrandType.Hdl))
- {
- switch (function.Spk_Prefix)
- {
- case FunctionCategory.Light:
- case FunctionCategory.Electric:
- case FunctionCategory.Curtain:
- case FunctionCategory.AC:
- case FunctionCategory.FloorHeat:
- DriverLayer.Control.Ins.SendReadCommand(function);
- break;
- }
- }
- }
}
catch (Exception ex)
{
@@ -665,6 +467,7 @@
})
{ IsBackground = true }.Start();
}
+
#region 鍦烘櫙鐩稿叧
/// <summary>
/// 娣诲姞鍦烘櫙
@@ -719,195 +522,9 @@
#endregion
- #region 鍔熻兘鏂囨湰鐩稿叧
- /// <summary>
- /// 灞炴�у悕绉版樉绀烘枃鏈�
- /// 涓嫳鏂囨樉绀�
- /// </summary>
- public string GetNameText(string key)
- {
- string text = "";
- switch (key)
- {
- case FunctionAttributeKey.OnOff:
- text = Language.StringByID(StringId.OnOff);
- break;
- case FunctionAttributeKey.Brightness:
- text = Language.StringByID(StringId.Brightness);
- break;
- case FunctionAttributeKey.RGB:
- text = Language.StringByID(StringId.ColorValue);
- break;
- case FunctionAttributeKey.Mode:
- text = Language.StringByID(StringId.Mode);
- break;
- case FunctionAttributeKey.FanSpeed:
- text = Language.StringByID(StringId.FanSpeed);
- break;
- case FunctionAttributeKey.SetTemp:
- text = Language.StringByID(StringId.Temp);
- break;
- case FunctionAttributeKey.IndoorTemp:
- text = Language.StringByID(StringId.IndoorTemp);
- break;
- case FunctionAttributeKey.Delay:
- text = Language.StringByID(StringId.Delay);
- break;
- case FunctionAttributeKey.CCT:
- text = "CCT";
- break;
- case FunctionAttributeKey.Percent:
- text = Language.StringByID(StringId.PercentAdjustment);
- break;
- case FunctionAttributeKey.FadeTime:
- text = Language.StringByID(StringId.FadeSpeed);
- break;
- }
- return text;
- }
+ #region
+
- /// <summary>
- /// 灞炴�у�煎崟浣�
- /// </summary>
- public string GetUintString(string key)
- {
- var us = "";
- switch (key)
- {
- case FunctionAttributeKey.SetTemp:
- case FunctionAttributeKey.IndoorTemp:
- us = "掳C";
- break;
- case FunctionAttributeKey.Percent:
- case FunctionAttributeKey.Brightness:
- us = "%";
- break;
- }
- return us;
- }
-
- /// <summary>
- /// 鑾峰彇鎸囧畾灞炴�х殑鏄剧ず鏂囨湰
- /// 涓嫳鏂囨樉绀�
- /// </summary>
- public string GetValueText(string key, string value)
- {
- string text = "";
- switch (key)
- {
- case FunctionAttributeKey.OnOff:
- text = value == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
- break;
- case FunctionAttributeKey.SetTemp:
- case FunctionAttributeKey.IndoorTemp:
- case FunctionAttributeKey.Brightness:
- case FunctionAttributeKey.Percent:
- if (value == "")
- {
- value = "0";
- }
- text = value;
- break;
- case FunctionAttributeKey.Mode:
- switch (value)
- {
- //----绌鸿皟
- case "auto":
- text = Language.StringByID(StringId.Auto);
- break;
- case "cool":
- text = Language.StringByID(StringId.Cool);
- break;
- case "heat":
- text = Language.StringByID(StringId.Heat);
- break;
- case "dry":
- text = Language.StringByID(StringId.Dry);
- break;
- case "fan":
- text = Language.StringByID(StringId.AirSupply);
- break;
- //-----鍦扮儹
- case "day":
- text = Language.StringByID(StringId.Day);
- break;
- case "night":
- text = Language.StringByID(StringId.Night);
- break;
- case "away":
- text = Language.StringByID(StringId.Away);
- break;
- case "normal":
- text = Language.StringByID(StringId.Normal);
- break;
- case "timer":
- text = Language.StringByID(StringId.Timer);
- break;
- }
- break;
- case FunctionAttributeKey.FanSpeed:
- switch (value)
- {
- case "high":
- text = Language.StringByID(StringId.HighWindSpeed);
- break;
- case "medium":
- text = Language.StringByID(StringId.MiddleWindSpeed);
- break;
- case "low":
- text = Language.StringByID(StringId.LowWindSpeed);
- break;
- case "auto":
- text = Language.StringByID(StringId.Auto);
- break;
- default:
- text = "low";
- break;
- }
- break;
- case "high":
- text = Language.StringByID(StringId.HighWindSpeed);
- break;
- case "medium":
- text = Language.StringByID(StringId.MiddleWindSpeed);
- break;
- case "low":
- text = Language.StringByID(StringId.LowWindSpeed);
- break;
- case "auto":
- text = Language.StringByID(StringId.Auto);
- break;
- }
- return text;
- }
-
-
- /// <summary>
- /// 寤舵椂鏄剧ず鐨勬枃鏈�
- /// </summary>
- public string GetDelayText(string delay)
- {
- string text = "";
- switch (delay)
- {
- case "0":
- text = Language.StringByID(StringId.NoDelay);
- break;
- case "30":
- text = "30s";
- break;
- case "60":
- text = "1min";
- break;
- case "120":
- text = "2min";
- break;
- case "300":
- text = "5min";
- break;
- }
- return text;
- }
#endregion
}
--
Gitblit v1.8.0