新云端的代码Ver1.0

黄学彪

2020-11-20 99253403b560f761d5f9af8b4f5140496996433a

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

old mode 100755
new mode 100644
File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs
@@ -3,12 +3,12 @@
using System.Text;

using ZigBee.Device;



namespace Shared.Phone.UserCenter

namespace Shared.Phone
{

    /// <summary>

    /// 中央空调的升级逻辑

    /// </summary>

    public class HdlACZbGatewayUpdateLogic : HdlDeviceUpdateCommonLogic

    public class HdlACZbGatewayUpdateLogic : DeviceUpdateCommon
    {

        #region ■ 变量声明___________________________



@@ -67,7 +67,7 @@
        {

            this.ClassDiv = 2;

            this.deviceAc = i_deviceAc;

            this.otaDevice = Common.LocalDevice.Current.GetOTADevice(i_deviceAc.DeviceAddr);

            this.otaDevice = HdlDeviceCommonLogic.Current.GetOTADevice(i_deviceAc.DeviceAddr);
            this.deviceFirmware = i_deviceFirmware;

            this.zbGateway = i_deviceAc.Gateway;

        }

@@ -84,9 +84,9 @@
            if (this.UpdateStatu == UpdateStatuMode.Wait)

            {

                //如果是等待模式，再次点击时，移除列表

                if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(otaDevice.DeviceAddr) == true)

                if (HdlFirmwareUpdateResourse.dicUpdateList.ContainsKey(otaDevice.DeviceAddr) == true)
                {

                    FirmwareUpdateResourse.dicUpdateList.Remove(otaDevice.DeviceAddr);

                    HdlFirmwareUpdateResourse.dicUpdateList.Remove(otaDevice.DeviceAddr);
                }

                //取消

                this.UpdateStatu = UpdateStatuMode.None;

@@ -102,13 +102,13 @@


            //进入等待模式

            this.UpdateStatu = UpdateStatuMode.Wait;

            FirmwareUpdateResourse.dicUpdateList[otaDevice.DeviceAddr] = this;

            HdlFirmwareUpdateResourse.dicUpdateList[otaDevice.DeviceAddr] = this;


            //等待中…

            this.UpdateStatuChangedEvent?.Invoke(0, Language.StringByID(R.MyInternationalizationString.uWaitting));



            //执行下一个可更新的固件的更新操作

            HdlFirmwareUpdateLogic.DoUpdateNextFirmware();

            HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware();
        }



        /// <summary>

@@ -174,8 +174,7 @@
            //下载固件资源

            if (this.deviceFirmware.ImagType != "-100")

            {

                var pra = new { RequestVersion = Common.CommonPage.RequestVersion, DistributedMark = this.deviceFirmware.DistributedMark };

                this.deviceFirmwareByte = Common.CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("FirmwareMana/DownloadPlatformUploadFirmware", Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(pra)));

                this.deviceFirmwareByte = HdlFirmwareUpdateLogic.Current.DowLoadFirmware(FirmwareLevelType.A设备, this.deviceFirmware.DistributedMark);
            }

            else

            {

@@ -475,7 +474,7 @@
            //升级完成

            this.UpdateStatu = UpdateStatuMode.UpdateFinish;



            HdlFirmwareUpdateLogic.DoUpdateNextFirmware();

            HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware();


            //设备升级成功!

            this.UpdateStatuChangedEvent?.Invoke(1, Language.StringByID(R.MyInternationalizationString.uDeviceUpdateSuccess));

@@ -493,7 +492,7 @@
            //状态变更

            this.IsFinishUpdate = true;

            //执行下一个升级

            HdlFirmwareUpdateLogic.DoUpdateNextFirmware();

            HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware();
        }



        /// <summary>

@@ -504,7 +503,7 @@
            //状态变更

            this.IsFinishUpdate = true;

            //执行下一个升级

            HdlFirmwareUpdateLogic.DoUpdateNextFirmware();

            HdlFirmwareUpdateLogic.Current.DoUpdateNextFirmware();
        }



        #endregion