From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 16:32:35 +0800
Subject: [PATCH] 上传合并后的代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
index fff74a2..8daca3a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
@@ -227,7 +227,8 @@
/// 澧炲姞鎴块棿
/// </summary>
/// <param name="room">Room.</param>
- public void AddRoom(Room room)
+ /// <param name="rorefreshRoomViewom">鏄惁鍒锋柊鎴块棿瑙嗗浘鍒楄〃鐣岄潰</param>
+ public void AddRoom(Room room, bool refreshRoomView = true)
{
if (Global.IsExistsByHomeId(room.FileName) == true
|| Config.Instance.Home.ListRooms.Contains(room.Id) == true)
@@ -242,8 +243,11 @@
room.Save();
//澶囦唤
HdlAutoBackupLogic.AddOrEditorFile(room.FileName);
- //鍒锋柊鎴块棿瑙嗗浘鍒楄〃
- this.RefreshRoomListView();
+ if (refreshRoomView == true)
+ {
+ //鍒锋柊鎴块棿瑙嗗浘鍒楄〃
+ this.RefreshRoomListView();
+ }
}
#endregion
@@ -924,6 +928,10 @@
/// <returns></returns>
public List<Room> GetFloorSortRoom(string i_floorKeys, bool getShard = true)
{
+ if (i_floorKeys == null)
+ {
+ i_floorKeys = string.Empty;
+ }
Dictionary<string, List<string>> dicAllSort = new Dictionary<string, List<string>>();
//璇诲彇鎴块棿椤哄簭
string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.RoomSortFile);
--
Gitblit v1.8.0