From 7232642ff48a7fbde2018cde652f3e771fa58025 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 27 一月 2021 14:32:55 +0800
Subject: [PATCH] 20200127-英文版处理
---
HDL_ON/Entity/FunctionList.cs | 675 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 425 insertions(+), 250 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 22da38f..71a7204 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -2,8 +2,10 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading;
+using HDL_ON.Common;
using HDL_ON.DAL;
using HDL_ON.DAL.Server;
+using Shared;
namespace HDL_ON.Entity
{
@@ -18,7 +20,7 @@
{
_FunctionList = new FunctionList();
#region 鎭㈠鏁版嵁
- var filePathList = FileUtils.ReadFiles();
+ var filePathList = Common.FileUtlis.Files.ReadFiles();
foreach (var filePath in filePathList)
{
_FunctionList.IniFunctionList(filePath);
@@ -90,14 +92,22 @@
/// </summary>
public List<Sensor> sensorsEnvironmentalScience = new List<Sensor>();
+ public List<Scene> scenes = new List<Scene>();
/// <summary>
/// 鍦烘櫙鍒楄〃
/// </summary>
- public List<Scene> scenes = new List<Scene>();
+ //public List<Scene> Scenes
+ //{
+ // get
+ // {
+ // List.scenes = List.scenes.OrderByDescending(o => o.createTime).ToList();
+ // return List.scenes;
+ // }
+ //}
/// <summary>
/// 鍔熻兘鍒楄〃
/// </summary>
- List<Function> deviceFunctionList;
+ List<Function> deviceFunctionList = new List<Function>();
/// <summary>
@@ -109,9 +119,14 @@
{
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)
+ {
+ Common.FileUtlis.Files.DeleteFile(filePath);
+ return;
+ }
if (tempFunction.DeleteSign)
{
//todo 鍒犻櫎浜戠鏁版嵁 20201203--App涓嶈兘鍒犻櫎鍔熻兘鏁版嵁
@@ -125,70 +140,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);
+ List.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);
+ List.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);
+ List.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);
+ List.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);
+ List.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);
+ List.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);
+ List.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);
+ List.fans.Add(fan);
+ deviceFunctionList.Add(fan);
break;
}
}
}
if (filePath.StartsWith("SceneData_"))
{
- var sceneDataBytes = FileUtils.ReadFile(filePath);
+ var sceneDataBytes = 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);
@@ -201,7 +216,7 @@
}
try
{
- deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
+ deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList();
}
catch (Exception ex)
{
@@ -212,18 +227,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;
+ 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;
}
/// <summary>
@@ -233,55 +249,55 @@
/// <param name="sidObj"></param>
public void AddDeviceFunction(Function sidObj0)
{
- switch (sidObj0.functionType)
+ switch (sidObj0.spk)
{
- case FunctionType.AC:
+ case SPK.AcStandard:
var sidObj = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.aCs.Add(sidObj);
- sidObj.SaveFunctionData(false);
+ List.aCs.Add(sidObj);
+ sidObj.SaveFunctionFile();
break;
- case FunctionType.FloorHeating:
+ case SPK.FloorHeatStandard:
var sidObj1 = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.floorHeatings.Add(sidObj1);
- sidObj1.SaveFunctionData(false);
+ List.floorHeatings.Add(sidObj1);
+ sidObj1.SaveFunctionFile();
break;
- case FunctionType.Dimmer:
- case FunctionType.RGB:
- case FunctionType.Relay:
+ case SPK.LightDimming:
+ case SPK.LightRGB:
+ case SPK.LightSwitch:
var sidObj2 = Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.lights.Add(sidObj2);
- sidObj2.SaveFunctionData(false);
+ List.lights.Add(sidObj2);
+ sidObj2.SaveFunctionFile();
break;
- case FunctionType.Curtain:
- case FunctionType.RollingShutter:
- case FunctionType.MotorCurtain:
+ case SPK.CurtainSwitch:
+ case SPK.CurtainRoller:
+ case SPK.CurtainTrietex:
var sidObj3 = Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.curtains.Add(sidObj3 );
- sidObj3.SaveFunctionData(false);
+ List.curtains.Add(sidObj3 );
+ sidObj3.SaveFunctionFile();
break;
- case FunctionType.TV:
+ case SPK.ElectricTV:
var sidObj4 = Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.tVs.Add(sidObj4);
- sidObj4.SaveFunctionData(false);
+ List.tVs.Add(sidObj4);
+ sidObj4.SaveFunctionFile();
break;
- case FunctionType.Socket:
+ case SPK.ElectricSocket:
var sidObj5 = Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.switchSockets.Add(sidObj5);
- sidObj5.SaveFunctionData(false);
+ List.switchSockets.Add(sidObj5);
+ sidObj5.SaveFunctionFile();
break;
- case FunctionType.Fan:
+ case SPK.ElectricFan:
var sidObj6 = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- DB_ResidenceData.functionList.fans.Add(sidObj6);
- sidObj6.SaveFunctionData(false);
+ List.fans.Add(sidObj6);
+ sidObj6.SaveFunctionFile();
break;
- case FunctionType.CO2:
- case FunctionType.TVOC:
- case FunctionType.PM25:
- case FunctionType.Temp:
- case FunctionType.Humidity:
+ 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));
- DB_ResidenceData.functionList.sensorsEnvironmentalScience.Add(sidObj7);
- sidObj7.SaveFunctionData(false);
+ List.sensorsEnvironmentalScience.Add(sidObj7);
+ sidObj7.SaveFunctionFile();
break;
}
}
@@ -295,48 +311,53 @@
var f = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(obj.ToString());
if (f == null)
return;
- switch (f.functionCategory)
+ switch (f.Spk_Prefix)
{
- case FunctionCategory.Thermostat:
- switch (f.functionType)
+ case FunctionCategory.AC:
+ switch (f.spk)
{
- case FunctionType.AC:
- _FunctionList.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(obj.ToString()));
+ case SPK.AcStandard:
+ List.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(obj.ToString()));
break;
- case FunctionType.FloorHeating:
- _FunctionList.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(obj.ToString()));
+ }
+ 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:
- _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.Electrical:
- switch(f.functionType)
+ case FunctionCategory.Electric:
+ switch(f.spk)
{
- case FunctionType.TV:
- _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(obj.ToString()));
+ case SPK.ElectricTV:
+ List.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(obj.ToString()));
break;
- case FunctionType.Socket:
- _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(obj.ToString()));
+ case SPK.ElectricSocket:
+ List.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(obj.ToString()));
break;
- case FunctionType.Fan:
- _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(obj.ToString()));
+ case SPK.ElectricFan:
+ List.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(obj.ToString()));
break;
}
break;
case FunctionCategory.Sensor:
- switch(f.functionType)
+ switch(f.spk)
{
- case FunctionType.TVOC:
- case FunctionType.CO2:
- case FunctionType.PM25:
- case FunctionType.Humidity:
- case FunctionType.Temp:
- _FunctionList.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString()));
+ 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;
}
break;
@@ -344,142 +365,26 @@
}
/// <summary>
- /// 涓嬫潵浜戠璁惧鏁版嵁
+ /// 鍔熻兘缁戝畾鎴块棿
/// </summary>
- public void DownloadFunctionList()
+ public string FunctionsBindRooms(List<string> roomIds,List<string> deviceIds)
{
- new Thread(() =>
+ var pm = new HttpServerRequest();
+ var pack = pm.BindDeviceToRoom(deviceIds, roomIds);
+ if(pack.Code == StateCode.SUCCESS)
{
- var pm = new HttpServerRequest();
- var pack = pm.GetDeviceList();
- if (pack.Code == StateCode.SUCCESS)
- {
- 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();
- foreach (var localFunction in List.GetAllDeviceFunctionList())
- {
- var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
- if (newFunction == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
- {
- List.DeleteFunction(localFunction);
- }
- else
- {
- if (localFunction.modifyTime != newFunction.modifyTime)
- {
- 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);
- }
- deviceList.list.Remove(newFunction);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
- }
- }
- //澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
- foreach (var newFunction in deviceList.list)
- {
- newFunction.SaveFunctionData(false);
- List.IniFunctionList(newFunction.savePath);
- }
- }
- MainPage.Log($"璇诲彇浜戠璁惧鏁版嵁:\r\n{ pack.Data.ToString()}");
- }
- else
- {
- MainPage.Log($"璇诲彇浜戠璁惧鏁版嵁澶辫触:\r\nCode:{pack.Code}; Msg:{pack.message}");
- }
- })
- { IsBackground = true }.Start();
- }
- /// <summary>
- /// 涓嬭浇浜戠鍦烘櫙鏁版嵁
- /// </summary>
- public void DownloadSceneList()
- {
- new Thread(() =>
- {
- var pm = new HttpServerRequest();
- var pack = pm.GetSceneList();
- if(pack.Code == StateCode.SUCCESS)
- {
- MainPage.Log($"璇诲彇浜戠鍦烘櫙鏁版嵁:\r\n{pack.Data.ToString()}");
- 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();
- foreach (var localScene in List.scenes)
- {
- var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
- if (newScene == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
- {
- List.DeleteScene(localScene,false);
- }
- else
- {
- if (localScene.modifyTime != newScene.modifyTime)
- {
- localScene.name = newScene.name;
- localScene.collect = newScene.collect;
- localScene.modifyTime = newScene.modifyTime;
- localScene.roomIds = newScene.roomIds;
- localScene.SaveSceneData(false);
- }
- sceneList.Remove(newScene);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
- }
- }
- //澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
- foreach (var newScene in sceneList)
- {
- newScene.SaveSceneData(false);
- List.scenes.Add(newScene);
- }
- }
- }
- else
- {
- MainPage.Log($"璇诲彇浜戠鍦烘櫙鏁版嵁澶辫触:\r\nCode:{pack.Code}; Msg:{pack.message}");
- }
- })
- { IsBackground = true }.Start();
- }
-
-
- /// <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();
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+ }
+ return pack.Code;
}
+
/// <summary>
/// 鍒犻櫎鍦烘櫙
+ /// todo
/// </summary>
public void DeleteScene(Scene scene,bool upSevser)
{
@@ -489,22 +394,22 @@
var packCode = pm.DeleteScene(scene.userSceneId);
if (packCode == StateCode.SUCCESS)
{
- FileUtils.DeleteFile(scene.savePath);
+ FileUtlis.Files.DeleteFile(scene.savePath);
List.scenes.Remove(scene);
}
else
{
- Utlis.ShowTip(Shared.Language.StringByID(StringId.DeleteSceneFail) + "Code:" + packCode);
+ IMessageCommon.Current.ShowErrorInfoAlter(packCode);
}
}
else
{
- FileUtils.DeleteFile(scene.savePath);
+ FileUtlis.Files.DeleteFile(scene.savePath);
List.scenes.Remove(scene);
}
}
/// <summary>
- /// 鍒犻櫎鏈湴鍔熻兘鏂囦欢
+ /// 鍒犻櫎鏈湴鍔熻兘鍙婃枃浠�
/// </summary>
public void DeleteFunction(Function delTemp)
{
@@ -515,38 +420,43 @@
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;
}
- 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;
@@ -571,17 +481,38 @@
lockReadFunctionStatus = true;
try
{
- foreach (var function in GetAllDeviceFunctionList())
+ if (DriverLayer.Control.Ins.IsRemote)
{
- switch (function.functionCategory)
+ var page = new List<string>();
+ int count = 0;
+
+ 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;
+ page.Add(function.deviceId);
+ count++;
+ if (count > 9)
+ {
+ DriverLayer.Control.Ins.SendApiReadCommand(page);
+ page.Clear();
+ count = 0;
+ }
+ }
+ DriverLayer.Control.Ins.SendApiReadCommand(page);
+ }
+ else
+ {
+ foreach (var function in GetDeviceFunctionList())
+ {
+ 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;
+ }
}
}
}
@@ -597,7 +528,251 @@
})
{ 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));
+ FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
+ result = tempScene;
+ }
+ else
+ {
+ result = tempScene;
+ }
+ return revPack.Code;
+ }
+ #endregion
+ #region 鏀惰棌鍔熻兘
+
+ /// <summary>
+ /// 鏀惰棌鍦烘櫙
+ /// </summary>
+ public string CollectScene(Scene scene)
+ {
+ var result = "";
+ if (scene.collect)
+ {
+ result = ApiUtlis.Ins.HttpRequest.CollectDevice(scene.userSceneId).Code;
+ }
+ else
+ {
+ result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(scene.userSceneId).Code;
+ }
+
+ //鎻愮ず閿欒
+ if (result != StateCode.SUCCESS)
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(result);
+ }
+
+ return result;
+ }
+
+ #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;
+ }
+
+ /// <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