From 1f5636d69332170ea3a41c76c9519f6ff6f0a8d9 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 15:40:30 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index c6f851d..00f1d1d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
@@ -121,7 +121,7 @@
string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ResidenceSortFile);
UserCenterLogic.SaveFileContent(fullName, listResidenceSort);
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (this.Parent == null)
{
@@ -215,7 +215,7 @@
Room.InitAllRoom();
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
//閲嶆柊鍒锋柊鍒楄〃
this.listView.RemoveAll();
@@ -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