合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs

@@ -180,18 +180,6 @@
            this.AddBindRow();

            //添加背光灯行

            this.AddBackLightRow();



            //借用Y轴坐标

            var btnTemp = new BottomClickButton();

            var realHeight = listview.GetChildren(0).Height * listview.ChildrenCount;

            if (bodyFrameLayout.Height - btnTemp.Yaxis + realHeight > listview.Height)

            {

                //促使被挡住的菜单能够向上滑动

                var frameTemp = new FrameLayout();

                frameTemp.Height = bodyFrameLayout.Height - btnTemp.Yaxis + Application.GetRealHeight(115);

                listview.AddChidren(frameTemp);

            }

            btnTemp = null;

        }



        #endregion

@@ -227,7 +215,7 @@
            {

                menuCount = 2;

            }

            var frame = new TopRightMenuControl(this, menuCount);

            var frame = new TopRightMenuControl(menuCount);

            if (canTest == true)

            {

                //定位