From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 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..9d31add 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
@@ -19,6 +19,25 @@
/// 鏈�澶ч珮搴�
/// </summary>
private int maxHeight = -1;
+ /// <summary>
+ /// 涓�涓病浠�涔堢敤鐨勪笢瑗�
+ /// </summary>
+ private FrameLayout frameBackTemp = null;
+ /// <summary>
+ /// 鑷畾涔夌殑鑾峰彇瀛愭帶浠朵釜鏁�
+ /// </summary>
+ public new int ChildrenCount
+ {
+ get
+ {
+ int count = base.ChildrenCount;
+ if (frameBackTemp != null)
+ {
+ count--;
+ }
+ return count < 0 ? 0 : count;
+ }
+ }
#endregion
@@ -78,24 +97,35 @@
/// <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)
{
- //杩樺師涓烘渶澶ч珮搴�
- this.Height = maxHeight;
+ frameBackTemp?.RemoveFromParent();
+ frameBackTemp = null;
+ if (maxHeight != -1)
+ {
+ //杩樺師涓烘渶澶ч珮搴�
+ 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