不是新代码，别 合并

黄学彪

2020-08-07 ec34983e291d1c85284472a27109d55891f9a6b5

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

@@ -90,7 +90,8 @@


            //设备类型 (固定智能网关)

            caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);

            var btnType = new FrameCaptionViewControl(caption, Language.StringByID(60004), listview.rowSpace / 2);

            var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("1");

            var btnType = new FrameCaptionViewControl(caption, infoContent != null ? infoContent.A类型名字 : string.Empty, listview.rowSpace / 2);

            btnType.UseClickStatu = false;

            listview.AddChidren(btnType);

            btnType.InitControl();

@@ -106,7 +107,7 @@
            rowBeloneArea.SelectRoomEvent += (roomKeys) =>

            {

                //变更网关房间

                HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway, roomKeys);

                HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway.GwId, roomKeys);

            };



            //所属住宅

@@ -326,15 +327,15 @@
        /// 检测新版本

        /// </summary>

        /// <param name="btnNewVersion">提示有新版本的控件</param>

        private async void CheckNewVersion(PicViewControl btnNewVersion)

        private void CheckNewVersion(PicViewControl btnNewVersion)

        {

            //获取网关版本信息

            var result = await HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway);

            var result = HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway, ShowErrorMode.NO);

            if (result == null)

            {

                return;

            }

            Application.RunOnMainThread(() =>

            HdlThreadLogic.Current.RunMain(() =>

            {

                if (this.Parent != null)

                {

@@ -344,7 +345,7 @@
                        btnNewVersion.Visible = true;

                    }

                }

            });

            }, ShowErrorMode.NO);

        }



        #endregion

@@ -355,10 +356,10 @@
        /// 设置网关名字

        /// </summary>

        /// <param name="gatewayName">网关名称</param>

        private async void SetGatewayName(string gatewayName, bool closeForm)

        private void SetGatewayName(string gatewayName, bool closeForm)

        {

            //修改网关名

            var result = await HdlGatewayLogic.Current.ReName(zbGateway, gatewayName);

            var result = HdlGatewayLogic.Current.ReName(zbGateway, gatewayName);

            //网关修改失败

            if (result == false)

            {

@@ -379,9 +380,9 @@
        /// </summary>

        /// <param name="gatewayId"></param>

        /// <param name="online"></param>

        private async void DoSwitchGateway()

        private void DoSwitchGateway()

        {

            var result = await HdlGatewayLogic.Current.DoSwitchGateway(zbGateway.GwId);

            var result = HdlGatewayLogic.Current.DoSwitchGateway(zbGateway.GwId);

            if (result == false)

            {

                return;

@@ -424,13 +425,13 @@
        /// <param name="row"></param>

        private void DeleteGateway(string strWayId)

        {

            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //打开进度条

                this.ShowProgressBar();



                //删除云端网关

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

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

                //关闭进度条

                this.CloseProgressBar();

                if (result == false)