From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
index 8554310..42583b1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
@@ -65,7 +65,7 @@
#region 鈻� 娣诲姞瀛愭帶浠禵________________________
/// <summary>
- /// 娣诲姞Frame瀛愭帶浠�
+ /// 娣诲姞Frame瀛愭帶浠�(姝ゆ柟娉曟槸鏀瑰彉Y杞�)
/// </summary>
/// <param name="view"></param>
public void AddChidrenFrame(FrameLayout frame)
@@ -83,6 +83,58 @@
if (this.m_frameTable.Height < frame.Bottom)
{
this.m_frameTable.Height = frame.Bottom;
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞Frame瀛愭帶浠�(姝ゆ柟娉曟槸鏀瑰彉楂樺害)
+ /// </summary>
+ /// <param name="view"></param>
+ public void AddChidrenFrame2(FrameLayout frame)
+ {
+ //鍒濆鍖栨甯冩帶浠�
+ this.InitFrameTable();
+
+ var child = this.m_frameTable.GetChildren(this.m_frameTable.ChildrenCount - 1);
+ if (child != null)
+ {
+ frame.Y = child.Bottom;
+ }
+ this.m_frameTable.AddChidren(frame);
+ if (rowSpace > 0)
+ {
+ frame.Height += rowSpace;
+ }
+ //璋冩暣妗屽竷楂樺害
+ if (this.m_frameTable.Height < frame.Bottom)
+ {
+ this.m_frameTable.Height = frame.Bottom;
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞Frame瀛愭帶浠�(姝ゆ柟娉曟槸鏀瑰彉楂樺害)
+ /// </summary>
+ /// <param name="row"></param>
+ public void AddChidrenRow(RowLayout row)
+ {
+ //鍒濆鍖栨甯冩帶浠�
+ this.InitFrameTable();
+
+ var child = this.m_frameTable.GetChildren(this.m_frameTable.ChildrenCount - 1);
+ if (child != null)
+ {
+ row.Y = child.Bottom;
+ }
+ this.m_frameTable.AddChidren(row);
+ if (rowSpace > 0)
+ {
+ row.Height += rowSpace;
+ }
+ //璋冩暣妗屽竷楂樺害
+ if (this.m_frameTable.Height < row.Bottom)
+ {
+ this.m_frameTable.Height = row.Bottom;
}
}
@@ -111,13 +163,14 @@
/// <summary>
/// 璋冩暣妗屽竷楂樺害
/// </summary>
- public void AdjustTableHeight()
+ /// <param name="buttomSpace">搴曢儴绌虹櫧闂磋窛(鐪熷疄鍊�)</param>
+ public void AdjustTableHeight(int buttomSpace = 0)
{
var child = this.m_frameTable?.GetChildren(this.m_frameTable.ChildrenCount - 1);
if (child != null)
{
//璋冩暣妗屽竷楂樺害
- this.m_frameTable.Height = child.Bottom;
+ this.m_frameTable.Height = child.Bottom + buttomSpace;
//if (this.m_frameTable.Height < child.Bottom)
//{
// this.m_frameTable.Height = child.Bottom;
--
Gitblit v1.8.0