From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
index 7f5b774..e10b04e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.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;
}
}
@@ -108,20 +108,20 @@
this.InitFrameTable();
//鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
- int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
+ int value = this.GetLocationMostLastViewBottom(this.frameTable);
if (value != -1)
{
view.Y = value;
}
- this.m_frameTable.AddChidren(view);
+ this.frameTable.AddChidren(view);
if (rowSpace > 0)
{
view.Height += rowSpace;
}
//璋冩暣妗屽竷楂樺害
- if (this.m_frameTable.Height < view.Bottom)
+ if (this.frameTable.Height < view.Bottom)
{
- this.m_frameTable.Height = view.Bottom;
+ this.frameTable.Height = view.Bottom;
}
}
@@ -158,11 +158,11 @@
}
//鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
- int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
+ int value = this.GetLocationMostLastViewBottom(this.frameTable);
if (value != -1)
{
//璋冩暣妗屽竷楂樺害
- this.m_frameTable.Height = value + buttomSpace;
+ this.frameTable.Height = value + buttomSpace;
}
else
{
@@ -181,7 +181,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