Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs

@@ -1,4 +1,5 @@
using System;

using Shared.Common;

using System;

using System.Collections.Generic;

using System.Text;

using System.Threading.Tasks;

@@ -209,18 +210,6 @@
            this.AddBindRow(listRelayInfo7);

            //添加背光灯行

            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