From 8b4d79ca03495e522a1953e04ca17527f33c853a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 13:22:17 +0800
Subject: [PATCH] 合并完成代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
index 3d529e1..4eb84cc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
@@ -19,6 +19,10 @@
/// 鏈�澶ч珮搴�
/// </summary>
private int maxHeight = -1;
+ /// <summary>
+ /// 涓�涓病浠�涔堢敤鐨勪笢瑗�
+ /// </summary>
+ private FrameLayout frameBackTemp = null;
#endregion
@@ -78,24 +82,32 @@
/// <param name="addSpace">褰撶湡瀹為珮搴﹁秴杩囧師鏈夐珮搴︽椂,鏄惁娣诲姞绌虹櫧</param>
public void AdjustRealHeight(int bottomSpace, bool addSpace = true)
{
- if (this.ChildrenCount == 0)
+ int count = frameBackTemp == null ? this.ChildrenCount : this.ChildrenCount - 1;
+ if (count <= 0)
{
+ frameBackTemp?.RemoveFromParent();
+ frameBackTemp = null;
//杩樺師涓烘渶澶ч珮搴�
this.Height = maxHeight;
return;
}
+
//璋冩暣鍒楄〃鎺т欢鐨勯珮搴�
- var realHeight = this.ChildrenCount * this.GetChildren(0).Height + bottomSpace;
+ var realHeight = count * 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)
{
- var frameBack = new FrameLayout();
- frameBack.Height = bottomSpace;
- this.AddChidren(frameBack);
+ frameBackTemp?.RemoveFromParent();
+
+ frameBackTemp = new FrameLayout();
+ frameBackTemp.Height = bottomSpace;
+ this.AddChidren(frameBackTemp);
}
}
--
Gitblit v1.8.0