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

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

@@ -55,13 +55,13 @@
            //清空bodyFrame

            this.ClearBodyFrame();



            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //开启进度条

                this.ShowProgressBar();



                //获取网关新版本信息

                this.listVersionInfo = await HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway);

                this.listVersionInfo = HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway);

                if (listVersionInfo == null)

                {

                    //关闭进度条

@@ -69,7 +69,7 @@
                    return;

                }

                //虚拟驱动号

                this.listVode = await HdlGatewayLogic.Current.GetListVDDriveCode(this.zbGateway);

                this.listVode = HdlGatewayLogic.Current.GetListVDDriveCode(this.zbGateway);

                //关闭进度条

                this.CloseProgressBar();



@@ -119,7 +119,7 @@
            rowLinux.ButtonClickEvent += (sender, e) =>

            {

                var form = new GatewayLinuxInfoForm();

                form.AddForm(HdlGatewayLogic.Current.GetGatewayId(this.zbGateway));

                form.AddForm(this.zbGateway.GwId);

            };



            //协调器

@@ -130,7 +130,7 @@
            rowCoordinator.ButtonClickEvent += (sender, e) =>

            {

                var form = new GatewayCoordinatorInfoForm();

                form.AddForm(HdlGatewayLogic.Current.GetGatewayId(this.zbGateway));

                form.AddForm(this.zbGateway.GwId);

            };



            if (this.listVode != null)

@@ -261,6 +261,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);

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

@@ -401,13 +405,13 @@
            ProgressFormBar.Current.CloseEvent += () =>

            {

                //升级对象

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

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

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

                string gwId = realway.GwId;

                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);

                }

            };

        }