代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -351,12 +351,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);

                }

            };

        }