From ddb46a700775aacfb6cc82d9586302a38c8fa0a7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 23 十二月 2019 09:13:37 +0800
Subject: [PATCH] 2019.12.23
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
index 5dc08ac..780cd57 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
@@ -31,7 +31,7 @@
get
{
int count = base.ChildrenCount;
- if (frameBackTemp != null)
+ if (frameBackTemp != null && frameBackTemp.Parent != null)
{
count--;
}
@@ -49,7 +49,7 @@
/// <param name="i_rowSpace">琛屼箣闂寸殑闂磋窛(杩欎釜鍊兼槸涓庤鎺т欢缁戝畾涓�璧蜂娇鐢ㄧ殑)</param>
public VerticalListControl(int i_rowSpace = 0)
{
- rowSpace = Application.GetRealHeight(i_rowSpace);
+ this.rowSpace = Application.GetRealHeight(i_rowSpace);
}
#endregion
@@ -97,7 +97,7 @@
/// <param name="addSpace">褰撶湡瀹為珮搴﹁秴杩囧師鏈夐珮搴︽椂,鏄惁娣诲姞绌虹櫧</param>
public void AdjustRealHeight(int bottomSpace, bool addSpace = true)
{
- int count = frameBackTemp == null ? this.ChildrenCount : this.ChildrenCount - 1;
+ int count = this.ChildrenCount;
if (count <= 0)
{
frameBackTemp?.RemoveFromParent();
@@ -133,7 +133,8 @@
/// 閽堝搴曢儴鐐瑰嚮鎸夐挳,璋冩暣鎺т欢鐪熷疄楂樺害
/// </summary>
/// <param name="bottomSpace">搴曢儴绌虹櫧闂磋窛(鐪熷疄鍊�,濡傛灉鍒楄〃鎺т欢鐪熷疄楂樺害娌℃湁瓒呰繃鏃�,浣跨敤姝ゅ��)</param>
- public void AdjustRealHeightByBottomButton(int bottomSpace)
+ /// <param name="correctionsValue">Y杞磋ˉ姝ｅ��(鐪熷疄鍊�,鍒楄〃鎺т欢涓嶅湪bodyFramelayout鐨勬椂鍊欎娇鐢�)</param>
+ public void AdjustRealHeightByBottomButton(int bottomSpace, int correctionsValue = 0)
{
if (this.ChildrenCount == 0)
{
@@ -146,7 +147,7 @@
}
return;
}
- var realHeight = this.ChildrenCount * this.GetChildren(0).Height + this.Y;
+ var realHeight = this.ChildrenCount * this.GetChildren(0).Height + this.Y + correctionsValue;
var btnTemp = new BottomClickButton();
if (btnTemp.Yaxis >= realHeight)
{
@@ -160,7 +161,7 @@
//娣诲姞涓存椂鎺т欢,鐩磋嚦鍙互婊戝姩瓒呰繃搴曢儴鎸夐挳
frameBackTemp?.RemoveFromParent();
frameBackTemp = new FrameLayout();
- frameBackTemp.Height = ControlCommonResourse.BodyFrameHeight - btnTemp.Y;
+ frameBackTemp.Height = ControlCommonResourse.BodyFrameHeight - btnTemp.Yaxis + bottomSpace;
this.AddChidren(frameBackTemp);
}
--
Gitblit v1.8.0