请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

@@ -81,6 +81,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 +101,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 +355,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);

                }

            };

        }