From 792ca2a402feb952ef890d653f2e049c1230baf1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:48:33 +0800
Subject: [PATCH] 1111
---
HDL_ON/Entity/FunctionList.cs | 404 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 305 insertions(+), 99 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 751fa49..2b481cb 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -4,6 +4,7 @@
using System.Threading;
using HDL_ON.DAL;
using HDL_ON.DAL.Server;
+using Shared;
namespace HDL_ON.Entity
{
@@ -97,7 +98,7 @@
/// <summary>
/// 鍔熻兘鍒楄〃
/// </summary>
- List<Function> deviceFunctionList;
+ List<Function> deviceFunctionList = new List<Function>();
/// <summary>
@@ -130,40 +131,51 @@
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;
}
}
@@ -177,21 +189,10 @@
}
}
-
- /// <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 || deviceFunctionList.Count == 0)
{
@@ -217,18 +218,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 +244,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 +287,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,35 +382,36 @@
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;)
+ if (List.GetDeviceFunctionList().Count > 0)
{
- var localFunction = List.GetAllDeviceFunctionList()[i];
- var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
- if (newFunction == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
+ for (int i = 0; i < List.GetDeviceFunctionList().Count;)
{
- List.DeleteFunction(localFunction);
- }
- else
- {
- i++;
- if (localFunction.modifyTime != newFunction.modifyTime)
+ var localFunction = List.GetDeviceFunctionList()[i];
+ if (localFunction.functionCategory == FunctionCategory.Music)
{
- localFunction.name = newFunction.name;
- localFunction.collect = newFunction.collect;
- localFunction.modifyTime = newFunction.modifyTime;
- localFunction.roomIds = newFunction.roomIds;
- localFunction.bus_Data = newFunction.bus_Data;
- localFunction.SaveFunctionData(false);
+ i++;
+ continue;
}
- deviceList.list.Remove(newFunction);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
+ var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
+ if (newFunction == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
+ {
+ List.DeleteFunction(localFunction);
+ }
+ else
+ {
+ 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;
+ localFunction.roomIds = newFunction.roomIds;
+ localFunction.bus = newFunction.bus;
+ localFunction.SaveFunctionData(false);
+ }
+ deviceList.list.Remove(newFunction);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
+ }
}
}
//澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
@@ -443,17 +446,14 @@
var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
if (sceneList != null)
{
- ////灏嗕笅杞藉埌鍒版暟鎹叏閮ㄤ繚瀛�
- //new Thread(() => {
- // foreach (var temp in sceneList)
- // {
- // temp.SaveSceneData();
- // }
- //})
- //{ IsBackground = true }.Start();
- for(int i=0;i<List.scenes.Count;)
+ 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)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
{
@@ -490,21 +490,6 @@
}
- /// <summary>
- /// 鍒犻櫎鎵嬫満瀛樺偍閮芥墍鏈夌紦瀛樺姛鑳芥暟鎹�
- /// </summary>
- public void DelAllFunctionData()
- {
- var filePathList = Common.FileUtlis.Files.ReadFiles();
- foreach (var filePath in filePathList)
- {
- if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
- {
- Common.FileUtlis.Files.DeleteFile(filePath);
- }
- }
- _FunctionList = new FunctionList();
- }
/// <summary>
/// 鍒犻櫎鍦烘櫙
/// </summary>
@@ -573,6 +558,11 @@
_FunctionList.fans.Remove(_FunctionList.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);
}
@@ -600,16 +590,24 @@
{
if (DriverLayer.Control.Ins.IsRemote)
{
- var functionIds = new List<string>();
- foreach (var function in GetAllDeviceFunctionList())
+ var page = new List<string>();
+ int count = 0;
+
+ foreach (var function in GetDeviceFunctionList())
{
- functionIds.Add(function.deviceId);
+ page.Add(function.deviceId);
+ count++;
+ if (count > 9)
+ {
+ DriverLayer.Control.Ins.SendApiReadCommand(page);
+ page.Clear();
+ }
}
- DriverLayer.Control.Ins.SendApiReadCommand(functionIds);
+ DriverLayer.Control.Ins.SendApiReadCommand(page);
}
else
{
- foreach (var function in GetAllDeviceFunctionList())
+ foreach (var function in GetDeviceFunctionList())
{
switch (function.functionCategory)
{
@@ -636,7 +634,215 @@
})
{ IsBackground = true }.Start();
}
+ #region 鍦烘櫙鐩稿叧
+ /// <summary>
+ /// 娣诲姞鍦烘櫙
+ /// </summary>
+ public string AddScene(Scene scene,out Scene result)
+ {
+ Scene tempScene = null;
+ var pm = new HttpServerRequest();
+ var revPack = pm.AddScene(scene);
+ if (revPack.Code == StateCode.SUCCESS)
+ {
+ var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
+ tempScene = sceneList.Find((obj) => obj.sid == scene.sid);
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(tempScene));
+ Common.FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
+ }
+ result = tempScene;
+ return revPack.Code;
+ }
+ #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;
+ }
+ return text;
+ }
+
+ /// <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