合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

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