From 07466c19110693e3e439a7d7c8ad0bc21d9b3287 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 29 四月 2020 09:14:01 +0800
Subject: [PATCH] 优化代码，更改门锁需求接口
---
ZigbeeApp/Shared/Common/House.cs | 36 ++++++++----------------------------
1 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index d8a2c06..871b61b 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -23,17 +23,14 @@
return $"House_{Id}.json";
}
}
-
/// <summary>
/// 浣忓畢id--浣跨敤浜戠鎻愪緵鐨勪綇瀹呭敮涓�Id
/// </summary>
public string Id = string.Empty;
-
/// <summary>
/// 浣忓畢鍚嶇О
/// </summary>
public string Name = string.Empty;
-
/// <summary>
/// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
/// </summary>
@@ -42,7 +39,10 @@
/// 褰撳墠浣忓畢鏄叾浠栦富甯愬彿鍒嗕韩杩囨潵鐨勪富甯愬彿鐨勫垎甯冨紡Id
/// </summary>
public string MainUserDistributedMark;
-
+ /// <summary>
+ /// 璇ヤ綇瀹呮槸鍚︽槸铏氭嫙鐨�,true鐨勮瘽浠ｈ〃缃戝叧鍜岃澶囬兘鏄櫄鎷熺殑(榛樿涓篺alse)
+ /// </summary>
+ public bool IsVirtually = false;
/// <summary>
/// 浠呭瓙璐﹀彿鐧婚檰鐨勬椂鍊欎娇鐢�,褰撱�怚sOthreShare銆戜负"true"锛屽苟涓斻�怉ccountType銆戜负"1"鏃讹紝璇ヨ处鍙锋嫢鏈夌鐞嗗憳鏉冮檺
/// </summary>
@@ -59,12 +59,10 @@
/// 浣忓畢鎵�鍦ㄧ殑鍦扮悊浣嶇疆鐨勫悕绉�
/// </summary>
public string ResidenceAddressName = string.Empty;
-
/// <summary>
/// 鎴块棿鍒楄〃(鎴块棿鐨処D)
/// </summary>
public List<string> ListRooms = new List<string>();
-
/// <summary>
/// 妤煎眰瀛楀吀
/// key:FloorId
@@ -75,27 +73,6 @@
/// 褰撳墠妤煎眰Id
/// </summary>
public string CurrentFloorId = string.Empty;
-
- /// <summary>
- /// 鍏ㄥ眬鍦烘櫙璺緞鍒楄〃---澶囩敤
- /// </summary>
- public List<string> SceneFilePathList = new List<string> { };
- /// <summary>
- /// 璁惧璺緞鍒楄〃---澶囩敤
- /// </summary>
- public List<string> DeviceFilePathList = new List<string> { };
- /// <summary>
- /// 鍔熻兘璺緞鍒楄〃---澶囩敤
- /// </summary>
- public List<string> FunctionFilePathList = new List<string> { };
- /// <summary>
- /// 閫氱敤鏍囪瘑--澶囩敤
- /// </summary>
- public object Tag;
- /// <summary>
- /// 鏈熴�佹爧銆佸眰绛夊尯鍩�---澶囩敤
- /// </summary>
- public Dictionary<string, string> LocationInfoList = new Dictionary<string, string> { };
#endregion
@@ -186,6 +163,10 @@
/// <param name="houseName">House name.</param>
public static void EditorHouseByHouseId(string houseId, string houseName)
{
+ if (Config.Instance.Home.Id == houseId)
+ {
+ Config.Instance.Home.Name = houseName;
+ }
var home = GetHouseByHouseId(houseId);
if (home == null)
{
@@ -193,7 +174,6 @@
}
home.Name = houseName;
home.Save();
- Config.Instance.Save();
}
#endregion
--
Gitblit v1.8.0