From 03b344bc7ea98aa6018a6cc11c0641594898a6e7 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 10 四月 2023 18:08:52 +0800
Subject: [PATCH] 2023年04月10日18:08:23
---
HDL_ON/Entity/Function/Function.cs | 95 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index c281816..96d30fd 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -273,6 +273,14 @@
/// </summary>
public string deviceId = "0";
/// <summary>
+ /// 绗笁鏂硅澶囨墿灞昳d
+ /// </summary>
+ public string extDevId = string.Empty;
+ /// <summary>
+ /// 鐗╃悊璁惧(妯″潡)鍨嬪彿
+ /// </summary>
+ public string omodel =string.Empty;
+ /// <summary>
/// 璁惧spk
/// </summary>
public string spk = "";
@@ -519,6 +527,14 @@
SetAttrState(sta.key, sta.value);
}
}
+ /// <summary>
+ /// 鍔熻兘鍒楄〃鎺掑簭
+ /// </summary>
+ public int FunctionOrderNumber = 9999;
+ /// <summary>
+ /// 鎴块棿鍒楄〃鎺掑簭
+ /// </summary>
+ public int RoomOrderNumber = 9999;
/// <summary>
@@ -738,6 +754,18 @@
var sFunc = new SceneFunction();
foreach (var attr in attributes)
{
+ //绐楀笜鍚屾椂鍙戦�佸紑鍏宠窡鐧惧垎姣斾細鏈夐棶棰橈紝
+ if(spk == SPK.CurtainRoller || spk == SPK.CurtainTrietex || spk == SPK.CurtainDream)
+ {
+ if (attr.key == FunctionAttributeKey.OnOff)
+ {
+ if (attributes.Find((obj) => obj.key == FunctionAttributeKey.Percent) != null)
+ {
+ continue;
+ }
+ }
+ }
+
switch (attr.key)
{
case FunctionAttributeKey.OnOff:
@@ -749,6 +777,7 @@
case FunctionAttributeKey.CCT:
case FunctionAttributeKey.RGB:
case FunctionAttributeKey.Angle:
+ case "security":
//case FunctionAttributeKey.FadeTime:
if (attr.curValue.ToString() == "{}")
{
@@ -773,6 +802,10 @@
attr.curValue = "day";
}
}
+ }
+ else if(attr.key == "security")
+ {
+ attr.curValue = "false";
}
else
{
@@ -974,6 +1007,11 @@
/// </summary>
public List<string> value = new List<string>();
/// <summary>
+ /// 姝ヨ繘
+ /// 绌鸿皟娓╁害鎺у埗 0.5 1
+ /// </summary>
+ public string step = "1";
+ /// <summary>
/// 鏈�澶у��
/// </summary>
public int max = 100;
@@ -1001,6 +1039,10 @@
public static class FunctionAttributeKey
{
public const string _null = "";
+ /// <summary>
+ /// 瀹夐槻甯冮槻鐘舵��
+ /// </summary>
+ public const string Security = "security";
/// <summary>
/// 寮�鍏�
/// </summary>
@@ -1322,20 +1364,13 @@
/// </summary>
public const string OtherCommon = "other.common";
/// <summary>
- /// 鏈烘鎵嬨�佹満姊拌噦
+ /// 澶у崕鎽勫儚澶�
+ /// </summary>
+ public const string IpCam_Imou = "security.ipcam.imou";
+ /// <summary>
+ /// 鏈烘鎵�
/// </summary>
public const string MechanicalArm = "electrical.mechanical_arm";
- /// <summary>
- /// 鏈烘鎵媠pk鍒楄〃
- /// </summary>
- /// <returns></returns>
- public static List<string> GetMechanicalArmList()
- {
- var list = new List<string>();
- list.Add(MechanicalArm);
- return list;
- }
-
/// <summary>
/// 绌鸿皟绉戞妧绯荤粺锛堢豢寤猴級
/// 鎬绘帶
@@ -1351,6 +1386,7 @@
/// 闂ㄩ攣
/// </summary>
public const string DoorLock = "security.door";
+
/// <summary>
/// 闂ㄩ攣spk鍒楄〃
/// </summary>
@@ -1361,8 +1397,25 @@
list.Add(DoorLock);
return list;
}
-
-
+
+ /// <summary>
+ /// 鐚溂
+ /// </summary>
+ public const string Peephole = "peephole";
+ /// <summary>
+ /// 钀ょ煶瑙嗛闂ㄩ攣
+ /// </summary>
+ public const string VideoDoorLock="security.door.ezviz";
+ /// <summary>
+ /// 钀ょ煶瑙嗛闂ㄩ攣spk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> GetVideoDoorLockSPKList()
+ {
+ var list = new List<string>();
+ list.Add(VideoDoorLock);
+ return list;
+ }
#region 鐏厜
/// <summary>
@@ -1535,6 +1588,10 @@
/// </summary>
public const string Inverter = "energy.inverter";
/// <summary>
+ /// 涓夌浉閫嗗彉鍣�
+ /// </summary>
+ public const string InverterRst = "energy.inverter_rst";
+ /// <summary>
/// 鑳芥簮妯″潡
/// </summary>
public const string EnergyStandard = "energy.standard";
@@ -1676,6 +1733,10 @@
#region 鐜浼犳劅鍣�
/// <summary>
+ /// 锛圥M10浼犳劅鍣級
+ /// </summary>
+ public const string SensorPm10 = "sensor.pm10";
+ /// <summary>
/// 锛堟俯搴︿紶鎰熷櫒锛�
/// </summary>
public const string SensorTemperature = "sensor.temperature";
@@ -1724,11 +1785,12 @@
{
var spkList = new List<string>();
spkList.Add(SensorTemperature);
+ spkList.Add(SensorPm10);
spkList.Add(SensorPm25);
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);
@@ -1742,6 +1804,7 @@
{
var spkList = new List<string>();
spkList.Add(SensorTemperature);
+ spkList.Add(SensorPm10);
spkList.Add(SensorPm25);
spkList.Add(SensorCO2);
spkList.Add(SensorTVOC);
@@ -1757,7 +1820,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