From 86325cf53601d57fff61b6bf77da9c7d341a9327 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 24 八月 2023 18:15:11 +0800
Subject: [PATCH] 2023年08月24日18:14:58
---
HDL_ON/Entity/Function/Function.cs | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 557e8fa..3973493 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -867,6 +867,10 @@
foreach (var attr in list)
{
+ if(attr.key == FunctionAttributeKey.ColorfulBegin || attr.key == FunctionAttributeKey.ColorfulEnd || attr.key == FunctionAttributeKey.ColorfulTime)
+ {
+ continue;
+ }
//绐楀笜鍚屾椂鍙戦�佸紑鍏宠窡鐧惧垎姣斾細鏈夐棶棰橈紝
if(spk == SPK.CurtainRoller || spk == SPK.CurtainTrietex || spk == SPK.CurtainDream)
{
@@ -888,13 +892,13 @@
var tt = GetAttribute(FunctionAttributeKey.TempType);
if (tt == null)
{
- attr.unit = "掳";
+ attr.unit = "掳C";
}
else
{
if (tt.unit == string.Empty)
{
- attr.unit = "掳";
+ attr.unit = "掳C";
}
else
{
@@ -1697,6 +1701,11 @@
/// </summary>
public const string Ev_Ipcam = "security.ipcam.ez";
/// <summary>
+ /// 褰遍煶涓帶
+ /// </summary>
+ public const string AvZkAiks = "av.zk.aiks";
+
+ /// <summary>
/// 钀ょ煶瑙嗛闂ㄩ攣spk鍒楄〃
/// </summary>
/// <returns></returns>
@@ -1704,6 +1713,20 @@
{
var list = new List<string>();
list.Add(VideoDoorLock);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 褰遍煶涓帶spk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> GetVideoControlsSPKList()
+ {
+ var list = new List<string>
+ {
+ AvZkAiks
+ };
return list;
}
@@ -2139,6 +2162,10 @@
#region 瀹剁數
/// <summary>
+ /// 娴蜂俊鐢佃
+ /// </summary>
+ public const string ElectricalTvHisense = "electrical.tv.hisense";
+ /// <summary>
/// 瀹剁數銆佹彃搴�
/// </summary>
public const string ElectricSocket = "electrical.socket";
@@ -2255,8 +2282,8 @@
spkList.Add(ElectricTuyaWeepRobot2);
spkList.Add(ElectricTuyaWaterValve);
spkList.Add(ElectricTuyaWaterValve2);
- //spkList.Add(AirSwitch);
- //spkList.Add(AirSwitchP3);
+ spkList.Add(AirSwitch);
+ spkList.Add(ElectricalTvHisense);
return spkList;
}
--
Gitblit v1.8.0