From 5095bb05ab8ef77e2edc3cad2b94f9d75b30f193 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 13 五月 2020 16:09:21 +0800
Subject: [PATCH] 222222222
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
old mode 100755
new mode 100644
index 8554310..24c3bdf
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
@@ -42,7 +42,15 @@
public VerticalFrameRefreshControl(int i_rowSpace = 0)
{
rowSpace = Application.GetRealHeight(i_rowSpace);
- this.VerticalScrollBarEnabled = false;
+ this.VerticalScrollBarEnabled = false;
+
+#if iOS
+ //鑷姩鍋忕Щ鍙栨秷
+ if (UIKit.UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
+ {
+ (this.uiView as UIKit.UIScrollView).ContentInsetAdjustmentBehavior = UIKit.UIScrollViewContentInsetAdjustmentBehavior.Never;
+ }
+#endif
}
/// <summary>
@@ -65,7 +73,7 @@
#region 鈻� 娣诲姞瀛愭帶浠禵________________________
/// <summary>
- /// 娣诲姞Frame瀛愭帶浠�
+ /// 娣诲姞Frame瀛愭帶浠�(姝ゆ柟娉曟槸鏀瑰彉Y杞�)
/// </summary>
/// <param name="view"></param>
public void AddChidrenFrame(FrameLayout frame)
@@ -83,6 +91,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 +171,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