From dee21bf452a8979d0515d13e534fbb69ed9715dd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 01 九月 2020 15:33:13 +0800
Subject: [PATCH] 上传一个版本

---
 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index c384d1e..50c2d74 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
@@ -124,7 +124,7 @@
         {
             //鑾峰彇浣忓畢淇℃伅
             var Pra = new GetResidenceInfoPra();
-            string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra, new List<string> { "NotCheck" });
+            string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra, new List<string> { "NotCheck" }, false);
             if (string.IsNullOrEmpty(resultData) == true)
             {
                 return false;
@@ -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();
                             });
@@ -247,6 +250,14 @@
                 //鍒嗕韩鐨�,涓嶈兘鏇存敼
                 return;
             }
+            //杩囨埛
+            var btnTransfer = rowLayout.AddDeleteControl();
+            btnTransfer.TextID = R.MyInternationalizationString.uTransfer;
+            btnTransfer.ButtonClickEvent += (sender, e) =>
+            {
+                var form = new TransferResidenceMainForm();
+                form.AddForm();
+            };
             //鏇存敼
             var btnChanged = rowLayout.AddEditorControl();
             btnChanged.TextID = R.MyInternationalizationString.uChanged1;
@@ -344,13 +355,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