From b94f318b1cb5c3618dd53b5240c1d999c8427b71 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 29 十一月 2019 13:09:25 +0800
Subject: [PATCH] 2019.11.29
---
ZigbeeApp/Shared/Common/Room.cs | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Room.cs b/ZigbeeApp/Shared/Common/Room.cs
index dbaa949..c344624 100644
--- a/ZigbeeApp/Shared/Common/Room.cs
+++ b/ZigbeeApp/Shared/Common/Room.cs
@@ -132,12 +132,6 @@
public bool IsSharedRoom = false;
/// <summary>
- /// 鏄惁鍙互鍒锋柊鎴块棿鏁版嵁浜�
- /// 闇�瑕佺瓑鍒濆鍖栨湰鍦拌澶囨暟鎹悗鍦ㄥ彲浠ュ垵濮嬪寲鎴块棿鏁版嵁
- /// </summary>
- public static bool CanInitAllRoom;
-
- /// <summary>
/// 鑾峰彇鍠滅埍鎴块棿鐨勬墍鏈夎澶囪矾寰�
/// </summary>
/// <value>The love room device list.</value>
@@ -282,10 +276,6 @@
/// </summary>
public static void InitAllRoom()
{
- //if (CanInitAllRoom == false)
- //{
- // return;
- //}
Lists.Clear();
if (Config.Instance.Home.RoomFilePathList.Contains("Room_Favorite.json") == false)
{
@@ -305,11 +295,13 @@
{
if (room.IsSharedRoom)
{
- room.Name = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){room.Name}";
+ room.Name = $"{room.Name}";
}
Lists.Add(room);
+
}
}
+ Config.Instance.Home.InitFloor();
}
/// <summary>
@@ -339,7 +331,6 @@
}
}
homeTemp.Save(false);
- CanInitAllRoom = true;
InitAllRoom();
}
@@ -611,9 +602,9 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public List<Room> GetRoomsByFloorId(string id)
+ public List<Room> GetRoomsByFloorId(string id)
{
- return Lists.FindAll((obj) => obj.FloorId==id);
+ return Lists.FindAll((obj) => obj.FloorId == id);
}
/// <summary>
/// 鑾峰彇褰撳墠妤煎眰鐨勬埧闂村悕绉�
--
Gitblit v1.8.0