From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3

---
 ZigbeeApp/Shared/Common/House.cs |   55 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 87e9aee..b6846bc 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -1,5 +1,6 @@
 锘縰sing System;
 using System.Collections.Generic;
+using Shared.Phone;
 using Shared.Phone.UserCenter;
 
 namespace Shared.Common
@@ -34,11 +35,7 @@
         /// <summary>
         /// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
         /// </summary>
-        public bool IsOthreShare;
-        /// <summary>
-        /// 褰撳墠浣忓畢鏄叾浠栦富甯愬彿鍒嗕韩杩囨潵鐨勪富甯愬彿鐨勫垎甯冨紡Id
-        /// </summary>
-        public string MainUserDistributedMark;
+        public bool IsOtherShare;
         /// <summary>
         /// 璇ヤ綇瀹呮槸鍚︽槸铏氭嫙鐨�,true鐨勮瘽浠ｈ〃缃戝叧鍜岃澶囬兘鏄櫄鎷熺殑(榛樿涓篺alse)
         /// </summary>
@@ -54,7 +51,11 @@
         /// <summary>
         /// 绾害
         /// </summary>
-        public double Latitude = 0;
+        public double Latitude = 0;
+        /// <summary>
+        /// 鏄惁鎷ユ湁杩滅▼鎺у埗鏉冮檺
+        /// </summary>
+        public bool IsRemoteControl = false;
         /// <summary>
         /// 浣忓畢鎵�鍦ㄧ殑鍦扮悊浣嶇疆鐨勫悕绉�
         /// </summary>
@@ -116,7 +117,7 @@
         /// 褰撳墠瀛樻斁浣忓畢鏁版嵁鐨勬枃浠跺す鍚嶅瓧(姝ゅ彉閲忔槸缁欐湰鏈哄浠�,鎴栬�呬簯绔笅杞藉浠戒娇鐢ㄧ殑,璇锋棤瑙嗚繖涓彉閲�)
         /// </summary>
         [Newtonsoft.Json.JsonIgnore]
-        public string SaveDirctoryName = string.Empty;
+        public string SaveDirctoryName = string.Empty;
 
         #endregion
 
@@ -135,10 +136,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 +180,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);
@@ -163,7 +198,7 @@
 
             if (autoBackup == true && Id == Config.Instance.HomeId)
             {
-                HdlAutoBackupLogic.AddOrEditorFile(FileName);
+                HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(FileName);
             }
         }
         #endregion

--
Gitblit v1.8.0