From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs b/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
index 1383415..5d2d1bc 100755
--- a/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
@@ -90,7 +90,7 @@
foreach (var housePath in Config.Instance.HomeFilePathList)
{
- var home = House.GetHouseByFilePath(housePath);
+ var home = UserCenter.HdlResidenceLogic.Current.GetHouseByFilePath(housePath);
if (home == null)
{
continue;
@@ -117,20 +117,11 @@
frow.IsSelected = true;
}
- frow.ButtonClickEvent += SelectFloor_MouseUpEvent;
- }
-
- /// <summary>
- /// SelectFloor_MouseUpEvent
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="mouseEventArgs"></param>
- private void SelectFloor_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs)
- {
- (sender as Device.CommonForm.LeftIconButtonRow).IsSelected = true;
- var home = House.GetHouseByFilePath((sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString());
- RemoveView();
- HouseAction?.Invoke(home.Id);
+ frow.ButtonClickEvent += (sender, e) =>
+ {
+ RemoveView();
+ HouseAction?.Invoke(house.Id);
+ };
}
/// <summary>
--
Gitblit v1.8.0