From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Common/Room.cs | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Room.cs b/ZigbeeApp/Shared/Common/Room.cs
index ce9e8b9..d324988 100644
--- a/ZigbeeApp/Shared/Common/Room.cs
+++ b/ZigbeeApp/Shared/Common/Room.cs
@@ -98,6 +98,7 @@
{
if (m_CurrentRoom == null && Lists.Count > 0)
{
+ if (m_CurrentRoom == null) { m_CurrentRoom = Lists[0]; }
return Lists[0];
}
return m_CurrentRoom;
@@ -366,7 +367,6 @@
/// </summary>
public static void RefreshAllRoomByLocation()
{
- Lists.Clear();
var homeTemp = Config.Instance.Home;
homeTemp.RoomFilePathList.Clear();
@@ -377,7 +377,7 @@
if (listFile.Contains(fRoom) == true)
{
listFile.Remove(fRoom);
- homeTemp.AddRoomListFilePath(fRoom);
+ homeTemp.RoomFilePathList.Add(fRoom);
}
var listRoomFile = new List<string>();
@@ -385,7 +385,7 @@
{
if (fileName.StartsWith("Room_"))
{
- homeTemp.AddRoomListFilePath(fileName);
+ homeTemp.RoomFilePathList.Add(fileName);
listRoomFile.Add(fileName);
}
}
@@ -736,7 +736,7 @@
System.Console.WriteLine(ex.Message);
return null;
}
-
+
}
/// <summary>
/// 鑾峰彇褰撳墠妤煎眰鐨勬埧闂村悕绉�
@@ -940,8 +940,6 @@
//淇濆瓨鍒版湰鍦�
Save();
- //娣诲姞鑷姩澶囦唤
- HdlAutoBackupLogic.AddOrEditorFile(FileName);
if (saveRealRoom == true && LocalDevice.Current.GetDevicesCountByMac(device.DeviceAddr) == 1)
{
//濡傛灉鍙湁涓�涓洖璺�,鍒欎慨鏀圭湡瀹炵墿鐞嗚澶囩殑鎴块棿
@@ -1419,7 +1417,7 @@
SceneUIList.Remove(sceneUI);
SceneUIFilePathList.Remove(sceneUI.FileName);
Save();
-
+
Global.DeleteFilebyHomeId(sceneUI.FileName);
HdlAutoBackupLogic.DeleteFile(sceneUI.FileName);
}
--
Gitblit v1.8.0