From cc7eb0553e93844be984045bca3e335d4ae0dede Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 04 七月 2022 10:46:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into release0123
---
HDL_ON/Entity/Function/Function.cs | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 9e45062..c706201 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -380,7 +380,15 @@
/// <summary>
/// 鏄惁鍦ㄧ嚎
/// </summary>
- public bool online = true;
+ public bool online {
+ get
+ {
+ return true;
+ }
+ set {
+
+ }
+ }
/// <summary>
/// 鐜闈㈡澘 缁戝畾鐨� 璁惧鐩爣sid鍒楄〃
@@ -1039,6 +1047,16 @@
/// </summary>
public const string ActionStatus = "action_state";
/// <summary>
+ ///
+ /// </summary>
+ public const string PeopleNum = "people_num";
+ public const string PeopleId = "people_id";
+ /// <summary>
+ /// 姣背娉紶鎰熷櫒 浜虹墿鍔ㄤ綔
+ /// </summary>
+ public const string TargetStatus = "target_status";//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
+
+ /// <summary>
/// 鐢甸噺鐘舵��
/// </summary>
public const string BatteryState = "battery_state";
@@ -1196,14 +1214,19 @@
public string loopId;
}
-
+ /// <summary>
+ /// Tag 鍔熻兘SPK
+ /// </summary>
public static class SPK
{
/// <summary>
/// 闂ㄩ攣
/// </summary>
public const string DoorLock = "security.door";
-
+ /// <summary>
+ /// 闂ㄩ攣spk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
public static List<string> GetDoorLockSPKList()
{
var list = new List<string>();
@@ -1267,6 +1290,10 @@
/// 锛堝嵎甯橈級
/// </summary>
public const string CurtainRoller = "curtain.roller";
+ /// <summary>
+ /// 姊﹀够甯�
+ /// </summary>
+ public const string CurtainDream = "curtain.dream";
/// <summary>
/// 绐楀笜spk鍒楄〃
@@ -1279,6 +1306,7 @@
spkList.Add(CurtainSwitch);
spkList.Add(CurtainShades);
spkList.Add(CurtainTrietex);
+ spkList.Add(CurtainDream);
return spkList;
}
#endregion
--
Gitblit v1.8.0