From 05102dc658048ebab57e6b41c9c18ca7e9c5e527 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 15 十二月 2020 17:11:37 +0800
Subject: [PATCH] 2020-12-15 1.修改调整头像路径方案。2.窗帘问题修改。
---
HDL_ON/Entity/FunctionList.cs | 175 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 88 insertions(+), 87 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 06fcf7a..8a38fa0 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -18,7 +18,7 @@
{
_FunctionList = new FunctionList();
#region 鎭㈠鏁版嵁
- var filePathList = FileUtils.ReadFiles();
+ var filePathList = Common.FileUtlis.Files.ReadFiles();
foreach (var filePath in filePathList)
{
_FunctionList.IniFunctionList(filePath);
@@ -97,7 +97,7 @@
/// <summary>
/// 鍔熻兘鍒楄〃
/// </summary>
- List<Function> deviceFunctionList;
+ List<Function> deviceFunctionList = new List<Function>();
/// <summary>
@@ -109,12 +109,12 @@
{
if (filePath.StartsWith("FunctionData_"))
{
- var functionDataBytes = FileUtils.ReadFile(filePath);
+ var functionDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
var functionDataString = System.Text.Encoding.UTF8.GetString(functionDataBytes);
var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
if (tempFunction == null)
{
- FileUtils.DeleteFile(filePath);
+ Common.FileUtlis.Files.DeleteFile(filePath);
return;
}
if (tempFunction.DeleteSign)
@@ -130,70 +130,70 @@
case SPK.LightRGB:
case SPK.LightRGBW:
case SPK.LightCCT:
- _FunctionList.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
+ var light = Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString);
+ _FunctionList.lights.Add(light);
+ deviceFunctionList.Add(light);
break;
case SPK.CurtainRoller:
case SPK.CurtainShades:
case SPK.CurtainSwitch:
case SPK.CurtainTrietex:
- _FunctionList.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
+ var curtain = Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString);
+ _FunctionList.curtains.Add(curtain);
+ deviceFunctionList.Add(curtain);
break;
case SPK.AcStandard:
- _FunctionList.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
+ var ac = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString);
+ _FunctionList.aCs.Add(ac);
+ deviceFunctionList.Add(ac);
break;
case SPK.FloorHeatStandard:
- //鎭㈠鍦扮儹鏁版嵁
- _FunctionList.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
+ var fh = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString);
+ _FunctionList.floorHeatings.Add(fh);
+ deviceFunctionList.Add(fh);
break;
case SPK.SensorPm25:
case SPK.SensorCO2:
case SPK.SensorTVOC:
case SPK.SensorTemperature:
case SPK.SensorHumidity:
- //鎭㈠鐜鏁版嵁
- _FunctionList.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
+ var sensor = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString);
+ _FunctionList.sensorsEnvironmentalScience.Add(sensor);
+ deviceFunctionList.Add(sensor);
break;
case SPK.ElectricSocket:
- //鎭㈠鎻掑骇鏁版嵁
- _FunctionList.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
+ var ele = Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString);
+ _FunctionList.switchSockets.Add(ele);
+ deviceFunctionList.Add(ele);
break;
case SPK.ElectricTV:
- //鎭㈠鐢佃鏁版嵁
- _FunctionList.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
+ var tv = Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString);
+ _FunctionList.tVs.Add(tv);
+ deviceFunctionList.Add(tv);
break;
case SPK.ElectricFan:
- //鎭㈠椋庢墖鏁版嵁
- _FunctionList.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
+ var fan = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString);
+ _FunctionList.fans.Add(fan);
+ deviceFunctionList.Add(fan);
break;
}
}
}
if (filePath.StartsWith("SceneData_"))
{
- var sceneDataBytes = FileUtils.ReadFile(filePath);
+ var sceneDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
var sceneDataString = System.Text.Encoding.UTF8.GetString(sceneDataBytes);
var tempScene = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(sceneDataString);
List.scenes.Add(tempScene);
}
}
-
- /// <summary>
- /// 鑾峰彇鎵�鏈夊姛鑳藉垪琛�
- /// </summary>
- public List<Function> GetAllFunction()
- {
- var fs = new List<Function>();
- fs.AddRange(GetAllDeviceFunctionList());
- return fs;
- }
-
/// <summary>
/// 鑾峰彇璁惧鍔熻兘鍒楄〃
/// </summary>
- public List<Function> GetAllDeviceFunctionList()
+ public List<Function> GetDeviceFunctionList()
{
- //if (deviceFunctionList == null)
+ if (deviceFunctionList == null || deviceFunctionList.Count == 0)
{
deviceFunctionList = new List<Function>();
deviceFunctionList.AddRange(aCs);
@@ -217,18 +217,19 @@
/// <summary>
/// 娓呯┖璁惧鍔熻兘鍒楄〃
/// </summary>
- public void ClearAllDeviceFunctionList()
+ public void Clear()
{
- aCs = new List<AC>();
- lights = new List<Light>();
- curtains = new List<Curtain>();
- floorHeatings = new List<FloorHeating>();
- tVs = new List<TV>();
- switchSockets = new List<SwitchSocket>();
- fans = new List<Fan>();
- sensorsEnvironmentalScience = new List<Sensor>();
- scenes = new List<Scene>();
- deviceFunctionList = null;
+ _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;
+ _FunctionList = null;
}
/// <summary>
@@ -242,41 +243,41 @@
{
case FunctionType.AC:
var sidObj = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.aCs.Add(sidObj);
+ List.aCs.Add(sidObj);
sidObj.SaveFunctionData(false);
break;
case FunctionType.FloorHeating:
var sidObj1 = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.floorHeatings.Add(sidObj1);
+ List.floorHeatings.Add(sidObj1);
sidObj1.SaveFunctionData(false);
break;
case FunctionType.Dimmer:
case FunctionType.RGB:
case FunctionType.Relay:
var sidObj2 = Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.lights.Add(sidObj2);
+ List.lights.Add(sidObj2);
sidObj2.SaveFunctionData(false);
break;
case FunctionType.Curtain:
case FunctionType.RollingShutter:
case FunctionType.MotorCurtain:
var sidObj3 = Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.curtains.Add(sidObj3 );
+ List.curtains.Add(sidObj3 );
sidObj3.SaveFunctionData(false);
break;
case FunctionType.TV:
var sidObj4 = Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.tVs.Add(sidObj4);
+ List.tVs.Add(sidObj4);
sidObj4.SaveFunctionData(false);
break;
case FunctionType.Socket:
var sidObj5 = Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.switchSockets.Add(sidObj5);
+ List.switchSockets.Add(sidObj5);
sidObj5.SaveFunctionData(false);
break;
case FunctionType.Fan:
var sidObj6 = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.fans.Add(sidObj6);
+ List.fans.Add(sidObj6);
sidObj6.SaveFunctionData(false);
break;
case FunctionType.CO2:
@@ -285,7 +286,7 @@
case FunctionType.Temp:
case FunctionType.Humidity:
var sidObj7 = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.sensorsEnvironmentalScience.Add(sidObj7);
+ List.sensorsEnvironmentalScience.Add(sidObj7);
sidObj7.SaveFunctionData(false);
break;
}
@@ -380,17 +381,9 @@
var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(pack.Data.ToString());
if (deviceList != null)
{
- ////灏嗕笅杞藉埌鍒版暟鎹叏閮ㄤ繚瀛�
- //new Thread(() => {
- // foreach (var temp in deviceList.list)
- // {
- // temp.SaveFunctionData();
- // }
- //})
- //{ IsBackground = true }.Start();
- for (int i =0;i < List.GetAllDeviceFunctionList().Count;)
+ for (int i =0;i < List.GetDeviceFunctionList().Count;)
{
- var localFunction = List.GetAllDeviceFunctionList()[i];
+ var localFunction = List.GetDeviceFunctionList()[i];
var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
if (newFunction == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
{
@@ -401,6 +394,7 @@
i++;
if (localFunction.modifyTime != newFunction.modifyTime)
{
+ MainPage.Log($"local:{localFunction.modifyTime}\r\n server:{newFunction.modifyTime}");
localFunction.name = newFunction.name;
localFunction.collect = newFunction.collect;
localFunction.modifyTime = newFunction.modifyTime;
@@ -454,6 +448,11 @@
for(int i=0;i<List.scenes.Count;)
{
var localScene = List.scenes[i];
+ if (localScene == null)
+ {
+ List.scenes.Remove(localScene);
+ continue;
+ }
var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
if (newScene == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
{
@@ -491,21 +490,6 @@
/// <summary>
- /// 鍒犻櫎鎵嬫満瀛樺偍閮芥墍鏈夌紦瀛樺姛鑳芥暟鎹�
- /// </summary>
- public void DelAllFunctionData()
- {
- var filePathList = FileUtils.ReadFiles();
- foreach (var filePath in filePathList)
- {
- if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
- {
- FileUtils.DeleteFile(filePath);
- }
- }
- _FunctionList = new FunctionList();
- }
- /// <summary>
/// 鍒犻櫎鍦烘櫙
/// </summary>
public void DeleteScene(Scene scene,bool upSevser)
@@ -516,7 +500,7 @@
var packCode = pm.DeleteScene(scene.userSceneId);
if (packCode == StateCode.SUCCESS)
{
- FileUtils.DeleteFile(scene.savePath);
+ Common.FileUtlis.Files.DeleteFile(scene.savePath);
List.scenes.Remove(scene);
}
else
@@ -526,7 +510,7 @@
}
else
{
- FileUtils.DeleteFile(scene.savePath);
+ Common.FileUtlis.Files.DeleteFile(scene.savePath);
List.scenes.Remove(scene);
}
}
@@ -573,7 +557,12 @@
_FunctionList.fans.Remove(_FunctionList.fans.Find((obj) => obj.deviceId == delTemp.deviceId));
break;
}
- FileUtils.DeleteFile(delTemp.savePath);
+ var removeTemp = deviceFunctionList.Find((obj) => obj.deviceId == delTemp.deviceId);
+ if(removeTemp!= null)
+ {
+ deviceFunctionList.Remove(removeTemp);
+ }
+ Common.FileUtlis.Files.DeleteFile(delTemp.savePath);
}
bool lockReadFunctionStatus = false;
@@ -598,17 +587,29 @@
lockReadFunctionStatus = true;
try
{
- foreach (var function in GetAllDeviceFunctionList())
+ if (DriverLayer.Control.Ins.IsRemote)
{
- switch (function.functionCategory)
+ var functionIds = new List<string>();
+ foreach (var function in GetDeviceFunctionList())
{
- case FunctionCategory.Light:
- case FunctionCategory.Electrical:
- case FunctionCategory.SwitchDevice:
- case FunctionCategory.Curtain:
- case FunctionCategory.Thermostat:
- DriverLayer.Control.Ins.SendReadCommand(function);
- break;
+ functionIds.Add(function.deviceId);
+ }
+ DriverLayer.Control.Ins.SendApiReadCommand(functionIds);
+ }
+ else
+ {
+ foreach (var function in GetDeviceFunctionList())
+ {
+ switch (function.functionCategory)
+ {
+ case FunctionCategory.Light:
+ case FunctionCategory.Electrical:
+ case FunctionCategory.SwitchDevice:
+ case FunctionCategory.Curtain:
+ case FunctionCategory.Thermostat:
+ DriverLayer.Control.Ins.SendReadCommand(function);
+ break;
+ }
}
}
}
--
Gitblit v1.8.0