From f23ad1b3f9f6193f35f72104d690b21dc67d5c1f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 七月 2020 12:35:25 +0800
Subject: [PATCH] 去掉了访问外网的异步

---
 ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs |  104 ++++++++++++++++++++++++++--------------------------
 1 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
index 658ee39..edac8a3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
@@ -219,7 +219,10 @@
                 this.ShowMassage(ShowMsgType.Confirm, msg, () =>
                 {
                     //鍒犻櫎瀛愯处鍙�
-                    this.DeleteSubAccount();
+                    HdlThreadLogic.Current.RunThread(() =>
+                    {
+                        this.DeleteSubAccount();
+                    });
                 });
             };
         }
@@ -251,7 +254,8 @@
             }
             btnSwitch.ButtonClickEvent += (sender, e) =>
             {
-                HdlThreadLogic.Current.RunThread(async () =>
+                btnSwitch.CanClick = false;
+                HdlThreadLogic.Current.RunThread(() =>
                 {
                     var pra = new
                     {
@@ -261,7 +265,7 @@
                     };
                     //鎵撳紑杩涘害鏉�
                     this.ShowProgressBar();
-                    var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ChangeSubAccountIsAllowRemoteCtrl", false, pra);
+                    var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ChangeSubAccountIsAllowRemoteCtrl", false, pra);
                     //鍏抽棴杩涘害鏉�
                     this.CloseProgressBar();
 
@@ -273,6 +277,7 @@
 
                     Application.RunOnMainThread(() =>
                     {
+                        btnSwitch.CanClick = true;
                         btnSwitch.IsSelected = !btnSwitch.IsSelected;
                     });
                 });
@@ -319,46 +324,49 @@
         /// <summary>
         /// 鍗囩骇鎴栬�呴檷绾у瓙璐﹀彿
         /// </summary>
-        public async void UpOrDownSubAccountLevel()
+        public void UpOrDownSubAccountLevel()
         {
-            //寮�鍚繘搴︽潯
-            this.ShowProgressBar();
-
-            var pra = new UpOrDownLevelPra();
-            pra.DistributedMark = memberInfo.DistributedMark;
-
-            bool result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpSubAccount", false, pra);
-            if (result == false)
+            HdlThreadLogic.Current.RunThread(() =>
             {
-                this.CloseProgressBar();
-                return;
-            }
-            this.CloseProgressBar();
+                //寮�鍚繘搴︽潯
+                this.ShowProgressBar();
 
-            //鍙樻洿鏉冮檺
-            memberInfo.AccountType = memberInfo.AccountType == 1 ? 0 : 1;
+                var pra = new UpOrDownLevelPra();
+                pra.DistributedMark = memberInfo.DistributedMark;
 
-            Application.RunOnMainThread(() =>
-            {
-                if (this.Parent == null)
+                bool result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpSubAccount", false, pra);
+                if (result == false)
                 {
+                    this.CloseProgressBar();
                     return;
                 }
-                //鍙樻洿鏉冮檺鍥炬爣
-                if (memberInfo.AccountType == 1)
-                {
-                    btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";
-                }
-                else
-                {
-                    btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";
-                }
-                //鍙樻洿鏉冮檺鏂囧瓧
-                btnAuthority.TextID = memberInfo.AccountType == 1 ? R.MyInternationalizationString.uMemberHadActionAuthority : R.MyInternationalizationString.uMember;
+                this.CloseProgressBar();
 
-                //鎵撳紑鏄剧ず鎴愬姛鐨勭敾闈�
-                var form = new SubAccountLevelUpSuccessForm();
-                form.AddForm(memberInfo);
+                //鍙樻洿鏉冮檺
+                memberInfo.AccountType = memberInfo.AccountType == 1 ? 0 : 1;
+
+                HdlThreadLogic.Current.RunMain(() =>
+                {
+                    if (this.Parent == null)
+                    {
+                        return;
+                    }
+                    //鍙樻洿鏉冮檺鍥炬爣
+                    if (memberInfo.AccountType == 1)
+                    {
+                        btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";
+                    }
+                    else
+                    {
+                        btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";
+                    }
+                    //鍙樻洿鏉冮檺鏂囧瓧
+                    btnAuthority.TextID = memberInfo.AccountType == 1 ? R.MyInternationalizationString.uMemberHadActionAuthority : R.MyInternationalizationString.uMember;
+
+                    //鎵撳紑鏄剧ず鎴愬姛鐨勭敾闈�
+                    var form = new SubAccountLevelUpSuccessForm();
+                    form.AddForm(memberInfo);
+                });
             });
         }
 
@@ -369,7 +377,7 @@
         /// <summary>
         /// 鍒犻櫎瀛愯处鍙�
         /// </summary>
-        private async void DeleteSubAccount()
+        private void DeleteSubAccount()
         {
             //寮�鍚繘搴︽潯
             this.ShowProgressBar();
@@ -377,7 +385,7 @@
             var pra = new DeleteSubAccountPra();
             pra.SubAccount = memberInfo.SubAccountDistributedMark;
 
-            bool result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/DeletedSubAccount", false, pra);
+            bool result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/DeletedSubAccount", false, pra);
             //鍏抽棴杩涘害鏉�
             this.CloseProgressBar();
 
@@ -386,21 +394,13 @@
                 return;
             }
 
-            //绉婚櫎缂撳瓨
-            UserCenterResourse.ListMemberInfo.RemoveAll((obj) =>
+            HdlThreadLogic.Current.RunMain(() =>
             {
-                if (obj.SubAccountDistributedMark == memberInfo.SubAccountDistributedMark)
-                {
-                    return true;
-                }
-                return false;
+                //浠庢垚鍛樹竴瑙堢敾闈㈢Щ闄�
+                this.LoadFormMethodByName("MemberListForm", "DeleteRowByAccount", memberInfo.Account);
+                //鑷韩鍏抽棴
+                this.CloseForm();
             });
-            UserCenterLogic.SaveLocalMemberListInfo();
-
-            //浠庢垚鍛樹竴瑙堢敾闈㈢Щ闄�
-            this.LoadFormMethodByName("MemberListForm", "DeleteRowByAccount", memberInfo.Account);
-            //鑷韩鍏抽棴
-            this.CloseForm();
         }
 
         #endregion
@@ -412,11 +412,11 @@
         /// </summary>
         private void GetMemberIcon(ImageView btnUserIcon)
         {
-            HdlThreadLogic.Current.RunThread(async () =>
+            HdlThreadLogic.Current.RunThread(() =>
             {
                 var pra = new AccountInfoPra();
                 pra.Account = memberInfo.Account;
-                var result = await UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string>() { "NotSetAgain" });
+                var result = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra);
                 if (result == null)
                 {
                     return;

--
Gitblit v1.8.0