From 34cac3d14e5243c2388b54da02f5aebeec555da8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:39:49 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr6
---
HDL_ON/Entity/Function/Function.cs | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index c0b0bea..dee04dc 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -945,6 +945,8 @@
public static class SPK
{
+
+
#region 鐏厜
/// <summary>
@@ -1348,7 +1350,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>
@@ -1359,16 +1375,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>
@@ -1379,6 +1398,10 @@
All = 0,
Hdl = 1,
Tuya = 2,
+ /// <summary>
+ /// 鍏嗚
+ /// </summary>
+ Megahealth = 3,
All3tyBrand = 999,
--
Gitblit v1.8.0