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/CommonBase/Logic/HdlResidenceLogic.cs | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
index c60d868..cc3c9ca 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
@@ -39,13 +39,13 @@
/// 鍒涘缓鏂扮殑浣忓畢(杩斿洖浣忓畢id,null浠ｈ〃澶辫触)
/// </summary>
/// <param name="residenceName">浣忓畢鍚嶇О</param>
- public async System.Threading.Tasks.Task<string> CreatNewResidence(string residenceName)
+ public string CreatNewResidence(string residenceName)
{
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)
{
return null;
}
@@ -96,7 +96,7 @@
/// </summary>
/// <param name="residenceId"></param>
/// <returns></returns>
- public async System.Threading.Tasks.Task SwitchResidence(string residenceId)
+ public void SwitchResidence(string residenceId)
{
//鎵撳紑杩涘害鏉�
ProgressBar.Show();
@@ -106,7 +106,7 @@
Config.Instance.Home = this.GetHouseByHouseId(residenceId);
Config.Instance.Save();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenterLogic.InitUserCenterMenmoryAndThread(false);
+ UserCenterLogic.InitUserCenterMenmoryAndThread(false);
//鍏抽棴杩涘害鏉�
ProgressBar.Close();
@@ -122,7 +122,7 @@
/// <param name="residenceId">浣忓畢id</param>
/// <param name="residenceName">浣忓畢鍚嶇О</param>
/// <returns></returns>
- public async System.Threading.Tasks.Task<bool> EditorResidenceName(string residenceId, string residenceName)
+ public bool EditorResidenceName(string residenceId, string residenceName)
{
var Pra = new EditorResidencePra();
Pra.HomeId = residenceId;
@@ -131,7 +131,7 @@
Pra.LoginAccessToken = Config.Instance.Token;
//缂栬緫浣忓畢
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra);
if (flage == true)
{
//鍒锋柊鍐呭瓨鐨勪綇瀹呭悕
@@ -206,27 +206,26 @@
/// <summary>
/// 鑾峰彇浜戠浣忓畢鍒楄〃
/// </summary>
- public async System.Threading.Tasks.Task<List<string>> GetHomeListsFromDb()
+ public List<string> GetHomeListsFromDb()
{
- var pageSetting = new SendDataToServer.ResidenceListPageSettingObj()
+ if (HdlWifiLogic.Current.CanAccessHttp == false)
{
- PageSize = CommonPage.PageSize
- };
-
- var reqDto = new SendDataToServer.ResidenceListObj()
- {
- LoginAccessToken = Config.Instance.Token,
- PageSetting = pageSetting
- };
+ //褰撳墠鏃犳硶鑱旂綉
+ return Config.Instance.HomeFilePathList;
+ }
var requestObj = new SendDataToServer.ResidenceListReqDto()
{
- ReqDto = reqDto,
RequestVersion = CommonPage.RequestVersion,
+ ReqDto = new SendDataToServer.ResidenceListObj()
+ {
+ LoginAccessToken = Config.Instance.Token,
+ PageSetting = new SendDataToServer.ResidenceListPageSettingObj { PageSize = 999 }
+ }
};
try
{
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("App/GetHomePager", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("App/GetHomePager", System.Text.Encoding.UTF8.GetBytes(requestJson));
if (revertObj == null)
{
return null;
@@ -234,7 +233,7 @@
if (revertObj.StateCode.ToUpper() == "SUCCESS")
{
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.ResidenceRes>(revertObj.ResponseData.ToString());
- if(responseDataObj.TotalCount>0)
+ if (responseDataObj.TotalCount > 0)
{
//娓呯┖褰撳墠浣忓畢鍒楄〃
Config.Instance.HomeFilePathList.Clear();
@@ -317,7 +316,7 @@
var listHome = new List<Common.House>();
foreach (var housePath in Common.Config.Instance.HomeFilePathList)
{
- var home =this.GetHouseByFilePath(housePath);
+ var home = this.GetHouseByFilePath(housePath);
if (home == null)
{
continue;
--
Gitblit v1.8.0