From b8c54a7e4048317fc0f33c63a802d60396f82eb0 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 十二月 2022 17:31:59 +0800
Subject: [PATCH] 2022年12月07日17:31:56
---
HDL_ON/Entity/Function/Function.cs | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 0096799..64034ec 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 = "";
@@ -400,16 +404,20 @@
/// 鏄惁鏀惰棌
/// </summary>
public bool collect = false;
+
+ private bool _online = false;
/// <summary>
/// 鏄惁鍦ㄧ嚎
/// </summary>
- public bool online {
+ public bool online
+ {
get
{
return true;
}
- set {
-
+ set
+ {
+ _online = value;
}
}
@@ -745,6 +753,7 @@
case FunctionAttributeKey.CCT:
case FunctionAttributeKey.RGB:
case FunctionAttributeKey.Angle:
+ case "security":
//case FunctionAttributeKey.FadeTime:
if (attr.curValue.ToString() == "{}")
{
@@ -769,6 +778,10 @@
attr.curValue = "day";
}
}
+ }
+ else if(attr.key == "security")
+ {
+ attr.curValue = "false";
}
else
{
@@ -998,6 +1011,10 @@
{
public const string _null = "";
/// <summary>
+ /// 瀹夐槻甯冮槻鐘舵��
+ /// </summary>
+ public const string Security = "security";
+ /// <summary>
/// 寮�鍏�
/// </summary>
public const string OnOff = "on_off";
@@ -1009,6 +1026,7 @@
/// 棰滆壊
/// </summary>
public const string RGB = "rgb";
+ public const string RGBW = "rgbw";
/// <summary>
/// 娓愬彉鏃堕棿
/// </summary>
@@ -1316,7 +1334,14 @@
/// 閫氱敤寮�鍏�
/// </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>
/// 绌鸿皟绉戞妧绯荤粺锛堢豢寤猴級
/// 鎬绘帶
@@ -1609,6 +1634,10 @@
public const string SenesorMegahealth = "sensor.megahealth";
public const string SenesorMegahealth2 = "sensor.megahealth.zg";
/// <summary>
+ /// 姣背娉紶鎰熷櫒锛堝Э鎬佺増锛�
+ /// </summary>
+ public const string SensorMmvPose = "sensor.mmv_pose";
+ /// <summary>
/// 绱ф�ュ懠鍙�
/// </summary>
public const string SensorHelp = "sensor.help";
@@ -1633,6 +1662,7 @@
spkList.Add(SensorDryContact2);
spkList.Add(SenesorMegahealth);
spkList.Add(SenesorMegahealth2);
+ spkList.Add(SensorMmvPose);
return spkList;
}
#endregion
@@ -1651,6 +1681,10 @@
}
#region 鐜浼犳劅鍣�
+ /// <summary>
+ /// 锛圥M10浼犳劅鍣級
+ /// </summary>
+ public const string SensorPm10 = "sensor.pm10";
/// <summary>
/// 锛堟俯搴︿紶鎰熷櫒锛�
/// </summary>
@@ -1700,6 +1734,7 @@
{
var spkList = new List<string>();
spkList.Add(SensorTemperature);
+ spkList.Add(SensorPm10);
spkList.Add(SensorPm25);
spkList.Add(SensorCO2);
spkList.Add(SensorTVOC);
@@ -1718,6 +1753,7 @@
{
var spkList = new List<string>();
spkList.Add(SensorTemperature);
+ spkList.Add(SensorPm10);
spkList.Add(SensorPm25);
spkList.Add(SensorCO2);
spkList.Add(SensorTVOC);
@@ -1904,6 +1940,7 @@
spkList.Add(ElectricTuyaWaterValve2);
spkList.Add(ElectricTuyaWeepRobot);
spkList.Add(ElectricTuyaWeepRobot2);
+ spkList.Add(SensorMmvPose);
spkList.Add(SenesorMegahealth);
spkList.Add(SenesorMegahealth2);
return spkList;
@@ -1929,7 +1966,7 @@
list.Add(ElectricTuyaWeepRobot2);
break;
case BrandType.All3tyBrand:
- list.Add(SenesorMegahealth);//鍏嗚
+ list.Add(SenesorMegahealth2);//鍏嗚
break;
}
return list;
--
Gitblit v1.8.0