From a45fe56aeeac8f28a9891b83362954067c8166dc Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 14 八月 2020 09:07:05 +0800
Subject: [PATCH] 请合并新代码，更改多功能面板绑定表重复问题
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
index fd43d18..cea4fbb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
@@ -85,16 +85,16 @@
this.InitFrameTable();
//鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
- int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
+ int value = this.GetLocationMostLastViewBottom(this.frameTable);
if (value != -1)
{
view.Y = value + rowSpace;
}
- this.m_frameTable.AddChidren(view);
+ this.frameTable.AddChidren(view);
//璋冩暣妗屽竷楂樺害
- if (this.m_frameTable.Height < view.Bottom)
+ if (this.frameTable.Height < view.Bottom)
{
- this.m_frameTable.Height = view.Bottom;
+ this.frameTable.Height = view.Bottom;
}
}
@@ -125,10 +125,16 @@
/// 璋冩暣瀛怓rameLayout鐨勭湡瀹為珮搴�
/// </summary>
/// <param name="frame"></param>
- public void AdjustChidrenFrameRealHeight(FrameLayout frame)
+ /// <param name="minHeight">鏈�灏忛珮搴�</param>
+ public void AdjustChidrenFrameRealHeight(FrameLayout frame, int minHeight = -1)
{
//鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
int value = this.GetLocationMostLastViewBottom(frame);
+ if (minHeight != -1 && value < minHeight)
+ {
+ //娌℃湁瓒呰繃鏈�灏忛珮搴�
+ return;
+ }
if (value != -1)
{
//璋冩暣妗屽竷楂樺害
@@ -148,11 +154,11 @@
}
//鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
- int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
+ int value = this.GetLocationMostLastViewBottom(this.frameTable);
if (value != -1)
{
//璋冩暣妗屽竷楂樺害
- this.m_frameTable.Height = value;
+ this.frameTable.Height = value;
}
else
{
@@ -174,7 +180,7 @@
this.AdjustTableHeight();
var btnTemp = new BottomClickButton();
- if (btnTemp.Yaxis >= this.m_frameTable.Height + correctionsValue)
+ if (btnTemp.Yaxis >= this.frameTable.Height + correctionsValue)
{
//娌℃湁瓒呰繃
return;
--
Gitblit v1.8.0