From 2450c12c825ad4d78d1572da2fa421706db2df2f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 18 六月 2020 16:01:14 +0800
Subject: [PATCH] 新代码
---
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
index 50e4e45..0e9c605 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -100,7 +100,12 @@
/// 杩滅▼杩炴帴鐨凪qtt鐨勫鎴风ID
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public string ConnEmqClientId = string.Empty;
+ public string ConnEmqClientId = string.Empty;
+ /// <summary>
+ /// 褰撳墠鐧诲綍鐨勮处鍙锋槸涓嶆槸涔嬪墠鐨勮处鍙�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public bool TheSameLoginAccount = false;
[Newtonsoft.Json.JsonIgnore]
/// <summary>
@@ -135,11 +140,6 @@
/// </summary>
public string LoginToken = string.Empty;
- /// <summary>
- /// 鐧诲綍杩囩殑甯愬彿淇℃伅
- /// </summary>
- public List<string> AccountList = new List<string> { };
-
public List<string> HomeFilePathList = new List<string> { };
public string HomeId = string.Empty;
@@ -159,7 +159,7 @@
{
return m_Home;
}
- m_Home = House.GetHouseByHouseId(HomeId);
+ m_Home = Phone.UserCenter.HdlResidenceLogic.Current.GetHouseByHouseId(HomeId);
if (m_Home == null)
{
m_Home = new House();
--
Gitblit v1.8.0