2020-03-12-1

WJC

2020-03-12 c47c3ec2488961b3a006aaebcb03dba582f8b19b

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

@@ -395,10 +395,17 @@
        /// </summary>

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

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

        private async void DeleteGateway(string strWayId)

        private void DeleteGateway(string strWayId)

        {

            HdlThreadLogic.Current.RunThread(async () =>

            {

                //打开进度条

                this.ShowProgressBar();



            //删除云端网关

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

                //关闭进度条

                this.CloseProgressBar();

            if (result == false)

            {

                return;

@@ -408,8 +415,12 @@
            {

                HdlGatewayLogic.Current.SaveGatewayIdToLocation(string.Empty);

            }

                HdlThreadLogic.Current.RunMain(() =>

                {

            //关闭自身

            this.CloseForm();

                });

            });

        }



        #endregion