新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

 ZigbeeApp/Shared/Phone/Common/Logic/HdlGatewayUpdateLogic.cs

File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
@@ -4,12 +4,12 @@
using System.Threading.Tasks;
using ZigBee.Device;

namespace Shared.Phone.UserCenter
namespace Shared.Phone
{
    /// <summary>
    /// 网关的升级逻辑
    /// </summary>
    public class HdlGatewayUpdateLogic : HdlDeviceUpdateCommonLogic
    public class HdlGatewayUpdateLogic : DeviceUpdateCommon
    {
        #region ■ 变量声明___________________________

@@ -83,9 +83,9 @@
            {
                //如果是等待模式，再次点击时，移除列表
                string gwId = this.upDatezbGateway.GwId;
                if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(gwId) == true)
                if (HdlFirmwareUpdateResourse.dicUpdateList.ContainsKey(gwId) == true)
                {
                    FirmwareUpdateResourse.dicUpdateList.Remove(gwId);
                    HdlFirmwareUpdateResourse.dicUpdateList.Remove(gwId);
                }
                this.UpdateStatu = UpdateStatuMode.None;
                //取消
@@ -102,12 +102,12 @@
            //进入等待模式
            this.UpdateStatu = UpdateStatuMode.Wait;
            string gwId2 = this.upDatezbGateway.GwId;
            FirmwareUpdateResourse.dicUpdateList[gwId2] = this;
            HdlFirmwareUpdateResourse.dicUpdateList[gwId2] = this;
            //等待中…
            this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uWaitting));

            //执行下一个可更新的固件的更新操作
            HdlFirmwareUpdateLogic.DoUpdateNextFirmware();
            HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware();
        }

        /// <summary>
@@ -748,7 +748,7 @@

                this.UpdateStatu = UpdateStatuMode.UpdateSuccess;
                //执行下一个升级
                HdlFirmwareUpdateLogic.DoUpdateNextFirmware();
                HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware();
                //网关升级成功!
                this.SetProgressValue(100, 100);
                System.Threading.Thread.Sleep(1500);
@@ -772,7 +772,7 @@
            HdlGatewayLogic.Current.SetHadGatewayUpdateFlage(false);

            //执行下一个升级
            HdlFirmwareUpdateLogic.DoUpdateNextFirmware();
            HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware();
        }

        /// <summary>
@@ -786,7 +786,7 @@
            HdlGatewayLogic.Current.SetHadGatewayUpdateFlage(false);

            //执行下一个升级
            HdlFirmwareUpdateLogic.DoUpdateNextFirmware();
            HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware();
        }

        #endregion
@@ -996,7 +996,7 @@
                while (this.IsFinishUpdate == false)
                {
                    //获取版本
                    var result = HdlGatewayLogic.Current.GetGatewayInfo(this.upDatezbGateway, false, ShowErrorMode.NO);
                    var result = HdlGatewayLogic.Current.RefreshGatewayInfo(this.upDatezbGateway, false, ShowErrorMode.NO);
                    if (result != null)
                    {
                        break;