From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Common/House.cs | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index b6846bc..ae86e44 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -1,6 +1,5 @@
锘縰sing System;
using System.Collections.Generic;
-using Shared.Phone;
using Shared.Phone.UserCenter;
namespace Shared.Common
@@ -35,7 +34,11 @@
/// <summary>
/// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
/// </summary>
- public bool IsOtherShare;
+ public bool IsOthreShare;
+ /// <summary>
+ /// 褰撳墠浣忓畢鏄叾浠栦富甯愬彿鍒嗕韩杩囨潵鐨勪富甯愬彿鐨勫垎甯冨紡Id
+ /// </summary>
+ public string MainUserDistributedMark;
/// <summary>
/// 璇ヤ綇瀹呮槸鍚︽槸铏氭嫙鐨�,true鐨勮瘽浠ｈ〃缃戝叧鍜岃澶囬兘鏄櫄鎷熺殑(榛樿涓篺alse)
/// </summary>
@@ -51,11 +54,7 @@
/// <summary>
/// 绾害
/// </summary>
- public double Latitude = 0;
- /// <summary>
- /// 鏄惁鎷ユ湁杩滅▼鎺у埗鏉冮檺
- /// </summary>
- public bool IsRemoteControl = false;
+ public double Latitude = 0;
/// <summary>
/// 浣忓畢鎵�鍦ㄧ殑鍦扮悊浣嶇疆鐨勫悕绉�
/// </summary>
@@ -117,7 +116,7 @@
/// 褰撳墠瀛樻斁浣忓畢鏁版嵁鐨勬枃浠跺す鍚嶅瓧(姝ゅ彉閲忔槸缁欐湰鏈哄浠�,鎴栬�呬簯绔笅杞藉浠戒娇鐢ㄧ殑,璇锋棤瑙嗚繖涓彉閲�)
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public string SaveDirctoryName = string.Empty;
+ public string SaveDirctoryName = string.Empty;
#endregion
@@ -198,7 +197,7 @@
if (autoBackup == true && Id == Config.Instance.HomeId)
{
- HdlBackupLogic.Current.AddOrEditorAutoBackFileStatu(FileName);
+ HdlAutoBackupLogic.AddOrEditorFile(FileName);
}
}
#endregion
--
Gitblit v1.8.0