2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs

@@ -140,7 +140,7 @@
            rowUpDate.ButtonClickEvent += (sender, e) =>

            {

                btnNewVersion.Visible = false;

                var form = new GatewayUpdate.GatewayFirmwareInfoForm();

                var form = new GatewayUpdate.GatewayFirmwareUpdateForm();

                form.AddForm(zbGateway);

            };



@@ -204,7 +204,7 @@
        private void ShowTopRightMenu()

        {

            bool flage = UserCenterResourse.DicActionForm.ContainsKey("NewGateWayMenuSelectForm");

            var frame = new TopRightMenuControl(flage == true ? 1 : 3);

            var frame = new TopRightMenuControl(flage == true ? 1 : 3, 1);

            //定位

            string MenuName = Language.StringByID(R.MyInternationalizationString.uFixedPosition);

            frame.AddRowMenu(MenuName, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>

@@ -366,7 +366,7 @@
                this.CloseForm();



                //关闭指定界面(网关搜索)

                this.CloseFormByFormName("WiredGatewayListForm");

                this.CloseFormByFormName("GatewaySearchListForm");

                this.CloseFormByFormName("NewGateWayMenuSelectForm");



                //关闭指定界面(网关编辑)

@@ -395,21 +395,32 @@
        /// </summary>

        /// <param name="strWayId"></param>

        /// <param name="row"></param>

        private async void DeleteGateway(string strWayId)

        private void DeleteGateway(string strWayId)

        {

            //删除云端网关

            bool result = await HdlGatewayLogic.Current.DeleteGateway(strWayId);

            if (result == false)

            HdlThreadLogic.Current.RunThread(async () =>

            {

                return;

            }

                //打开进度条

                this.ShowProgressBar();



            if (strWayId == GatewayResourse.AppOldSelectGatewayId)

            {

                HdlGatewayLogic.Current.SaveGatewayIdToLocation(string.Empty);

            }

            //关闭自身

            this.CloseForm();

                //删除云端网关

                bool result = await HdlGatewayLogic.Current.DeleteGateway(strWayId);

                //关闭进度条

                this.CloseProgressBar();

                if (result == false)

                {

                    return;

                }



                if (strWayId == GatewayResourse.AppOldSelectGatewayId)

                {

                    HdlGatewayLogic.Current.SaveGatewayIdToLocation(string.Empty);

                }

                HdlThreadLogic.Current.RunMain(() =>

                {

                    //关闭自身

                    this.CloseForm();

                });

            });

        }



        #endregion