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/Common/House.cs | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 87e9aee..ae86e44 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -135,10 +135,39 @@
}
}
/// <summary>
- /// 褰撳墠妤煎眰ID
+ /// 褰撳墠妤煎眰id
+ /// </summary>
+ private string m_CurrentFloorId = string.Empty;
+ /// <summary>
+ /// 褰撳墠妤煎眰Id
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public string CurrentFloorId = string.Empty;
+ public string CurrentFloorId
+ {
+ //鏉ュ洖鍒囨崲澶囦唤,浼氬嚭鐜伴棶棰�,妤煎眰id娌℃竻闄�
+ get
+ {
+ //娌℃湁妤煎眰
+ if (this.FloorDics.Count == 0) { return string.Empty; }
+
+ if (this.FloorDics.ContainsKey(m_CurrentFloorId) == true)
+ {
+ //褰撳墠鐨勬ゼ灞俰d娌￠棶棰�
+ return m_CurrentFloorId;
+ }
+ //濡傛灉褰撳墠璁剧疆鐨勬ゼ灞俰d骞朵笉瀛樺湪鐨勮瘽,閲嶆柊璁剧疆
+ m_CurrentFloorId = string.Empty;
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
+ foreach (var floorId in dicFloor.Keys)
+ {
+ //缁欎竴涓繃鍘诲嵆鍙�
+ m_CurrentFloorId = floorId;
+ break;
+ }
+ return m_CurrentFloorId;
+ }
+ set { m_CurrentFloorId = value; }
+ }
#endregion
@@ -150,6 +179,11 @@
/// <param name="autoBackup">鏄惁澶囦唤</param>
public void Save(bool autoBackup = true)
{
+ //濡傛灉褰撳墠鏄睍绀烘ā鏉�,鍒欎笉鍏佽淇濆瓨
+ if (this.IsShowTemplate == true)
+ {
+ return;
+ }
//淇敼鏃堕棿
this.LastEditorTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm");
var path = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, Id);
--
Gitblit v1.8.0