Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs

@@ -64,6 +64,8 @@
            frameBack.Height = bodyFrameLayout.Height - btnFinish.Yaxis;

            bodyFrameLayout.AddChidren(frameBack);



            if (listview.ChildrenCount > 0)

            {

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

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

            {

@@ -72,7 +74,7 @@
                frameTemp.Height = frameBack.Height + Application.GetRealHeight(115);

                listview.AddChidren(frameTemp);

            }

            btnFinish = null;

            }

        }

    }

}