From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25
---
ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs
index 2c1541c..11d2bf8 100644
--- 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
@@ -35,9 +36,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
@@ -57,13 +58,11 @@
Height = Application.GetRealHeight(150),
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
- TextID = R.MyInternationalizationString.SelectFloor
+ TextID = R.MyInternationalizationString.SelectFloor,
+ TextSize=16,
+ IsBold=true
};
backgroundFL.AddChidren(tip);
- tip.MouseUpEventHandler += (sender, e) =>
- {
- BackgroundColor = ZigbeeColor.Current.GXCRedColor;
- };
var floorLayout = new VerticalScrolViewLayout
{
@@ -97,15 +96,25 @@
frow.IsSelected = true;
}
- frow.IconButton.MouseUpEventHandler += SelectFloor_MouseUpEvent;
- frow.TitleButton.MouseUpEventHandler += SelectFloor_MouseUpEvent;
+ frow.ClickBtn.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();
- FloorAction?.Invoke(Config.Instance.Home.GetCurrentFloorName);
+ if(changeFloor)
+ {
+ Config.Instance.Home.CurrentFloorId = (sender as Button).Tag.ToString();
+ Config.Instance.Home.Save();
+ Common.Room.RefreshRoomListView();
+ }
+
+ FloorAction?.Invoke((sender as Button).Tag.ToString());
RemoveFromParent();
}
}
--
Gitblit v1.8.0