From f703a411c0ebdf7ada490fda75b52fd839dae079 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 14:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-cqy（1.5.9）' into dev--wxr
---
HDL_ON/Entity/Function/Function.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 87f8863..dc0d526 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -523,6 +523,14 @@
SetAttrState(sta.key, sta.value);
}
}
+ /// <summary>
+ /// 鍔熻兘鍒楄〃鎺掑簭
+ /// </summary>
+ public int FunctionOrderNumber = 9999;
+ /// <summary>
+ /// 鎴块棿鍒楄〃鎺掑簭
+ /// </summary>
+ public int RoomOrderNumber = 9999;
/// <summary>
@@ -742,6 +750,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:
@@ -1748,7 +1768,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);
@@ -1778,7 +1798,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