去掉了访问外网的异步

黄学彪

2020-07-06 f23ad1b3f9f6193f35f72104d690b21dc67d5c1f

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs

@@ -1,7 +1,6 @@
using 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