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/Residence/ResidenceListForm.cs | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index 2ac9c0a..31d37fa 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
@@ -78,7 +78,7 @@
/// <param name="div">1:鍏堣鍙栦簯绔�,鏃犳硶鑱旂綉,鍐嶈鍙栨湰鍦� 2:鍙浜戠 3:鍙鏈湴</param>
private void SetResidenceInfo(int div)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//铏氭嫙浣忓畢鐨勮瘽,鍙鏈湴
if (div == 3 || Config.Instance.Home.IsVirtually == true)
@@ -91,7 +91,7 @@
//寮�鍚繘搴︽潯
this.ShowProgressBar();
//璁剧疆浣忓畢淇℃伅(鏈夌綉鎯呭喌)
- var result = await this.SetResidenceInfoByOnline();
+ var result = this.SetResidenceInfoByOnline();
if (result == true)
{
//浜戠璇诲彇鎴愬姛
@@ -120,13 +120,12 @@
/// <summary>
/// 璁剧疆浣忓畢淇℃伅(鏈夌綉鎯呭喌)
/// </summary>
- private async System.Threading.Tasks.Task<bool> SetResidenceInfoByOnline()
+ private bool SetResidenceInfoByOnline()
{
//鑾峰彇浣忓畢淇℃伅
var Pra = new GetResidenceInfoPra();
- var listNotCheck = new List<string>() { "NotSetAgain" };
- string resultData = await UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra, listNotCheck);
- if (resultData == null)
+ string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra, new List<string> { "NotCheck" });
+ if (string.IsNullOrEmpty(resultData) == true)
{
return false;
}
@@ -224,7 +223,7 @@
}
this.ShowMassage(ShowMsgType.Confirm, msg, () =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
@@ -232,7 +231,7 @@
//妫�娴嬫湰鍦版湁娌℃湁杩欎釜浣忓畢
this.CheckIsExsitResidence(info);
- await HdlResidenceLogic.Current.SwitchResidence(info.Id);
+ HdlResidenceLogic.Current.SwitchResidence(info.Id);
HdlThreadLogic.Current.RunMain(() =>
{
@@ -354,9 +353,9 @@
}
this.ShowMassage(ShowMsgType.Confirm, msg, () =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- await HdlResidenceLogic.Current.SwitchResidence(i_home.Id);
+ HdlResidenceLogic.Current.SwitchResidence(i_home.Id);
HdlThreadLogic.Current.RunMain(() =>
{
@@ -424,7 +423,10 @@
if (info != null)
{
//缂栬緫浜戠鐨勪綇瀹呭悕绉�
- this.EditorResidenceName(textValue, info, btnHome);
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ this.EditorResidenceName(textValue, info, btnHome);
+ });
}
else
{
@@ -465,17 +467,20 @@
Pra.LoginAccessToken = Config.Instance.Token;
//缂栬緫浣忓畢
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
if (flage == true)
{
- //鍒锋柊鍐呭瓨鐨勪綇瀹呭悕
- HdlResidenceLogic.Current.EditorHouseByHouseId(info.Id, ResidenceName);
- //鏇存敼鏄剧ず鐨勫悕瀛�
- btnHome.Text = ResidenceName;
- info.Name = ResidenceName;
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍒锋柊鍐呭瓨鐨勪綇瀹呭悕
+ HdlResidenceLogic.Current.EditorHouseByHouseId(info.Id, ResidenceName);
+ //鏇存敼鏄剧ず鐨勫悕瀛�
+ btnHome.Text = ResidenceName;
+ info.Name = ResidenceName;
+ });
}
}
@@ -508,7 +513,10 @@
dialogForm.CloseDialog();
//淇濆瓨浣忓畢
- this.AddNewResidence(textValue);
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ this.AddNewResidence(textValue);
+ });
});
}
@@ -517,7 +525,7 @@
/// </summary>
/// <param name="ResidenceName"></param>
/// <returns></returns>
- private async void AddNewResidence(string ResidenceName)
+ private void AddNewResidence(string ResidenceName)
{
//妫�娴嬭兘鍚︿繚瀛樹綇瀹�
if (this.CheckIsCanSaveResidence(string.Empty, ResidenceName, false) == false)
@@ -530,8 +538,8 @@
var Pra = new AddResidencePra();
Pra.Name = ResidenceName;
//娣诲姞浣忓畢
- string resultData = await UserCenterLogic.GetResponseDataByRequestHttps("App/AddHome", false, Pra);
- if (resultData == null)
+ string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/AddHome", false, Pra);
+ if (string.IsNullOrEmpty(resultData) == true)
{
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
@@ -541,9 +549,14 @@
var newInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<NewResidenceInfo>>(resultData);
HdlResidenceLogic.Current.AddHouseToMemmory(newInfo[0].Id, ResidenceName);
- //閲嶆柊鍒锋柊鍒楄〃
- this.listView.RemoveAll();
- this.SetResidenceInfo(2);
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //閲嶆柊鍒锋柊鍒楄〃
+ this.listView.RemoveAll();
+ this.SetResidenceInfo(2);
+ });
+
}
#endregion
--
Gitblit v1.8.0