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/CompoundControls/TopRightFloorMenuControl.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs
index 9238cc3..4ed629e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs
@@ -35,6 +35,10 @@
/// 琛屾暟
/// </summary>
private int RowCount = 0;
+ /// <summary>
+ /// 褰撳墠妤煎眰id
+ /// </summary>
+ private string nowFloorId = string.Empty;
#endregion
@@ -48,9 +52,11 @@
/// <para>1: 395瀹藉害</para>
/// <para>2: 449瀹藉害</para>
/// </param>
+ /// <param name="i_floorId">褰撳墠閫夋嫨鐨勬ゼ灞侷D</param>
/// <param name="titleText">鏍囬鏂囨湰(濡傛灉涓嶄负绌�,鑿滃崟妯″紡鍙樻洿涓烘嫢鏈夋爣棰樼殑妯″紡)</param>
- public TopRightFloorMenuControl(int i_RowCount, int i_widthType, string titleText = null)
+ public TopRightFloorMenuControl(int i_RowCount, int i_widthType,string i_floorId, string titleText = null)
{
+ this.nowFloorId = i_floorId;
this.RowCount = i_RowCount;
if (i_widthType == 1)
{
@@ -162,7 +168,7 @@
btnLine.X = Application.GetRealWidth(81);
}
- if (floorId == Common.Config.Instance.Home.CurrentFloorId)
+ if (this.nowFloorId == floorId)
{
//褰撳墠妤煎眰榛樿璁剧疆涓洪�夋嫨鐘舵��
this.SetRowSelectStatu(rowFrame, true);
--
Gitblit v1.8.0