From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index ab608cf..b274703 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
@@ -220,13 +220,16 @@
//妫�娴嬫湰鍦版湁娌℃湁杩欎釜浣忓畢
this.CheckIsExsitResidence(info);
- HdlResidenceLogic.Current.SwitchResidence(info.Id);
+ var result = HdlResidenceLogic.Current.SwitchResidence(info.Id);
HdlThreadLogic.Current.RunMain(() =>
{
- //閲嶆柊鍒锋柊鍒楄〃
- this.listView.RemoveAll();
- this.SetResidenceInfo(2);
+ if (result == true)
+ {
+ //閲嶆柊鍒锋柊鍒楄〃
+ this.listView.RemoveAll();
+ this.SetResidenceInfo(2);
+ }
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
});
@@ -344,13 +347,16 @@
{
HdlThreadLogic.Current.RunThread(() =>
{
- HdlResidenceLogic.Current.SwitchResidence(i_home.Id);
+ var result = HdlResidenceLogic.Current.SwitchResidence(i_home.Id);
HdlThreadLogic.Current.RunMain(() =>
{
- //閲嶆柊鍒锋柊鍒楄〃
- this.listView.RemoveAll();
- this.SetResidenceInfo(3);
+ if (result == true)
+ {
+ //閲嶆柊鍒锋柊鍒楄〃
+ this.listView.RemoveAll();
+ this.SetResidenceInfo(3);
+ }
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
});
--
Gitblit v1.8.0