From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 15 三月 2021 14:55:49 +0800
Subject: [PATCH] 合并前上传一个版本
---
HDL_ON/Entity/FunctionList.cs | 624 ++++++++++++++++++++++----------------------------------
1 files changed, 248 insertions(+), 376 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 61ba91e..845ab49 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -20,7 +20,7 @@
{
_FunctionList = new FunctionList();
#region 鎭㈠鏁版嵁
- var filePathList = Common.FileUtlis.Files.ReadFiles();
+ var filePathList = FileUtlis.Files.ReadFiles();
foreach (var filePath in filePathList)
{
_FunctionList.IniFunctionList(filePath);
@@ -30,6 +30,14 @@
return _FunctionList;
}
}
+ /// <summary>
+ /// 鍔熻兘鍒楄〃
+ /// </summary>
+ public List<Function> Functions = new List<Function>();
+
+
+
+
/// <summary>
/// 绌鸿皟鍒楄〃
@@ -67,10 +75,30 @@
{
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>();
+ }
+ if(clothesHangerList == null)
+ {
+ clothesHangerList = new List<Function>();
+ }
var list = new List<Function>();
list.AddRange(fans);
list.AddRange(switchSockets);
- list.AddRange(tVs);
+ list.AddRange(tVs);
+ list.AddRange(airCleaners);
+ list.AddRange(weepRobots);
+ list.AddRange(waterValveList);
+ list.AddRange(clothesHangerList);
return list;
}
}
@@ -85,25 +113,39 @@
/// <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>();
+ /// <summary>
+ /// 姘撮榾鍒楄〃
+ /// </summary>
+ public List<Function> waterValveList = new List<Function>();
+ /// <summary>
+ /// 鍑夐湼鍒楄〃
+ /// </summary>
+ public List<Function> clothesHangerList = new List<Function>();
+ /// <summary>
+ /// 绾㈠瀹濆垪琛�
+ /// </summary>
+ public List<Function> irModule = new List<Function>();
+
#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>
- /// 鍦烘櫙鍒楄〃
- /// </summary>
- //public List<Scene> Scenes
- //{
- // get
- // {
- // List.scenes = List.scenes.OrderByDescending(o => o.createTime).ToList();
- // return List.scenes;
- // }
- //}
/// <summary>
/// 鍔熻兘鍒楄〃
/// </summary>
@@ -117,6 +159,7 @@
/// <param name="filePath"></param>
public void IniFunctionList(string filePath)
{
+ // todo 澧炲姞璁惧锛屽鍔犲姛鑳借繘鍔熻兘鍒楄〃
if (filePath.StartsWith("FunctionData_"))
{
var functionDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
@@ -124,14 +167,9 @@
var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
if (tempFunction == null)
{
- Common.FileUtlis.Files.DeleteFile(filePath);
+ FileUtlis.Files.DeleteFile(filePath);
return;
}
- if (tempFunction.DeleteSign)
- {
- //todo 鍒犻櫎浜戠鏁版嵁 20201203--App涓嶈兘鍒犻櫎鍔熻兘鏁版嵁
- }
- else
{
switch (tempFunction.spk)
{
@@ -141,7 +179,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 +187,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 +206,61 @@
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.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.SensorDoorWindow:
+ case SPK.SensorPir:
+ var ser = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString);
+ List.sensorsArm.Add(ser);
+ deviceFunctionList.Add(ser);
+ break;
+ case SPK.ClothesHanger:
+ var ch = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
+ List.clothesHangerList.Add(ch);
+ deviceFunctionList.Add(ch);
+ break;
+ case SPK.IrModule:
+ var irm = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
+ List.irModule.Add(irm);
+ deviceFunctionList.Add(irm);
break;
}
}
@@ -201,7 +277,7 @@
/// <summary>
/// 鑾峰彇璁惧鍔熻兘鍒楄〃
/// </summary>
- public List<Function> GetDeviceFunctionList()
+ public List<Function> GetDeviceFunctionList(SPK.BrandType brandType = SPK.BrandType.All)
{
if (deviceFunctionList == null || deviceFunctionList.Count == 0)
{
@@ -212,151 +288,75 @@
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}");
+ }
}
- try
+
+ List<Function> resultFunctions = new List<Function>();
+ if (brandType == SPK.BrandType.All)
{
- deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList();
}
- catch (Exception ex)
- {
- MainPage.Log($"璁惧鍔熻兘鎺掑簭寮傚父锛歿ex.Message}");
+ else
+ {
+ switch (brandType)
+ {
+ case SPK.BrandType.Hdl:
+ foreach (var function in deviceFunctionList)
+ {
+ if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(function.spk))
+ {
+ resultFunctions.Add(function);
+ }
+ }
+ break;
+
+ case SPK.BrandType.Tuya:
+ foreach (var function in deviceFunctionList)
+ {
+ if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(function.spk))
+ {
+ resultFunctions.Add(function);
+ }
+ }
+ break;
+ }
+ return resultFunctions;
}
+
return deviceFunctionList;
}
+
/// <summary>
/// 娓呯┖璁惧鍔熻兘鍒楄〃
/// </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;
- _FunctionList = null;
- }
+ List.aCs = new List<AC>();
+ List.lights = new List<Light>();
+ List.curtains = new List<Curtain>();
+ List.floorHeatings = new List<FloorHeating>();
+ List.sensorsEnvironmentalScience = new List<Sensor>();
+ #region 瀹剁數
+ List.fans = new List<Fan>();
+ List.switchSockets = new List<SwitchSocket>();
+ List.tVs = new List<TV>();
+ List.airCleaners = new List<AirCleaner>();
+ List.weepRobots = new List<WeepRobot>();
+ List.waterValveList = new List<Function>();
+ List.clothesHangerList = new List<Function>();
+ #endregion
- /// <summary>
- /// 鎺ユ敹bus杞欢涓婁紶鐨勫姛鑳�
- /// tcp鏂瑰紡
- /// </summary>
- /// <param name="sidObj"></param>
- public void AddDeviceFunction(Function sidObj0)
- {
- switch (sidObj0.functionType)
- {
- case FunctionType.AC:
- var sidObj = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.aCs.Add(sidObj);
- sidObj.SaveFunctionFile();
- break;
- case FunctionType.FloorHeating:
- var sidObj1 = Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.floorHeatings.Add(sidObj1);
- sidObj1.SaveFunctionFile();
- break;
- case FunctionType.Dimmer:
- case FunctionType.RGB:
- case FunctionType.Relay:
- var sidObj2 = Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.lights.Add(sidObj2);
- sidObj2.SaveFunctionFile();
- break;
- case FunctionType.Curtain:
- case FunctionType.RollingShutter:
- case FunctionType.MotorCurtain:
- var sidObj3 = Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.curtains.Add(sidObj3 );
- sidObj3.SaveFunctionFile();
- break;
- case FunctionType.TV:
- var sidObj4 = Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.tVs.Add(sidObj4);
- sidObj4.SaveFunctionFile();
- break;
- case FunctionType.Socket:
- var sidObj5 = Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.switchSockets.Add(sidObj5);
- sidObj5.SaveFunctionFile();
- break;
- case FunctionType.Fan:
- var sidObj6 = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(Newtonsoft.Json.JsonConvert.SerializeObject(sidObj0));
- List.fans.Add(sidObj6);
- sidObj6.SaveFunctionFile();
- break;
- case FunctionType.CO2:
- case FunctionType.TVOC:
- case FunctionType.PM25:
- case FunctionType.Temp:
- case FunctionType.Humidity:
- 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.functionCategory)
- {
- case FunctionCategory.Thermostat:
- switch (f.functionType)
- {
- case FunctionType.AC:
- _FunctionList.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(obj.ToString()));
- break;
- case FunctionType.FloorHeating:
- _FunctionList.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(obj.ToString()));
- break;
- }
- break;
- case FunctionCategory.Light:
- _FunctionList.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(obj.ToString()));
- break;
- case FunctionCategory.Curtain:
- _FunctionList.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(obj.ToString()));
- break;
- case FunctionCategory.Electrical:
- switch(f.functionType)
- {
- case FunctionType.TV:
- _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(obj.ToString()));
- break;
- case FunctionType.Socket:
- _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(obj.ToString()));
- break;
- case FunctionType.Fan:
- _FunctionList.electricals.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(obj.ToString()));
- break;
- }
- break;
- case FunctionCategory.Sensor:
- switch(f.functionType)
- {
- 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()));
- break;
- }
- break;
- }
+ List.scenes = new List<Scene>();
+ List.deviceFunctionList = new List<Function>();
+ _FunctionList = null;
}
/// <summary>
@@ -415,35 +415,54 @@
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));
+ case SPK.ElectricTuyaFan:
+ List.fans.Remove(List.fans.Find((obj) => obj.deviceId == delTemp.deviceId));
+ break;
+ case SPK.ElectricTuyaAirCleaner:
+ List.airCleaners.Remove(List.airCleaners.Find((obj) => obj.deviceId == delTemp.deviceId));
+ break;
+ case SPK.ElectricTuyaWaterValve:
+ List.waterValveList.Remove(List.waterValveList.Find((obj) => obj.deviceId == delTemp.deviceId));
+ break;
+ case SPK.ElectricTuyaWeepRobot:
+ List.weepRobots.Remove(List.weepRobots.Find((obj) => obj.deviceId == delTemp.deviceId));
+ break;
+ case SPK.ClothesHanger:
+ List.clothesHangerList.Remove(List.clothesHangerList.Find((obj) => obj.deviceId == delTemp.deviceId));
+ break;
+ case SPK.SensorSmoke:
+ case SPK.SensorWater:
+ case SPK.SensorDoorWindow:
+ case SPK.SensorPir:
+ List.sensorsArm.Remove(List.sensorsArm.Find((obj)=>obj.deviceId == delTemp.deviceId));
break;
}
var removeTemp = deviceFunctionList.Find((obj) => obj.deviceId == delTemp.deviceId);
@@ -455,6 +474,33 @@
}
bool lockReadFunctionStatus = false;
+
+ /// <summary>
+ /// 璇诲彇绗笁鏂硅澶囩姸鎬�
+ /// </summary>
+ public void Read3tyFunctionStatus()
+ {
+ //璇诲彇娑傞甫璁惧鐘舵��
+ if (GetDeviceFunctionList(SPK.BrandType.Tuya).Count > 0)
+ {
+ var page = new List<string>();
+ int count = 0;
+ foreach (var function in GetDeviceFunctionList(SPK.BrandType.Tuya))
+ {
+ page.Add(function.deviceId);
+ count++;
+ if (count > 9)
+ {
+ DriverLayer.Control.Ins.ReadFunctionsInfo(page);
+ page.Clear();
+ count = 0;
+ }
+ }
+ DriverLayer.Control.Ins.ReadFunctionsInfo(page);
+ }
+
+ }
+
/// <summary>
/// 璇诲彇鍏ㄩ儴鍔熻兘鐨勭姸鎬�
/// </summary>
@@ -476,12 +522,38 @@
lockReadFunctionStatus = true;
try
{
- if (DriverLayer.Control.Ins.IsRemote)
+ Read3tyFunctionStatus();
+
+ 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;
- foreach (var function in GetDeviceFunctionList())
+ foreach (var function in GetDeviceFunctionList(SPK.BrandType.Hdl))
{
page.Add(function.deviceId);
count++;
@@ -494,22 +566,6 @@
}
DriverLayer.Control.Ins.SendApiReadCommand(page);
}
- 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;
- }
- }
- }
}
catch (Exception ex)
{
@@ -520,6 +576,8 @@
lockReadFunctionStatus = false;
MainPage.Log($"缁撴潫--璇诲彇");
}
+
+
})
{ IsBackground = true }.Start();
}
@@ -577,195 +635,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