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/HdlFirmwareUpdateLogic.cs | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
index d98fca7..0bade2f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
@@ -1,7 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
-using System.Threading.Tasks;
namespace Shared.Phone.UserCenter
{
@@ -66,18 +65,18 @@
#region 鈻� 娣诲姞鍗囩骇鍥轰欢淇℃伅___________________
/// <summary>
- /// 娣诲姞鍗囩骇鍥轰欢淇℃伅
+ /// 娣诲姞鍗囩骇鍥轰欢淇℃伅 1:姝ｅ父 -1:娌＄綉,鑾峰彇涓嶅埌涓滆タ
/// </summary>
/// <param name="levelType">鍥轰欢闃剁骇鍒嗙被</param>
/// <param name="HardwareVersion">纭欢鐗堟湰</param>
/// <param name="imgType">闀滃儚绫诲瀷</param>
/// <returns></returns>
- public async static Task<bool> AddFirmwareVersionInfo(FirmwareLevelType levelType, string HardwareVersion, string imgType)
+ public static int AddFirmwareVersionInfo(FirmwareLevelType levelType, string HardwareVersion, string imgType)
{
//妫�娴嬫湰鍦版槸鍚﹀凡缁忔湁杩欎釜缂撳瓨浜�
if (IsEsixtFirmwareVersionInfo(levelType, HardwareVersion, imgType) == true)
{
- return true;
+ return 1;
}
var Pra = new GetFirmwareVersionPra();
Pra.PageSetting.Page = 1;
@@ -90,7 +89,7 @@
Pra.FirmwareManaSecondType = 0;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = await GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.Linux, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.Linux, Pra);
return result;
}
else if (levelType == FirmwareLevelType.Coordinator)
@@ -100,7 +99,7 @@
Pra.FirmwareManaSecondType = 1;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = await GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.Coordinator, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.Coordinator, Pra);
return result;
}
else if (levelType == FirmwareLevelType.VirtualDevice)
@@ -110,7 +109,7 @@
Pra.FirmwareManaSecondType = 2;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = await GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.VirtualDevice, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.VirtualDevice, Pra);
return result;
}
else
@@ -120,29 +119,28 @@
Pra.FirmwareManaSecondType = null;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = await GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.ZigbeeDevice, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.ZigbeeDevice, Pra);
return result;
}
}
/// <summary>
- /// 鑾峰彇浜戠鐨勫浐浠讹紝鐒跺悗瀛樺叆缂撳瓨涓�
+ /// 鑾峰彇浜戠鐨勫浐浠讹紝鐒跺悗瀛樺叆缂撳瓨涓� 1:姝ｅ父 -1:娌＄綉,鑾峰彇涓嶅埌涓滆タ
/// </summary>
/// <param name="levelType"></param>
/// <param name="pra"></param>
/// <returns></returns>
- private async static Task<bool> GetFirmwareVersionAndSetToMemmory(FirmwareLevelType levelType, GetFirmwareVersionPra pra)
+ private static int GetFirmwareVersionAndSetToMemmory(FirmwareLevelType levelType, GetFirmwareVersionPra pra)
{
- var listNotShow = new List<string>() { "NotSetAgain" };
- string resultValue = await UserCenterLogic.GetResponseDataByRequestHttps("FirmwareMana/DetectionPlatformUploadFirmware", false, pra, listNotShow);
+ string resultValue = UserCenterLogic.GetResponseDataByRequestHttps("FirmwareMana/DetectionPlatformUploadFirmware", false, pra);
if (string.IsNullOrEmpty(resultValue) == true)
{
- return false;
+ return -1;
}
var verResult = Newtonsoft.Json.JsonConvert.DeserializeObject<FirmwareVersionResult>(resultValue);
if (verResult.PageData.Count == 0)
{
- return true;
+ return 1;
}
//纭欢鐗堟湰
@@ -199,7 +197,7 @@
catch { continue; }
}
- return true;
+ return 1;
}
#endregion
--
Gitblit v1.8.0