From cb1476f1197b8730038b4ef485f8f036e1d93422 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 16:49:32 +0800
Subject: [PATCH] 合并文本缺漏
---
HDL_ON/Entity/Room.cs | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index e932b22..75db6e5 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -46,7 +46,7 @@
public SpatialInfo(string spatialType)
{
roomType = "FLOOR";
- parentId = DB_ResidenceData.Instance.CurrentRegion.RegionID;
+ parentId = DB_ResidenceData.Instance.CurrentRegion.id;
}
public string roomId = "";
@@ -462,10 +462,10 @@
}
}
- /// <summary>
- /// 鎴块棿鍔熻兘鍒楄〃
- /// </summary>
- List<Function> functions = new List<Function>();
+ ///// <summary>
+ ///// 鎴块棿鍔熻兘鍒楄〃
+ ///// </summary>
+ //List<Function> functions = new List<Function>();
/// <summary>
/// 鑾峰彇鎴块棿鍔熻兘鍒楄〃
/// </summary>
@@ -473,8 +473,8 @@
{
if (needRefresh)
{
- functions = new List<Function>();
}
+ var functions = new List<Function>();
if (functions.Count == 0)
{
foreach (var f in FunctionList.List.GetDeviceFunctionList())
@@ -487,22 +487,22 @@
}
return functions;
}
- /// <summary>
- /// 澧炲姞鎴块棿鍔熻兘
- /// 鎿嶄綔鐨勬槸缂撳瓨鏁版嵁锛屼笉鐢ㄤ繚瀛�
- /// </summary>
- public void AddRoomFunction(Function function)
- {
- functions.Add(function);
- }
- /// <summary>
- /// 鍒犻櫎鎴块棿鍔熻兘
- /// 鎿嶄綔鐨勬槸缂撳瓨鏁版嵁锛屼笉鐢ㄤ繚瀛�
- /// </summary>
- public void RemoveRoomFunction(Function function)
- {
- functions.Remove(functions.Find((obj) => obj.sid == function.sid));
- }
+ ///// <summary>
+ ///// 澧炲姞鎴块棿鍔熻兘
+ ///// 鎿嶄綔鐨勬槸缂撳瓨鏁版嵁锛屼笉鐢ㄤ繚瀛�
+ ///// </summary>
+ //public void AddRoomFunction(Function function)
+ //{
+ // functions.Add(function);
+ //}
+ ///// <summary>
+ ///// 鍒犻櫎鎴块棿鍔熻兘
+ ///// 鎿嶄綔鐨勬槸缂撳瓨鏁版嵁锛屼笉鐢ㄤ繚瀛�
+ ///// </summary>
+ //public void RemoveRoomFunction(Function function)
+ //{
+ // functions.Remove(functions.Find((obj) => obj.sid == function.sid));
+ //}
/// <summary>
/// 鎴块棿鍦烘櫙鍒楄〃
/// </summary>
--
Gitblit v1.8.0