From 3272ca5b51e19f7f8a827b0f68400570a547fe60 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 15:02:44 +0800
Subject: [PATCH] 2020-04-28-1
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
index ed9c5a9..9d2e43b 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
@@ -87,6 +87,9 @@
if (this.maxHeight != -1)
{
this.Height = this.maxHeight;
+#if iOS
+ this.ReLocation();
+#endif
}
}
@@ -97,16 +100,14 @@
/// <param name="addSpace">褰撶湡瀹為珮搴﹁秴杩囧師鏈夐珮搴︽椂,鏄惁娣诲姞绌虹櫧</param>
public void AdjustRealHeight(int bottomSpace, bool addSpace = true)
{
- int count = frameBackTemp == null ? this.ChildrenCount : this.ChildrenCount - 1;
+ //鎬讳箣,鍏堥噸缃嚦鏈�澶�
+ this.RecoverHeight();
+
+ int count = this.ChildrenCount;
if (count <= 0)
{
frameBackTemp?.RemoveFromParent();
frameBackTemp = null;
- if (maxHeight != -1)
- {
- //杩樺師涓烘渶澶ч珮搴�
- this.Height = maxHeight;
- }
return;
}
@@ -118,6 +119,9 @@
frameBackTemp = null;
//缂╁皬鎺т欢楂樺害
this.Height = realHeight;
+#if iOS
+ this.ReLocation();
+#endif
}
else if (addSpace == true && bottomSpace > 0 && realHeight > this.maxHeight)
{
@@ -144,6 +148,9 @@
{
//杩樺師涓烘渶澶ч珮搴�
this.Height = maxHeight;
+#if iOS
+ this.ReLocation();
+#endif
}
return;
}
--
Gitblit v1.8.0