From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs | 37 ++++++++++++-------------------------
1 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs b/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
index 7c70c74..3e0cb2a 100755
--- a/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
@@ -70,8 +70,10 @@
};
changeHomeFL.AddChidren(scrolView);
- var houseCount = Config.Instance.HomeFilePathList.Count;
- if (Config.Instance.HomeFilePathList.Count > 0)
+ //鑾峰彇鏈湴鍏ㄩ儴鐨勪綇瀹呭璞�
+ var listHouse = UserCenter.HdlResidenceLogic.Current.GetLocalResidenceList();
+ var houseCount = listHouse.Count;
+ if (houseCount > 0)
{
if (houseCount > 5)
{
@@ -87,15 +89,9 @@
changeHomeFL.Height = this.GetPictrueRealSize(150 * (houseCount + 1));
scrolView.Height = this.GetPictrueRealSize(150 * houseCount);
}
-
- foreach (var housePath in Config.Instance.HomeFilePathList)
- {
- var home = UserCenter.HdlResidenceLogic.Current.GetHouseByFilePath(housePath);
- if (home == null)
- {
- continue;
- }
- AddFloor(scrolView, home);
+ foreach (var house in listHouse)
+ {
+ AddFloor(scrolView, house);
}
}
}
@@ -117,20 +113,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 = UserCenter.HdlResidenceLogic.Current.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