From f8f87a4fe67a1539b6fb85a54e4c178474792285 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 20 九月 2022 13:22:22 +0800
Subject: [PATCH] 完善后退功能
---
HDL_ON/Entity/Function/Function.cs | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 1482e07..a5313b0 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -243,7 +243,30 @@
/// <summary>
/// 澶囨敞
/// </summary>
- public string name;
+ public string name = "";
+ /// <summary>
+ /// 璁惧缁戝畾鐨刪omeId
+ /// </summary>
+ private string _homeId = "";
+ public string homeId
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(_homeId))
+ {
+ return DB_ResidenceData.Instance.CurrentRegion.id;
+ }
+ else
+ {
+ return _homeId;
+ }
+ }
+ set
+ {
+ _homeId = value;
+ }
+ }
+
/// <summary>
/// 璁惧ID
/// 浜戠璐熻矗鐢熸垚
@@ -1290,6 +1313,11 @@
public static class SPK
{
/// <summary>
+ /// 閫氱敤寮�鍏�
+ /// </summary>
+ public const string OtherCommon = "other.common";
+
+ /// <summary>
/// 闂ㄩ攣
/// </summary>
public const string DoorLock = "security.door";
@@ -1472,6 +1500,10 @@
#region 鑳芥簮
/// <summary>
+ /// 閫嗗彉鍣�
+ /// </summary>
+ public const string Inverter = "energy.inverter";
+ /// <summary>
/// 鑳芥簮妯″潡
/// </summary>
public const string EnergyStandard = "energy.standard";
@@ -1577,6 +1609,7 @@
var spkList = new List<string>();
//spkList.Add(SensorLight);
spkList.Add(SensorPir);
+ spkList.Add(SensorHelp);
spkList.Add(SensorDoorWindow);
spkList.Add(SensorSmoke);
spkList.Add(SensorWater);
--
Gitblit v1.8.0