上传一个版本

黄学彪

2020-09-01 dee21bf452a8979d0515d13e534fbb69ed9715dd

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs

@@ -55,10 +55,17 @@
        {

            var oTADevice = Common.LocalDevice.Current.GetOTADevice(deviceMac);

            //获取设备最新版本

            this.deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,

            this.deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A设备,

                oTADevice.HwVersion.ToString(),

                oTADevice.ImgTypeId.ToString(),

                oTADevice.ImgVersion);



            //如果当前住宅是虚拟住宅,或者是展示模板,则没有新版本的说法

            if (Common.Config.Instance.Home.IsVirtually == true

                || Common.Config.Instance.Home.IsShowTemplate == true)

            {

                this.deviceFirmware = null;

            }



            if (deviceFirmware != null && deviceFirmware.FirmwareVersion > oTADevice.ImgVersion)

            {

@@ -81,6 +88,10 @@
        /// </summary>
        private void InitTopRightMenu()

        {

            if (UserCenterResourse.HideOption.DeviceHistory != 1)

            {

                return;

            }

            var btnIcon = new MostRightIconControl(69, 69);

            btnIcon.UnSelectedImagePath = "Item/More.png";

            topFrameLayout.AddChidren(btnIcon);

@@ -97,7 +108,7 @@
        /// </summary>
        private void ShowTopRightMenu()

        {

            var frame = new TopRightMenuControl(1);

            var frame = new TopRightMenuControl(1, 2);

            //历史版本

            var deviceMenu = Language.StringByID(R.MyInternationalizationString.uHistoryVersion);

            frame.AddRowMenu(deviceMenu, "", "", () =>

@@ -351,12 +362,12 @@
            ProgressFormBar.Current.CloseEvent += () =>

            {

                //升级对象

                if (FirmwareUpdateResourse.dicDeviceUpdateList.ContainsKey(deviceMac) == true

                    && FirmwareUpdateResourse.dicDeviceUpdateList[deviceMac].IsFinishUpdate == true)

                if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(deviceMac) == true

                    && FirmwareUpdateResourse.dicUpdateList[deviceMac].IsFinishUpdate == true)

                {

                    //如果设备已经升级完成，界面关闭时，则移除内存

                    FirmwareUpdateResourse.dicDeviceUpdateList[deviceMac].Dispose();

                    FirmwareUpdateResourse.dicDeviceUpdateList.Remove(deviceMac);

                    FirmwareUpdateResourse.dicUpdateList[deviceMac].Dispose();

                    FirmwareUpdateResourse.dicUpdateList.Remove(deviceMac);

                }

            };

        }