From 3a651923a0323ba70b59aac56975c1e40a456a84 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期二, 28 三月 2023 15:58:22 +0800
Subject: [PATCH] 增加部分萤石方法
---
HDL_ON/Entity/Function/Function.cs | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 64034ec..4b0511a 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -742,6 +742,18 @@
var sFunc = new SceneFunction();
foreach (var attr in attributes)
{
+ //绐楀笜鍚屾椂鍙戦�佸紑鍏宠窡鐧惧垎姣斾細鏈夐棶棰橈紝
+ if(spk == SPK.CurtainRoller || spk == SPK.CurtainTrietex)
+ {
+ if (attr.key == FunctionAttributeKey.OnOff)
+ {
+ if (attributes.Find((obj) => obj.key == FunctionAttributeKey.Percent) != null)
+ {
+ continue;
+ }
+ }
+ }
+
switch (attr.key)
{
case FunctionAttributeKey.OnOff:
@@ -982,6 +994,11 @@
/// 灞炴�х殑鍊煎垪琛�
/// </summary>
public List<string> value = new List<string>();
+ /// <summary>
+ /// 姝ヨ繘
+ /// 绌鸿皟娓╁害鎺у埗 0.5 1
+ /// </summary>
+ public string step = "1";
/// <summary>
/// 鏈�澶у��
/// </summary>
@@ -1358,6 +1375,10 @@
/// </summary>
public const string DoorLock = "security.door";
/// <summary>
+ /// 钀ょ煶瑙嗗睆闂ㄩ攣
+ /// </summary>
+ public const string VideoDoorLock = "security.door.ezviz";
+ /// <summary>
/// 闂ㄩ攣spk鍒楄〃
/// </summary>
/// <returns></returns>
@@ -1540,6 +1561,10 @@
/// 閫嗗彉鍣�
/// </summary>
public const string Inverter = "energy.inverter";
+ /// <summary>
+ /// 涓夌浉閫嗗彉鍣�
+ /// </summary>
+ public const string InverterRst = "energy.inverter_rst";
/// <summary>
/// 鑳芥簮妯″潡
/// </summary>
@@ -1739,7 +1764,7 @@
spkList.Add(SensorCO2);
spkList.Add(SensorTVOC);
spkList.Add(SensorHumidity);
- spkList.Add(SensorEnvironment);
+ spkList.Add(SensorEnvironment); spkList.Add(SensorEnvironmentHailin);
spkList.Add(SensorEnvironment2);
spkList.Add(SensorEnvironment3);
spkList.Add(SensorHcho);
@@ -1769,7 +1794,7 @@
public static List<string> EvironmentSensorList()
{
var spkList = new List<string>();
- spkList.Add(SensorEnvironment);
+ spkList.Add(SensorEnvironment); spkList.Add(SensorEnvironmentHailin);
spkList.Add(SensorEnvironment2);
spkList.Add(SensorEnvironment3);
return spkList;
--
Gitblit v1.8.0