From f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 13:32:33 +0800
Subject: [PATCH] 2019-12-30-1
---
ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs
index 668754b..b0b9fc2 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs
@@ -9,6 +9,7 @@
public Action<string> FloorAction;
+ public bool changeFloor;
/// <summary>
/// Init
@@ -60,10 +61,6 @@
TextID = R.MyInternationalizationString.SelectFloor
};
backgroundFL.AddChidren(tip);
- tip.MouseUpEventHandler += (sender, e) =>
- {
- BackgroundColor = ZigbeeColor.Current.GXCRedColor;
- };
var floorLayout = new VerticalScrolViewLayout
{
@@ -101,12 +98,21 @@
frow.TitleButton.MouseUpEventHandler += SelectFloor_MouseUpEvent;
}
+ /// <summary>
+ /// SelectFloor_MouseUpEvent
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="mouseEventArgs"></param>
private void SelectFloor_MouseUpEvent(object sender,MouseEventArgs mouseEventArgs)
{
((sender as Button).Parent as CommonForm.LeftIconButtonRow).IsSelected = true;
- Config.Instance.Home.CurrentFloorId = (sender as Button).Tag.ToString();
- Config.Instance.Home.Save();
- FloorAction?.Invoke(Config.Instance.Home.GetCurrentFloorName);
+ if(changeFloor)
+ {
+ Config.Instance.Home.CurrentFloorId = (sender as Button).Tag.ToString();
+ Config.Instance.Home.Save();
+ }
+
+ FloorAction?.Invoke((sender as Button).Tag.ToString());
RemoveFromParent();
}
}
--
Gitblit v1.8.0