From 8e54c77b6e0d2d87cdbad1a81a75d39bab1648d6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 16 十月 2023 10:08:47 +0800
Subject: [PATCH] 场景闪退修复
---
OnPro/HDL_ON/Entity/Function/Function.cs | 749 ---------------------------------------------------------
1 files changed, 6 insertions(+), 743 deletions(-)
diff --git a/OnPro/HDL_ON/Entity/Function/Function.cs b/OnPro/HDL_ON/Entity/Function/Function.cs
index 7f37cae..64c2f7e 100644
--- a/OnPro/HDL_ON/Entity/Function/Function.cs
+++ b/OnPro/HDL_ON/Entity/Function/Function.cs
@@ -171,18 +171,6 @@
string iconPath = spk.Replace(".", "");
switch (spk)
{
- case SPK.AirSwitchP3:
- iconPath = "electricalbreaker";
- break;
- case SPK.PanelSocket:
- iconPath = "electricalsocket";
- break;
- case SPK.SenesorMegahealth2:
- iconPath = "sensormegahealth";
- break;
- case SPK.SensorEnvironmentHailin:
- iconPath = "sensorenvironment";
- break;
case SPK.HvacAirFresh:
iconPath = "airFreshstandard";
break;
@@ -192,26 +180,8 @@
case SPK.HvacAC:
iconPath = "acstandard";
break;
- case SPK.HvacFan:
- iconPath = "electricalfan";
- break;
case SPK.HvacFloorHeat:
iconPath = "floorHeatstandard";
- break;
- case SPK.ElectricTuyaFan2:
- iconPath = "electricaltyqborgovyzytytz";
- break;
- case SPK.ElectricTuyaAirCleaner2:
- iconPath = "electricalQ1RsefNf91tIXyyQ";
- break;
- case SPK.ElectricTuyaWaterValve2:
- iconPath = "electricalkoiGhMKwLf2ZP81g";
- break;
- case SPK.ElectricTuyaWeepRobot2:
- iconPath = "electricalai6HtccKFIw3dxo3";
- break;
- case SPK.AvMusic:
- iconPath = "musicstandard";
break;
}
@@ -349,26 +319,6 @@
}
- //string spk_Prefix;
- ///// <summary>
- ///// spk鍓嶇紑
- ///// 澶х被
- ///// 鍔熻兘绫诲埆
- ///// 濡傦細绌鸿皟绫汇�佺伅鍏夌被銆佺獥甯樼被
- ///// </summary>
- //public string Spk_Prefix
- //{
- // get
- // {
- // if (string.IsNullOrEmpty(spk_Prefix))
- // {
- // spk_Prefix = spk.Split(".")[0];
- // }
- // return spk_Prefix;
- // }
- //}
-
-
/// <summary>
/// A鍗忚鍔熻兘鐨勭壒鎬�
/// 濡傦細鏄疉C鍔熻兘锛氱壒鎬э細on_off,mode,fan,temperature
@@ -378,34 +328,7 @@
public List<FunctionAttributes> GetFunctionAttributes()
{
- if (spk == SPK.GroupControl)
- {
- var list = new List<FunctionAttributes>();
- var gc = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
- if (gc != null)
- {
- foreach (var temp in gc.sids)
- {
- var light = FunctionList.List.GetLightList().Find((obj) => obj.sid == temp.sid);
- if (light != null)
- {
- foreach (var attr in light.attributes)
- {
- if (list.Find((obj) => obj.key == attr.key) == null)
- {
- list.Add(attr);
- }
- }
- }
- }
- }
-
- return list;
- }
- else
- {
- return attributes;
- }
+ return attributes;
}
@@ -444,54 +367,6 @@
/// 鏄惁鏀惰棌
/// </summary>
public bool collect = false;
-
- private bool _online;
- public bool online {
- get
- {
- if (spk == SPK.AirSwitchP3)
- {
- return _online;
- }
- return true;
- }
- set
- {
- _online = value;
- }
- }
- ///// <summary>
- ///// 鏄惁鍦ㄧ嚎
- ///// </summary>
- //public bool online
- //{
- // get
- // {
- // if(spk == SPK.AirSwitchP3)
- // {
- // return _online;
- // }
- // return true;
- // }
- // set
- // {
- // _online = value;
- // }
- //}
-
- public bool isOnline()
- {
- if (spk == SPK.AirSwitchP3)
- {
- return online;
- }
- return true;
- }
-
- public void setOnine(bool isOnline)
- {
- online = isOnline;
- }
/// <summary>
/// 鐜闈㈡澘 缁戝畾鐨� 璁惧鐩爣sid鍒楄〃
@@ -533,22 +408,6 @@
public string GetLastStateText()
{
var text = "";
- switch (spk)
- {
- case SPK.HvacCac:
- switch (GetAttrState(FunctionAttributeKey.Mode))
- {
- case "cool":
- text = Language.StringByID(StringId.Cool);
- break;
- case "heat":
- text = Language.StringByID(StringId.Heat);
- break;
- }
-
- break;
-
- }
return text;
}
@@ -633,27 +492,13 @@
new System.Threading.Thread(() =>
{
- if (spk == SPK.GroupControl) {
- var groupControl = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
- if (collect)
- {
- result = ApiUtlis.Ins.HttpRequest.CollectGroupControl(groupControl.userDeviceGroupControlId).Code;
- }
- else
- {
- result = ApiUtlis.Ins.HttpRequest.CancelCollectGroupControl(groupControl.userDeviceGroupControlId).Code;
- }
+ if (collect)
+ {
+ result = ApiUtlis.Ins.HttpRequest.CollectDevice(deviceId).Code;
}
else
{
- if (collect)
- {
- result = ApiUtlis.Ins.HttpRequest.CollectDevice(deviceId).Code;
- }
- else
- {
- result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(deviceId).Code;
- }
+ result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(deviceId).Code;
}
//鎻愮ず閿欒
if (result != StateCode.SUCCESS)
@@ -836,39 +681,12 @@
var sFunc = new SceneFunction();
var list = new List<FunctionAttributes>();
- if (spk == SPK.GroupControl)
- {
- lock (list)
- {
- var gc = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
- if (gc != null)
- {
- foreach (var temp in gc.sids)
- {
- var tempDevice = FunctionList.List.GetLightList().Find((obj) => obj.sid == temp.sid);
- if (tempDevice != null)
- {
- foreach (var attr in tempDevice.attributes)
- {
- if (list.Find((obj) => obj.key == attr.key) == null)
- {
- list.Add(attr);
- }
- }
- }
- }
- }
- }
- }
- else
- {
list.AddRange(attributes);
- }
foreach (var attr in list)
{
//绐楀笜鍚屾椂鍙戦�佸紑鍏宠窡鐧惧垎姣斾細鏈夐棶棰橈紝
- if(spk == SPK.CurtainRoller || spk == SPK.CurtainTrietex || spk == SPK.CurtainDream)
+ if (spk == SPK.CurtainRoller || spk == SPK.CurtainTrietex || spk == SPK.CurtainDream)
{
if (attr.key == FunctionAttributeKey.OnOff)
{
@@ -877,9 +695,6 @@
continue;
}
}
- }else if (spk == SPK.GroupControl)
- {
- sFunc.type = "5";
}
switch (attr.key)
@@ -1631,93 +1446,6 @@
/// </summary>
public static class SPK
{
- /// <summary>
- /// 缇ゆ帶锛堣嚜瀹氫箟锛�
- /// </summary>
- public const string GroupControl = "groupControl";
- /// <summary>
- /// 閫氱敤寮�鍏�
- /// </summary>
- public const string OtherCommon = "other.common";
- /// <summary>
- /// 搴忓垪
- /// </summary>
- public const string CommonSeries = "other.series";
- /// <summary>
- /// 澶у崕鎽勫儚澶�
- /// </summary>
- public const string IpCam_Imou = "security.ipcam.imou";
- /// <summary>
- /// 鏈烘鎵�
- /// </summary>
- public const string MechanicalArm = "electrical.mechanical_arm";
- /// <summary>
- /// 绌鸿皟绉戞妧绯荤粺锛堢豢寤猴級
- /// 鎬绘帶
- /// </summary>
- public const string AcstParent = "acst.parent";
- /// <summary>
- /// 绌鸿皟绉戞妧绯荤粺锛堢豢寤猴級
- /// 瀛愭帶
- /// </summary>
- public const string AcstSub = "acst.sub";
-
- /// <summary>
- /// 闂ㄩ攣
- /// </summary>
- public const string DoorLock = "security.door";
-
- /// <summary>
- /// 闂ㄩ攣spk鍒楄〃
- /// </summary>
- /// <returns></returns>
- public static List<string> GetDoorLockSPKList()
- {
- var list = new List<string>();
- list.Add(DoorLock);
- return list;
- }
-
-
- /// <summary>
- /// 鐚溂(鏃pk)
- /// </summary>
- public const string Peephole = "peephole";
-
- /// <summary>
- /// 鐚溂(鏂皊pk 鏆傛椂娌＄敤)
- /// </summary>
- //public const string PeepholeEz = "security.peephole.ez";
- /// <summary>
- /// 钀ょ煶瑙嗛闂ㄩ攣
- /// </summary>
- public const string VideoDoorLock="security.door.ezviz";
- /// <summary>
- /// 钀ょ煶鎽勫儚澶�
- /// </summary>
- public const string Ev_Ipcam = "security.ipcam.ez";
- /// <summary>
- /// 钀ょ煶瑙嗛闂ㄩ攣spk鍒楄〃
- /// </summary>
- /// <returns></returns>
- public static List<string> GetVideoDoorLockSPKList()
- {
- var list = new List<string>();
- list.Add(VideoDoorLock);
- return list;
- }
-
- /// <summary>
- /// 钀ょ煶鎽勫儚澶磗pk鍒楄〃
- /// </summary>
- /// <returns></returns>
- public static List<string> GetEvIpcamSPKList()
- {
- var list = new List<string>();
- list.Add(Ev_Ipcam);
- return list;
- }
-
#region 鐏厜
/// <summary>
/// 锛堝紑鍏崇伅锛�
@@ -1807,10 +1535,6 @@
/// 绌鸿皟
/// </summary>
public const string HvacAC = "hvac.ac";
- /// <summary>
- /// 姣涚粏绠＄┖璋�
- /// </summaryc
- public const string HvacCac = "hvac.cac";
/// <summary>
/// 绌鸿皟spk鍒楄〃
@@ -1822,7 +1546,6 @@
spkList.Add(AcStandard);
spkList.Add(HvacAC);
spkList.Add(AcIr);
- spkList.Add(HvacCac);
return spkList;
}
#endregion
@@ -1883,466 +1606,6 @@
}
#endregion
- #region 鑳芥簮
- /// <summary>
- /// 閫嗗彉鍣�
- /// </summary>
- public const string Inverter = "energy.inverter";
- /// <summary>
- /// 涓夌浉閫嗗彉鍣�
- /// </summary>
- public const string InverterRst = "energy.inverter_rst";
- /// <summary>
- /// 鑳芥簮妯″潡
- /// </summary>
- public const string EnergyStandard = "energy.standard";
-
- /// <summary>
- /// 鑳芥簮-鐢佃兘
- /// </summary>
- public const string ElectricEnergy = "energy.electric";
- /// <summary>
- /// 鑳芥簮spk鍒楄〃
- /// </summary>
- /// <returns></returns>
- public static List<string> EnergySpkList()
- {
- var spkList = new List<string>();
- spkList.Add(ElectricEnergy);
- spkList.Add(AirSwitch);
- spkList.Add(AirSwitchP3);
- return spkList;
- }
- #endregion
-
- #region 闊充箰
- /// <summary>
- /// 锛堥煶涔愶級
- /// </summary>
- public const string MusicStandard = "music.standard";
- /// <summary>
- /// 闊充箰
- /// </summary>
- public const string AvMusic = "av.music";
-
- /// <summary>
- /// 闊充箰spk鍒楄〃
- /// </summary>
- /// <returns></returns>
- public static List<string> MusicSpkList()
- {
- var spkList = new List<string>();
- spkList.Add(MusicStandard);
- spkList.Add(AvMusic);
- return spkList;
- }
- #endregion
-
- #region 浼犳劅鍣�
-
- #region 瀹夐槻浼犳劅鍣�
- /// <summary>
- /// 锛堜寒搴︿紶鎰熷櫒锛�
- /// </summary>
- public const string SensorLight = "sensor.light";
- /// <summary>
- /// (绾㈠绉诲姩浼犳劅鍣�)
- /// </summary>
- public const string SensorPir = "sensor.pir";
- /// <summary>
- /// 浜轰綋瀛樺湪浼犳劅鍣�
- /// </summary>
- public const string SensorPirHold = "sensor.pir_hold";
- /// <summary>
- /// 锛堥棬绐椾紶鎰熷櫒锛�
- /// </summary>
- public const string SensorDoorWindow = "sensor.doorwindow";
- /// <summary>
- /// 鐑熼浘浼犳劅鍣�
- /// </summary>
- public const string SensorSmoke = "sensor.smoke";
- /// <summary>
- /// 姘存蹈浼犳劅鍣�
- /// </summary>
- public const string SensorWater = "sensor.water";
- /// <summary>
- /// 鐕冩皵浼犳劅鍣�
- /// </summary>
- public const string SensorGas = "sensor.gas";
- /// <summary>
- /// 绾㈠鐝婃爮浼犳劅鍣�
- /// </summary>
- public const string SensorShanLan = "sensor.shanlan";
- /// <summary>
- /// 绾㈠瀵瑰皠浼犳劅鍣�
- /// </summary>
- public const string SensorDuiShe = "sensor.duishe";
- /// <summary>
- /// 瓒呭０娉紶鎰熷櫒
- /// </summary>
- public const string SensorUtrasonic = "sensor.ultrasonic";
- /// <summary>
- /// 锛堝共鎺ョ偣锛�
- /// </summary>
- public const string SensorDryContact = "sensor.dryContact";
- public const string SensorDryContact2 = "dryContact.standard";
- /// <summary>
- /// 姣背娉紶鎰熷櫒
- /// </summary>
- public const string SenesorMegahealth = "sensor.megahealth";
- public const string SenesorMegahealth2 = "sensor.megahealth.zg";
- /// <summary>
- /// 姣背娉紶鎰熷櫒锛堝Э鎬佺増锛�
- /// </summary>
- public const string SensorMmvPose = "sensor.mmv_pose";
- /// <summary>
- /// 绱ф�ュ懠鍙�
- /// </summary>
- public const string SensorHelp = "sensor.help";
- /// <summary>
- /// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
- /// </summary>
- /// <returns></returns>
- public static List<string> ArmSensorSpkList()
- {
- var spkList = new List<string>();
- //spkList.Add(SensorLight);
- spkList.Add(SensorPir);
- spkList.Add(SensorPirHold);
- spkList.Add(SensorHelp);
- spkList.Add(SensorDoorWindow);
- spkList.Add(SensorSmoke);
- spkList.Add(SensorWater);
- spkList.Add(SensorGas);
- //spkList.Add(SensorShanLan);
- //spkList.Add(SensorDuiShe);
- //spkList.Add(SensoruUtrasonic);
- spkList.Add(SensorDryContact);
- spkList.Add(SensorDryContact2);
- spkList.Add(SenesorMegahealth);
- spkList.Add(SenesorMegahealth2);
- spkList.Add(SensorMmvPose);
- return spkList;
- }
- #endregion
-
- public const string PanelEnvironment = "screen.panel";
- /// <summary>
- /// 闈㈡澘spk鍒楄〃
- /// </summary>
- /// <returns></returns>
- public static List<string> PanelSpkList()
- {
- var spkList = new List<string>();
- spkList.Add(SensorHelp);
- spkList.Add(PanelEnvironment);
- return spkList;
- }
-
- #region 鐜浼犳劅鍣�
- /// <summary>
- /// 锛圥M10浼犳劅鍣級
- /// </summary>
- public const string SensorPm10 = "sensor.pm10";
- /// <summary>
- /// 锛堟俯搴︿紶鎰熷櫒锛�
- /// </summary>
- public const string SensorTemperature = "sensor.temperature";
- /// <summary>
- /// 锛圥M2.5浼犳劅鍣級
- /// </summary>
- public const string SensorPm25 = "sensor.pm25";
- /// <summary>
- /// co2浼犳劅鍣�
- /// </summary>
- public const string SensorCO2 = "sensor.co2";
- /// <summary>
- /// tvoc浼犳劅鍣�
- /// </summary>
- public const string SensorTVOC = "sensor.tvoc";
- /// <summary>
- /// 婀垮害浼犳劅鍣�
- /// </summary>
- public const string SensorHumidity = "sensor.humidity";
- /// <summary>
- /// 鐜浼犳劅鍣�
- /// 鐜妫�娴嬩紶鎰熷櫒
- /// 鐗规畩绫籹pk
- /// 璇pk鍔熻兘鏄幆澧冧紶鎰熷櫒鍔熻兘鐨勯泦鎴�
- /// </summary>
- public const string SensorEnvironment = "sensor.environment";
- /// <summary>
- /// 闈掕悕鐜浼犳劅鍣�
- /// </summary>
- public const string SensorEnvironment2 = "sensor.environment2";
- /// <summary>
- /// 闈掕悕鐜浼犳劅鍣�
- /// </summary>
- public const string SensorEnvironment3 = "sensor.environment3";
- public const string SensorEnvironmentHailin = "sensor.environment.hailin";
- /// <summary>
- /// 鐢查啗
- /// </summary>
- public const string SensorHcho = "sensor.hcho";
-
- /// <summary>
- /// 鐜浼犳劅鍣ㄨ澶噑pk鍒楄〃
- /// </summary>
- /// <returns></returns>
- public static List<string> EnvironDeviceSpkList()
- {
- var spkList = new List<string>();
- spkList.Add(SensorTemperature);
- spkList.Add(SensorPm10);
- spkList.Add(SensorPm25);
- spkList.Add(SensorCO2);
- spkList.Add(SensorTVOC);
- spkList.Add(SensorHumidity);
- spkList.Add(SensorEnvironment); spkList.Add(SensorEnvironmentHailin);
- spkList.Add(SensorEnvironment2);
- spkList.Add(SensorEnvironment3);
- spkList.Add(SensorHcho);
- return spkList;
- }
- /// <summary>
- /// 鐜浼犳劅鍣╯pk鍒楄〃
- /// </summary>
- /// <returns></returns>
- public static List<string> EnvironSpkList()
- {
- var spkList = new List<string>();
- spkList.Add(SensorTemperature);
- spkList.Add(SensorPm10);
- spkList.Add(SensorPm25);
- spkList.Add(SensorCO2);
- spkList.Add(SensorTVOC);
- spkList.Add(SensorHumidity);
- spkList.Add(SensorHcho);
- return spkList;
- }
-
- /// <summary>
- /// 鐜浼犳劅鍣ㄨ澶囧垪琛�
- /// </summary>
- /// <returns></returns>
- public static List<string> EvironmentSensorList()
- {
- var spkList = new List<string>();
- spkList.Add(SensorEnvironment); spkList.Add(SensorEnvironmentHailin);
- spkList.Add(SensorEnvironment2);
- spkList.Add(SensorEnvironment3);
- return spkList;
- }
-
- #endregion
- #endregion
-
- #region 瀹剁數
- /// <summary>
- /// 瀹剁數銆佹彃搴�
- /// </summary>
- public const string ElectricSocket = "electrical.socket";
- /// <summary>
- /// 闈㈡澘銆佹彃搴с�侀潰鏉�
- /// </summary>
- public const string PanelSocket = "panel.socket";
- /// <summary>
- /// 瀹剁數銆佺數瑙�
- /// </summary>
- public const string ElectricTV = "electrical.tv";
- /// <summary>
- /// 绾㈠銆佺數瑙�
- /// </summary>
- public const string TvIr = "ir.tv";
- /// <summary>
- /// 绾㈠銆佸皬绫崇數瑙�
- /// </summary>
- public const string TvXmIr = "ir.tvxm";
- /// <summary>
- /// 瀹剁數銆侀鎵�
- /// </summary>
- public const string ElectricFan = "electrical.fan";
- public const string HvacFan = "hvac.fan";
- /// <summary>
- /// 鍑夐湼
- /// </summary>
- public const string ClothesHanger = "electrical.racks";
- /// <summary>
- /// 绾㈠閬ユ帶鍣�
- /// </summary>
- public const string IrLearn = "ir.learn";
- /// <summary>
- /// 绾㈠鎶曞奖浠�
- /// </summary>
- public const string PjtIr = "ir.pjt";
- /// <summary>
- /// 绾㈠鏈洪《鐩�
- /// </summary>
- public const string StbIr = "ir.stb";
- /// <summary>
- /// 绾㈠褰辩鏈�
- /// </summary>
- public const string DvDIr = "ir.dvd";
- /// <summary>
- /// 绾㈠绌烘皵鍑�鍖栧櫒
- /// </summary>
- public const string PurifierIr = "ir.air_purifier";
- /// <summary>
- /// 绾㈠鐑按鍣�
- /// </summary>
- public const string HeaterIr = " ir.water_heater";
- /// <summary>
- /// 绾㈠椋庢墖
- /// </summary>
- public const string FanIr = "ir.fan";
- /// <summary>
- /// 鏅鸿兘绌哄紑
- /// </summary>
- public const string AirSwitch = "electrical.breaker";
- /// <summary>
- /// 涓夌浉鏅鸿兘绌哄紑
- /// </summary>
- public const string AirSwitchP3 = "electrical.breakerP3";
-
- #region 娑傞甫
- /// <summary>
- /// 瀹剁數銆佹秱楦︾┖姘斿噣鍖栧櫒
- /// </summary>
- public const string ElectricTuyaAirCleaner = "electrical.Q1RsefNf91tIXyyQ";
- public const string ElectricTuyaAirCleaner2 = "hvac.air.tuya_epi345";
- /// <summary>
- /// 瀹剁數銆佹秱楦︾數椋庢墖
- /// </summary>
- public const string ElectricTuyaFan = "electrical.tyqborgovyzytytz";
- public const string ElectricTuyaFan2 = "hvac.fan.tuya_ef101";
- /// <summary>
- /// 瀹剁數銆佹秱楦︽壂鍦版満鍣ㄤ汉
- /// </summary>
- public const string ElectricTuyaWeepRobot = "electrical.ai6HtccKFIw3dxo3";
- public const string ElectricTuyaWeepRobot2 = "electrical.sweep.tuya";
- /// <summary>
- /// 瀹剁數銆佹秱楦︽按闃�
- /// </summary>
- public const string ElectricTuyaWaterValve = "electrical.koiGhMKwLf2ZP81g";
- public const string ElectricTuyaWaterValve2 = "electrical.watervalve.tuya_aw713";
- #endregion
-
-
- /// <summary>
- /// 瀹剁數spk鍒楄〃
- /// </summary>
- /// <returns></returns>
- public static List<string> ElectricalSpkList()
- {
- var spkList = new List<string>();
- spkList.Add(ElectricSocket);
- spkList.Add(PanelSocket);
- spkList.Add(ElectricTV);
- spkList.Add(TvIr);
- spkList.Add(TvXmIr);
- spkList.Add(ElectricFan);
- spkList.Add(HvacFan);
- spkList.Add(FanIr);
- spkList.Add(ClothesHanger);
- spkList.Add(IrLearn);
- spkList.Add(PjtIr);
- spkList.Add(StbIr);
- spkList.Add(ElectricTuyaAirCleaner);
- spkList.Add(ElectricTuyaAirCleaner2);
- spkList.Add(ElectricTuyaFan);
- spkList.Add(ElectricTuyaFan2);
- spkList.Add(ElectricTuyaWeepRobot);
- spkList.Add(ElectricTuyaWeepRobot2);
- spkList.Add(ElectricTuyaWaterValve);
- spkList.Add(ElectricTuyaWaterValve2);
- //spkList.Add(AirSwitch);
- //spkList.Add(AirSwitchP3);
- return spkList;
- }
-
-
- #endregion
-
- #region 璁惧绫�
- /// <summary>
- /// 绾㈠瀹�
- /// </summary>
- public const string IrModule = "ir.module";
-
- /// <summary>
- /// 璁惧绫籹pk鍒楄〃
- /// </summary>
- /// <returns></returns>
- public static List<string> DeviceSpkList()
- {
- var spkList = new List<string>();
- spkList.Add(IrModule);
- return spkList;
- }
- #endregion
-
- #region 鍙瀵硅
- /// <summary>
- /// HDL鍙瀵硅
- /// </summary>
- public const string doorgate="door.gate";
- #endregion
-
- #region 绗笁鏂箂pk鍒楄〃
- /// <summary>
- /// 鑾峰彇鎵�鏈夌涓夋柟鍝佺墝鍔熻兘鐨剆pk
- /// </summary>
- /// <returns></returns>
- public static List<string> GetAll3tySPK()
- {
- var spkList = new List<string>();
- spkList.Add(ElectricTuyaAirCleaner);
- spkList.Add(ElectricTuyaAirCleaner2);
- spkList.Add(ElectricTuyaFan);
- spkList.Add(ElectricTuyaFan2);
- spkList.Add(ElectricTuyaWaterValve);
- spkList.Add(ElectricTuyaWaterValve2);
- spkList.Add(ElectricTuyaWeepRobot);
- spkList.Add(ElectricTuyaWeepRobot2);
- spkList.Add(SensorMmvPose);
- spkList.Add(SenesorMegahealth);
- spkList.Add(SenesorMegahealth2);
- return spkList;
- }
- /// <summary>
- /// 鑾峰彇绗笁鏂硅澶噑pk
- /// </summary>
- /// <returns></returns>
- public static List<string> Get3tySpk(BrandType brandType)
- {
- var list = new List<string>();
-
- switch (brandType)
- {
- case BrandType.Tuya:
- list.Add(ElectricTuyaAirCleaner);
- list.Add(ElectricTuyaFan);
- list.Add(ElectricTuyaWaterValve);
- list.Add(ElectricTuyaWeepRobot);
- list.Add(ElectricTuyaAirCleaner2);
- list.Add(ElectricTuyaFan2);
- list.Add(ElectricTuyaWaterValve2);
- list.Add(ElectricTuyaWeepRobot2);
- break;
- case BrandType.All3tyBrand:
- list.Add(SenesorMegahealth2);//鍏嗚
- break;
- }
- return list;
- }
- #endregion
-
- /// <summary>
- /// 娌℃湁鐘舵�佹樉绀虹殑鍔熻兘spk鍒楄〃
- /// </summary>
- public static List<string> NotStatusSpkList = new List<string> {
- ElectricTV, FanIr, TvIr, TvXmIr, StbIr, PjtIr, IrLearn
- };
/// <summary>
/// 绗笁鏂瑰搧鐗屽垪琛�
--
Gitblit v1.8.0