From af0266fa5570b6adcdb22f631bf13170e8646ca5 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:15:21 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs
old mode 100755
new mode 100644
index 53cd5e5..93f30a9
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs
@@ -35,9 +35,9 @@
UnSelectedImagePath="Item/SelectFloor_Left.png"
};
dialog.AddChidren(bg);
- if(direction==CommonForm.Direction.Right)
+ if (direction == CommonForm.Direction.Right)
{
- bg.UnSelectedImagePath = "";
+ bg.UnSelectedImagePath = "Item/SelectFloor_Right.png";
}
var backgroundFL = new FrameLayout
@@ -60,10 +60,6 @@
TextID = R.MyInternationalizationString.SelectFloor
};
backgroundFL.AddChidren(tip);
- tip.MouseUpEventHandler += (sender, e) =>
- {
- BackgroundColor = ZigbeeColor.Current.GXCRedColor;
- };
var floorLayout = new VerticalScrolViewLayout
{
@@ -105,7 +101,8 @@
{
((sender as Button).Parent as CommonForm.LeftIconButtonRow).IsSelected = true;
Config.Instance.Home.CurrentFloorId = (sender as Button).Tag.ToString();
- FloorAction?.Invoke(Config.Instance.Home.GetCurrentFloorName());
+ Config.Instance.Home.Save();
+ FloorAction?.Invoke(Config.Instance.Home.GetCurrentFloorName);
RemoveFromParent();
}
}
--
Gitblit v1.8.0