From 97e259d966cb5cb5d73c105d5dbaadcc1f920614 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 13:48:43 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index c6f851d..bcfc50f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
@@ -233,9 +233,9 @@
}
};
- if (info.IsOthreShare == true && info.AccountType != 1)
+ if (info.IsOthreShare == true)
{
- //鍒嗕韩鐨勶紝鍙堜笉鎷ユ湁绠＄悊鍛樻潈闄愮殑,涓嶈兘鏇存敼
+ //鍒嗕韩鐨�,涓嶈兘鏇存敼
return;
}
//鏇存敼
@@ -462,7 +462,10 @@
{
if (Config.Instance.HomeFilePathList.Contains($"House_{keys}.json") == false)
{
+ //淇濆瓨椤哄簭
listResidenceSort.Remove(keys);
+ Room.CurrentRoom.SaveFloorSort(listResidenceSort);
+
this.listView.RemoveAll();
//鏁版嵁宸茬粡鍙樻洿
HdlThreadLogic.Current.RunThread(() =>
--
Gitblit v1.8.0