From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/Entity/Room.cs | 73 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index 2e23cd7..c128f9e 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -4,21 +4,42 @@
namespace HDL_ON.Entity
{
+
/// <summary>
/// 鎴块棿瀵硅薄
- /// 鎴块棿鍛藉悕瑙勫垯 typeof (Room).Name + "_" + etNameBox.Text.Trim ();
/// </summary>
- [System.Serializable]
+ [Serializable]
+ public class Floor
+ {
+ /// <summary>
+ /// 妤煎眰鍚嶇О
+ /// </summary>
+ public string name = "1 F";
+ /// <summary>
+ /// 妤煎眰ID
+ /// </summary>
+ public string sid;
+ }
+
+
+ /// <summary>
+ /// 鎴块棿瀵硅薄
+ /// </summary>
+ [Serializable]
public class Room
{
/// <summary>
/// 鎴块棿鍚�
/// </summary>
- public string name;
+ public string name = "Room";
/// <summary>
/// 鎴块棿ID
/// </summary>
public string sid;
+ /// <summary>
+ /// 妤煎眰绱㈠紩
+ /// </summary>
+ public string floorId = "";
/// <summary>
/// 鎴块棿鑳屾櫙
@@ -27,28 +48,40 @@
/// <summary>
/// 妤煎眰
/// </summary>
- public string floor = "";
+ public string floor
+ {
+ get
+ {
+ if (DB_ResidenceData.residenceData.floors.Count > 0)
+ {
+ var f = DB_ResidenceData.residenceData.floors.Find((obj) => obj.sid == floorId);
+ if (f != null)
+ {
+ return f.name;
+ }
+ }
+ return "";
+ }
+ }
- /// <summary>
- /// 鎴块棿娣诲姞鐨勫姛鑳藉垪琛�
- /// 淇濆瓨鍔熻兘ID
- /// </summary>
- public List<string> roomFunctionList = new List<string>();
+
/// <summary>
/// 鎴块棿鍔熻兘鍒楄〃
/// </summary>
[Newtonsoft.Json.JsonIgnore]
public List<Function> functions = new List<Function>();
- /// <summary>
- /// 鎴块棿娣诲姞鐨勫満鏅垪琛�
- /// 淇濆瓨鍦烘櫙ID
- /// </summary>
- public List<string> roomSceneList = new List<string>();
- /// <summary>
- /// 鎴块棿鍦烘櫙鍒楄〃
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public List<Scene> scenes = new List<Scene>();
+ public void RefreshFunctions()
+ {
+ List<Function> funcList = new List<Function>();
+ foreach (var f in DB_ResidenceData.residenceData.functionList.functions)
+ {
+ if (f.roomIdList.Contains(sid) && sid != null)
+ {
+ funcList.Add(f);
+ }
+ }
+ functions = funcList;
+ }
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0