From 7ff70bc7c9460c395b59952d55df6e5d6a12a718 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 二月 2023 16:27:32 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr'
---
HDL_ON/Entity/Function/Function.cs | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index c281816..87f8863 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -273,6 +273,10 @@
/// </summary>
public string deviceId = "0";
/// <summary>
+ /// 绗笁鏂硅澶囨墿灞昳d
+ /// </summary>
+ public string extDevId = string.Empty;
+ /// <summary>
/// 璁惧spk
/// </summary>
public string spk = "";
@@ -749,6 +753,7 @@
case FunctionAttributeKey.CCT:
case FunctionAttributeKey.RGB:
case FunctionAttributeKey.Angle:
+ case "security":
//case FunctionAttributeKey.FadeTime:
if (attr.curValue.ToString() == "{}")
{
@@ -773,6 +778,10 @@
attr.curValue = "day";
}
}
+ }
+ else if(attr.key == "security")
+ {
+ attr.curValue = "false";
}
else
{
@@ -974,6 +983,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 +1015,10 @@
public static class FunctionAttributeKey
{
public const string _null = "";
+ /// <summary>
+ /// 瀹夐槻甯冮槻鐘舵��
+ /// </summary>
+ public const string Security = "security";
/// <summary>
/// 寮�鍏�
/// </summary>
@@ -1322,20 +1340,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>
/// 绌鸿皟绉戞妧绯荤粺锛堢豢寤猴級
/// 鎬绘帶
@@ -1535,6 +1546,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 +1691,10 @@
#region 鐜浼犳劅鍣�
/// <summary>
+ /// 锛圥M10浼犳劅鍣級
+ /// </summary>
+ public const string SensorPm10 = "sensor.pm10";
+ /// <summary>
/// 锛堟俯搴︿紶鎰熷櫒锛�
/// </summary>
public const string SensorTemperature = "sensor.temperature";
@@ -1724,6 +1743,7 @@
{
var spkList = new List<string>();
spkList.Add(SensorTemperature);
+ spkList.Add(SensorPm10);
spkList.Add(SensorPm25);
spkList.Add(SensorCO2);
spkList.Add(SensorTVOC);
@@ -1742,6 +1762,7 @@
{
var spkList = new List<string>();
spkList.Add(SensorTemperature);
+ spkList.Add(SensorPm10);
spkList.Add(SensorPm25);
spkList.Add(SensorCO2);
spkList.Add(SensorTVOC);
--
Gitblit v1.8.0