From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs | 73 +++++++++++-------------------------
1 files changed, 23 insertions(+), 50 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
index 2ed4d25..e10b04e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
@@ -18,11 +18,11 @@
/// <summary>
/// 妗屽竷鎺т欢
/// </summary>
- private FrameLayout m_frameTable = null;
+ private NormalFrameLayout m_frameTable = null;
/// <summary>
/// 妗屽竷鎺т欢
/// </summary>
- public FrameLayout frameTable
+ public NormalFrameLayout frameTable
{
get
{
@@ -66,10 +66,10 @@
{
return;
}
- this.m_frameTable = new FrameLayout();
+ this.m_frameTable = new NormalFrameLayout();
this.m_frameTable.Width = this.Width;
this.m_frameTable.Height = this.Height;
- this.AddChidren(this.m_frameTable);
+ base.AddChidren(this.m_frameTable);
}
#endregion
@@ -77,78 +77,51 @@
#region 鈻� 娣诲姞瀛愭帶浠禵________________________
/// <summary>
- /// 娣诲姞Frame瀛愭帶浠�(姝ゆ柟娉曟槸鏀瑰彉Y杞�)
+ /// 娣诲姞瀛愭帶浠�(娉ㄦ剰,瀹冩槸寰�涓嬪姞鎺т欢,姝ゆ柟娉曟槸鍙敼鍙榊杞�)
/// </summary>
/// <param name="view"></param>
- public void AddChidrenFrame(FrameLayout frame)
+ public override void AddChidren(View view)
{
//鍒濆鍖栨甯冩帶浠�
this.InitFrameTable();
- int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
+ int value = this.GetLocationMostLastViewBottom(this.frameTable);
if (value != -1)
{
- frame.Y = value + rowSpace;
+ view.Y = value + rowSpace;
}
- this.m_frameTable.AddChidren(frame);
+ this.frameTable.AddChidren(view);
//璋冩暣妗屽竷楂樺害
- if (this.m_frameTable.Height < frame.Bottom)
+ if (this.frameTable.Height < view.Bottom)
{
- this.m_frameTable.Height = frame.Bottom;
+ this.frameTable.Height = view.Bottom;
}
}
/// <summary>
- /// 娣诲姞Frame瀛愭帶浠�(姝ゆ柟娉曟槸鏀瑰彉楂樺害)
+ /// 娣诲姞瀛愭帶浠�(娉ㄦ剰,瀹冩槸寰�涓嬪姞鎺т欢,姝ゆ柟娉曟槸鏀瑰彉楂樺害)
/// </summary>
/// <param name="view"></param>
- public void AddChidrenFrame2(FrameLayout frame)
+ public void AddChidren2(View view)
{
//鍒濆鍖栨甯冩帶浠�
this.InitFrameTable();
//鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
- int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
+ int value = this.GetLocationMostLastViewBottom(this.frameTable);
if (value != -1)
{
- frame.Y = value;
+ view.Y = value;
}
- this.m_frameTable.AddChidren(frame);
+ this.frameTable.AddChidren(view);
if (rowSpace > 0)
{
- frame.Height += rowSpace;
+ view.Height += rowSpace;
}
//璋冩暣妗屽竷楂樺害
- if (this.m_frameTable.Height < frame.Bottom)
+ if (this.frameTable.Height < view.Bottom)
{
- this.m_frameTable.Height = frame.Bottom;
- }
- }
-
- /// <summary>
- /// 娣诲姞Frame瀛愭帶浠�(姝ゆ柟娉曟槸鏀瑰彉楂樺害)
- /// </summary>
- /// <param name="row"></param>
- public void AddChidrenRow(RowLayout row)
- {
- //鍒濆鍖栨甯冩帶浠�
- this.InitFrameTable();
-
- //鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
- int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
- if (value != -1)
- {
- row.Y = value;
- }
- this.m_frameTable.AddChidren(row);
- if (rowSpace > 0)
- {
- row.Height += rowSpace;
- }
- //璋冩暣妗屽竷楂樺害
- if (this.m_frameTable.Height < row.Bottom)
- {
- this.m_frameTable.Height = row.Bottom;
+ this.frameTable.Height = view.Bottom;
}
}
@@ -185,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
{
@@ -208,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;
@@ -219,7 +192,7 @@
this.frameBackTemp = new FrameLayout();
frameBackTemp.Height = ControlCommonResourse.BodyFrameHeight - btnTemp.Yaxis + Application.GetRealHeight(23);
- this.AddChidrenFrame(frameBackTemp);
+ this.AddChidren(frameBackTemp);
this.rowSpace = oldRowSpace;
}
--
Gitblit v1.8.0