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/VerticalFrameControl.cs | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
old mode 100755
new mode 100644
index f2add7e..ac8eb1d
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
@@ -41,7 +41,14 @@
/// <param name="i_rowSpace">琛屼箣闂寸殑闂磋窛(杩欎釜鍊兼槸涓庤鎺т欢缁戝畾涓�璧蜂娇鐢ㄧ殑)</param>
public VerticalFrameControl(int i_rowSpace = 0)
{
- rowSpace = Application.GetRealHeight(i_rowSpace);
+ rowSpace = Application.GetRealHeight(i_rowSpace);
+#if iOS
+ //鑷姩鍋忕Щ鍙栨秷
+ if (UIKit.UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
+ {
+ (this.uiView as UIKit.UIScrollView).ContentInsetAdjustmentBehavior = UIKit.UIScrollViewContentInsetAdjustmentBehavior.Never;
+ }
+#endif
}
/// <summary>
@@ -97,7 +104,7 @@
public void AdjustChidrenFrameHeight(FrameLayout frame, int buttomSpace)
{
//鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
- int value = this.GetLocationMostLastViewBottom();
+ int value = this.GetLocationMostLastViewBottom(frame);
if (value != -1)
{
//璋冩暣妗屽竷楂樺害
@@ -114,7 +121,7 @@
public void AdjustTableHeight()
{
//鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
- int value = this.GetLocationMostLastViewBottom();
+ int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
if (value != -1)
{
//璋冩暣妗屽竷楂樺害
@@ -135,9 +142,12 @@
return;
}
//娣诲姞涓存椂鎺т欢,鐩磋嚦鍙互婊戝姩瓒呰繃搴曢儴鎸夐挳
+ int oldRowSpace = this.rowSpace;
+ this.rowSpace = 0;
var frameBackTemp = new FrameLayout();
frameBackTemp.Height = ControlCommonResourse.BodyFrameHeight - btnTemp.Yaxis + Application.GetRealHeight(23);
this.AddChidrenFrame(frameBackTemp);
+ this.rowSpace = oldRowSpace;
}
/// <summary>
@@ -155,15 +165,15 @@
/// 鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
/// </summary>
/// <returns></returns>
- private int GetLocationMostLastViewBottom()
+ private int GetLocationMostLastViewBottom(FrameLayout frame)
{
int bottomHeight = -1;
- if (this.m_frameTable == null) { return bottomHeight; }
+ if (frame == null) { return bottomHeight; }
- for (int i = 0; i < this.m_frameTable.ChildrenCount; i++)
+ for (int i = 0; i < frame.ChildrenCount; i++)
{
- var child = this.m_frameTable.GetChildren(i);
+ var child = frame.GetChildren(i);
if (child.Bottom > bottomHeight)
{
bottomHeight = child.Bottom;
--
Gitblit v1.8.0