黄学彪
2020-06-10 dce6c3481a37216292724013ff9d2b75ceb82f86
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
@@ -119,9 +119,10 @@
            btnBeloneArea.AddBottomLine();
            //mini网关有个功能设置
            if (this.zbGateway.getGwInfo != null && this.zbGateway.getGwInfo.LinuxImageType == 11)
            var linuxImageType = this.zbGateway.LinuxImageType;
            if (linuxImageType == 11)
            {
                var listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(HdlGatewayLogic.Current.GetGatewayId(this.zbGateway));
                var listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(this.zbGateway.GwId);
                CommonDevice miniDevice = null;
                foreach (var device in listDevice)
                {
@@ -162,7 +163,7 @@
            rowData.frameTable.ButtonClickEvent += (sender, e) =>
            {
                var form = new GatewayUploadAndDownLoadForm();
                form.AddForm(HdlGatewayLogic.Current.GetGatewayId(this.zbGateway));
                form.AddForm(this.zbGateway.GwId);
            };
            //通用信息
@@ -193,7 +194,7 @@
            btnNewVersion.Visible = false;
            btnNewVersion.X = Application.GetRealWidth(242);
            btnNewVersion.Y = Application.GetRealHeight(23);
            rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEventOnly);
            rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEvent);
            rowUpDate.ButtonClickEvent += (sender, e) =>
            {
                btnNewVersion.Visible = false;
@@ -219,7 +220,7 @@
                if (oldName != btnNote.Text)
                {
                    //修改名字
                    this.SetGatewayName(btnNote.Text, false);
                    this.SetGatewayName(btnNote.Text, true);
                }
                else
                {
@@ -277,7 +278,7 @@
            //切换
            MenuName = Language.StringByID(R.MyInternationalizationString.uSwitch1);
            string strWayId = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
            string strWayId = this.zbGateway.GwId;
            if (strWayId == GatewayResourse.AppOldSelectGatewayId)
            {
                MenuName = Language.StringByID(R.MyInternationalizationString.uRefresh);
@@ -348,34 +349,6 @@
        #endregion
        #region ■ 完成按钮按下_______________________
        /// <summary>
        /// 完成按钮按下
        /// </summary>
        /// <param name="gatewayName">网关名</param>
        private void FinishButtonClick(string gatewayName)
        {
            if (string.IsNullOrEmpty(gatewayName) == true)
            {
                //请输入网关名称
                string msg = Language.StringByID(R.MyInternationalizationString.uGatewayNameMastInput);
                this.ShowMassage(ShowMsgType.Error, msg);
                return;
            }
            string nameValue = HdlGatewayLogic.Current.GetGatewayName(zbGateway);
            if (nameValue == gatewayName)
            {
                //同名不需要处理
                this.CloseForm();
                return;
            }
            //修改名字
            this.SetGatewayName(gatewayName, true);
        }
        #endregion
        #region ■ 修改名字___________________________
        /// <summary>
@@ -408,8 +381,7 @@
        /// <param name="online"></param>
        private async void DoSwitchGateway()
        {
            string gatewayId = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
            var result = await HdlGatewayLogic.Current.DoSwitchGateway(gatewayId);
            var result = await HdlGatewayLogic.Current.DoSwitchGateway(zbGateway.GwId);
            if (result == false)
            {
                return;