From 23420922845c9e77019a55c3b3e3271eb1ec261e Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 13 七月 2020 11:42:18 +0800 Subject: [PATCH] 新版本 --- ZigbeeApp/Shared/Common/House.cs | 27 ++++++--------------------- 1 files changed, 6 insertions(+), 21 deletions(-) diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs index dc7e878..e726972 100755 --- a/ZigbeeApp/Shared/Common/House.cs +++ b/ZigbeeApp/Shared/Common/House.cs @@ -65,10 +65,6 @@ /// value:FloorName /// </summary> public Dictionary<string,string> FloorDics = new Dictionary<string,string> { }; - /// <summary> - /// 褰撳墠妤煎眰Id - /// </summary> - public string CurrentFloorId = string.Empty; #endregion @@ -82,26 +78,15 @@ public string GetCurrentFloorName { get - { + { return HdlResidenceLogic.Current.GetFloorNameById(CurrentFloorId); } - } - - /// <summary> - /// 璁剧疆褰撳墠妤煎眰鐨処D + } + /// <summary> + /// 褰撳墠妤煎眰ID /// </summary> - public void SetCurrentFloorId() - { - if (Config.Instance.Home.FloorDics.Count > 0 && string.IsNullOrEmpty(CurrentFloorId)) - { - foreach (var floor in Config.Instance.Home.FloorDics) - { - CurrentFloorId = floor.Key; - Save(false); - return; - } - } - } + [Newtonsoft.Json.JsonIgnore] + public string CurrentFloorId = string.Empty; #endregion -- Gitblit v1.8.0