From ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:15:59 +0800
Subject: [PATCH] Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
index 4eb84cc..3d529e1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
@@ -19,10 +19,6 @@
/// 鏈�澶ч珮搴�
/// </summary>
private int maxHeight = -1;
- /// <summary>
- /// 涓�涓病浠�涔堢敤鐨勪笢瑗�
- /// </summary>
- private FrameLayout frameBackTemp = null;
#endregion
@@ -82,32 +78,24 @@
/// <param name="addSpace">褰撶湡瀹為珮搴﹁秴杩囧師鏈夐珮搴︽椂,鏄惁娣诲姞绌虹櫧</param>
public void AdjustRealHeight(int bottomSpace, bool addSpace = true)
{
- int count = frameBackTemp == null ? this.ChildrenCount : this.ChildrenCount - 1;
- if (count <= 0)
+ if (this.ChildrenCount == 0)
{
- frameBackTemp?.RemoveFromParent();
- frameBackTemp = null;
//杩樺師涓烘渶澶ч珮搴�
this.Height = maxHeight;
return;
}
-
//璋冩暣鍒楄〃鎺т欢鐨勯珮搴�
- var realHeight = count * this.GetChildren(0).Height + bottomSpace;
+ var realHeight = this.ChildrenCount * this.GetChildren(0).Height + bottomSpace;
if (realHeight < this.Height)
{
- frameBackTemp?.RemoveFromParent();
- frameBackTemp = null;
//缂╁皬鎺т欢楂樺害
this.Height = realHeight;
}
else if (addSpace == true && bottomSpace > 0 && realHeight > this.maxHeight)
{
- frameBackTemp?.RemoveFromParent();
-
- frameBackTemp = new FrameLayout();
- frameBackTemp.Height = bottomSpace;
- this.AddChidren(frameBackTemp);
+ var frameBack = new FrameLayout();
+ frameBack.Height = bottomSpace;
+ this.AddChidren(frameBack);
}
}
--
Gitblit v1.8.0