From 1e76fa5a69bc478b3eb5738546aeb51b8fd6f7c9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 18 十一月 2019 16:30:41 +0800
Subject: [PATCH] 2019.11.18
---
ZigbeeApp/Shared/Common/Room.cs | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Room.cs b/ZigbeeApp/Shared/Common/Room.cs
index dbaa949..45fe081 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,7 +295,7 @@
{
if (room.IsSharedRoom)
{
- room.Name = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){room.Name}";
+ room.Name = $"{room.Name}";
}
Lists.Add(room);
}
@@ -339,7 +329,6 @@
}
}
homeTemp.Save(false);
- CanInitAllRoom = true;
InitAllRoom();
}
--
Gitblit v1.8.0