Evoyo.Home1.1.0120111601_Release

黄学彪

2020-11-19 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a

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

@@ -70,7 +70,7 @@
            string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);

            string nameValue = HdlGatewayLogic.Current.GetGatewayName(zbGateway);

            var btnNote = new FrameCaptionInputControl(caption, nameValue, listview.rowSpace / 2);

            btnNote.txtInput.MaxByte = 48;//限制只能输入48个字节

            btnNote.txtInput.MaxByte = 32;//限制只能输入32个字节

            listview.AddChidren(btnNote);

            btnNote.InitControl();

            //划线

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

            {

                //变更网关房间

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

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

            };

            //如果是展示模板的话,不能编辑

            if (Common.Config.Instance.Home.IsShowTemplate == true)

@@ -294,8 +294,29 @@
        /// </summary>

        private void ShowTopRightMenu()

        {

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

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

            //搜索网关的时候,不能删除,不给他切换,只有定位功能

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

            int menuCount = isSearchGw == true ? 1 : 3;



            bool canAddReplaceMenu = false;

            //获取本地网关

            var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();

            foreach (var gw in listGateway)

            {

                if (gw.GwId != this.zbGateway.GwId && gw.LinuxImageType == this.zbGateway.LinuxImageType)

                {

                    //如果是同一种类型的网关,允许出现替换菜单

                    canAddReplaceMenu = true;

                    break;

                }

            }

            if (canAddReplaceMenu == true

                && Common.Config.Instance.Home.IsShowTemplate == false

                && Common.Config.Instance.Home.IsVirtually == false)

            {

                //menuCount++;

            }

            var frame = new TopRightMenuControl(menuCount, 1);

            //定位

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

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

@@ -303,12 +324,10 @@
                //发送定位功能

                HdlGatewayLogic.Current.SetFixedPositionCommand(zbGateway);

            });

            if (flage == true)

            {

                //搜索网关的时候,不能删除,不给他切换

                return;

            }



            //搜索网关的时候,不能删除,不给他切换

            if (isSearchGw == false)

            {

            //切换

            MenuName = Language.StringByID(R.MyInternationalizationString.uSwitch1);

            string strWayId = this.zbGateway.GwId;

@@ -351,6 +370,15 @@
                });

            });

        }

            //if (canAddReplaceMenu == true)

            //{

            //    //替换

            //    MenuName = Language.StringByID(R.MyInternationalizationString.uReplace);

            //    frame.AddRowMenu(MenuName, null, "Item/ReplaceIconSelected.png", () =>

            //    {

            //    });

            //}

        }

        #endregion



        #region ■ 检测新版本_________________________