From 11c4199c6015914b5de6d96fca3b478c0a852f9b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 十二月 2020 19:54:01 +0800
Subject: [PATCH] 2020-12-03 1.OnAppConfig 配置文件检测处理，禁止删除。
---
HDL_ON/Entity/Room.cs | 80 +++++++++++++++++++++++++++++++++++++---
1 files changed, 74 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index 6bfcc90..aa50d4f 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -3,8 +3,6 @@
namespace HDL_ON.Entity
{
-
-
/// <summary>
/// 鎴块棿瀵硅薄
/// </summary>
@@ -37,7 +35,7 @@
{
get
{
- return "RoomPath_" + sid;
+ return "RoomData_" + sid;
}
}
/// <summary>
@@ -76,7 +74,7 @@
/// </summary>
List<Function> functions = new List<Function>();
/// <summary>
- /// 鍒锋柊鎴块棿鍔熻兘鍒楄〃
+ /// 鑾峰彇鎴块棿鍔熻兘鍒楄〃
/// </summary>
public List<Function> GetRoomFunctions(bool needRefresh)
{
@@ -88,7 +86,7 @@
{
foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
{
- if (f.roomIdList.Contains(sid) && sid != null)
+ if (f.roomIds.Contains(sid) && sid != null)
{
functions.Add(f);
}
@@ -98,6 +96,7 @@
}
/// <summary>
/// 澧炲姞鎴块棿鍔熻兘
+ /// 鎿嶄綔鐨勬槸缂撳瓨鏁版嵁锛屼笉鐢ㄤ繚瀛�
/// </summary>
public void AddRoomFunction(Function function)
{
@@ -105,12 +104,56 @@
}
/// <summary>
/// 鍒犻櫎鎴块棿鍔熻兘
+ /// 鎿嶄綔鐨勬槸缂撳瓨鏁版嵁锛屼笉鐢ㄤ繚瀛�
/// </summary>
public void RemoveRoomFunction(Function function)
{
functions.Remove(functions.Find((obj) => obj.sid == function.sid));
}
-
+ /// <summary>
+ /// 鎴块棿鍦烘櫙鍒楄〃
+ /// </summary>
+ List<Scene> scenes = new List<Scene>();
+ /// <summary>
+ /// 鑾峰彇鍦烘櫙鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Scene> GetRoomScenes(bool needRefresh)
+ {
+ if (needRefresh)
+ {
+ scenes = new List<Scene>();
+ }
+ if (scenes.Count == 0)
+ {
+ foreach (var s in DB_ResidenceData.functionList.scenes)
+ {
+ if (s.roomIds.Contains(sid) && sid != null)
+ {
+ scenes.Add(s);
+ }
+ }
+ }
+ return scenes;
+ }
+ /// <summary>
+ /// 澧炲姞鎴块棿鍦烘櫙
+ /// 鎿嶄綔鐨勬槸缂撳瓨鏁版嵁锛屼笉鐢ㄤ繚瀛�
+ /// </summary>
+ /// <param name="scene"></param>
+ public void AddRoomScene(Scene scene)
+ {
+ scenes.Add(scene);
+ }
+ /// <summary>
+ /// 绉婚櫎鎴块棿鍦烘櫙
+ /// 鎿嶄綔鐨勬槸缂撳瓨鏁版嵁锛屼笉鐢ㄤ繚瀛�
+ /// </summary>
+ /// <param name="scene"></param>
+ public void RemoveRoomScene(Scene scene)
+ {
+ scenes.Remove(scenes.Find((obj) => obj.sid == scene.sid));
+ }
/// <summary>
/// 淇濆瓨鎴块棿鏁版嵁
/// </summary>
@@ -123,4 +166,29 @@
}
+
+ /// <summary>
+ /// 鏈嶅姟杩斿洖鐨勬埧闂村璞�
+ /// </summary>
+ public class ServerReplyRoom
+ {
+ //浜戠鎴块棿ID
+ public string roomId = "";
+ /// <summary>
+ /// 鎴块棿鍚嶇О
+ /// </summary>
+ public string roomName = "";
+ /// <summary>
+ /// 鎴块棿鍥剧墖
+ /// </summary>
+ public string roomImage = "";
+ /// <summary>
+ /// 鎴块棿鍏ㄥ悕
+ /// </summary>
+ public string roomFullName = "";
+ /// <summary>
+ /// 璋冭瘯杞欢\app鐢熸垚鐨勫敮涓�ID
+ /// </summary>
+ public string uid = "";
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0