From e63d7efbe2a41783989bdaea94d37bb6f16deb22 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期日, 06 六月 2021 16:41:19 +0800
Subject: [PATCH] 兆观传感器
---
HDL_ON/Entity/Function/Function.cs | 62 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 644e047..35baaa8 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -777,6 +777,10 @@
/// </summary>
public const string Status = "status";
/// <summary>
+ /// 姣背娉紶鎰熷櫒锛屽姩浣滅姸鎬�
+ /// </summary>
+ public const string ActionStatus = "action_state";
+ /// <summary>
/// 鐢甸噺鐘舵��
/// </summary>
public const string BatteryState = "battery_state";
@@ -941,6 +945,8 @@
public static class SPK
{
+
+
#region 鐏厜
/// <summary>
@@ -1159,6 +1165,11 @@
/// 锛堝共鎺ョ偣锛�
/// </summary>
public const string SensorDryContact = "sensor.dryContact";
+ /// <summary>
+ /// 姣背娉紶鎰熷櫒
+ /// </summary>
+ public const string SenesorMegahealth = "sensor.megahealth";
+
/// <summary>
/// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
@@ -1177,6 +1188,7 @@
spkList.Add(SensorDuiShe);
spkList.Add(SensoruUtrasonic);
spkList.Add(SensorDryContact);
+ spkList.Add(SenesorMegahealth);
return spkList;
}
#endregion
@@ -1234,29 +1246,9 @@
/// </summary>
public const string TvIr = "ir.tv";
/// <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";
+ public const string TvXmIr = "ir.tvxm";
/// <summary>
/// 瀹剁數銆侀鎵�
/// </summary>
@@ -1324,6 +1316,7 @@
spkList.Add(ElectricSocket);
spkList.Add(ElectricTV);
spkList.Add(TvIr);
+ spkList.Add(TvXmIr);
spkList.Add(ElectricFan);
spkList.Add(ClothesHanger);
spkList.Add(IrLearn);
@@ -1358,7 +1351,21 @@
}
#endregion
-
+ #region 绗笁鏂箂pk鍒楄〃
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夌涓夋柟鍝佺墝鍔熻兘鐨剆pk
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> GetAll3tySPK()
+ {
+ var spkList = new List<string>();
+ spkList.Add(ElectricTuyaAirCleaner);
+ spkList.Add(ElectricTuyaFan);
+ spkList.Add(ElectricTuyaWaterValve);
+ spkList.Add(ElectricTuyaWeepRobot);
+ spkList.Add(SenesorMegahealth);
+ return spkList;
+ }
/// <summary>
/// 鑾峰彇绗笁鏂硅澶噑pk
/// </summary>
@@ -1369,16 +1376,19 @@
switch (brandType)
{
- case BrandType.All3tyBrand:
case BrandType.Tuya:
list.Add(ElectricTuyaAirCleaner);
list.Add(ElectricTuyaFan);
list.Add(ElectricTuyaWaterValve);
list.Add(ElectricTuyaWeepRobot);
break;
+ case BrandType.All3tyBrand:
+ list.Add(SenesorMegahealth);//鍏嗚
+ break;
}
return list;
}
+ #endregion
/// <summary>
@@ -1389,6 +1399,10 @@
All = 0,
Hdl = 1,
Tuya = 2,
+ /// <summary>
+ /// 鍏嗚
+ /// </summary>
+ Megahealth = 3,
All3tyBrand = 999,
--
Gitblit v1.8.0