Merge branch 'dev-tzy' into dev-2020xm

xm

2020-06-19 eb5a57942bae8eb57fd7fb61124c247bebb67e8e

 Home0618/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs

@@ -40,7 +40,7 @@
        /// <summary>
        /// 显示被绑定设备或场景的view
        /// </summary>
        VerticalFrameRefreshControl midVerticalScrolViewLayout;
        VerticalRefreshLayout midVerticalScrolViewLayout;
        /// <summary>
        /// 显示房间的view
        /// </summary>
@@ -200,7 +200,7 @@
            btnMidTopLayout.AddChidren(btnHorizontalScrolViewLayout);

            //设备栏
            midVerticalScrolViewLayout = new VerticalFrameRefreshControl()
            midVerticalScrolViewLayout = new VerticalRefreshLayout()
            {
                Y = btnMidTopLayout.Bottom,
                Height = Application.GetRealHeight(1145),