Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs

@@ -277,7 +277,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, "", "", () =>

@@ -402,12 +402,12 @@
            {

                //升级对象

                string gwId = HdlGatewayLogic.Current.GetGatewayId(realway);

                if (FirmwareUpdateResourse.dicGatewayUpdateList.ContainsKey(gwId) == true

                    && FirmwareUpdateResourse.dicGatewayUpdateList[gwId].IsFinishUpdate == true)

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

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

                {

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

                    FirmwareUpdateResourse.dicGatewayUpdateList[gwId].Dispose();

                    FirmwareUpdateResourse.dicGatewayUpdateList.Remove(gwId);

                    FirmwareUpdateResourse.dicUpdateList[gwId].Dispose();

                    FirmwareUpdateResourse.dicUpdateList.Remove(gwId);

                }

            };

        }