From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index 00f1d1d..9ff8a6a 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);
- HdlThreadLogic.Current.RunMain(() =>
+ Application.RunOnMainThread(() =>
{
if (this.Parent == null)
{
@@ -215,7 +215,7 @@
Room.InitAllRoom();
- HdlThreadLogic.Current.RunMain(() =>
+ Application.RunOnMainThread(() =>
{
//閲嶆柊鍒锋柊鍒楄〃
this.listView.RemoveAll();
@@ -233,9 +233,9 @@
}
};
- if (info.IsOthreShare == true)
+ if (info.IsOthreShare == true && info.AccountType != 1)
{
- //鍒嗕韩鐨�,涓嶈兘鏇存敼
+ //鍒嗕韩鐨勶紝鍙堜笉鎷ユ湁绠＄悊鍛樻潈闄愮殑,涓嶈兘鏇存敼
return;
}
//鏇存敼
--
Gitblit v1.8.0