From 8b4d79ca03495e522a1953e04ca17527f33c853a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 13:22:17 +0800
Subject: [PATCH] 合并完成代码
---
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
index 11f8a3b..2ceaa14 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -98,6 +98,21 @@
return Config.Instance.Account;
}
}
+ /// <summary>
+ /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑瀵嗙爜
+ /// </summary>
+ public string ConnectGuid
+ {
+ get
+ {
+ if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2
+ || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
+ {
+ return AdminConnectZigbeeMqttBrokerName;
+ }
+ return Config.Instance.Guid;
+ }
+ }
/// <summary>
/// 璐︽埛鐧诲綍鎴愬姛鐨凪qttKey
@@ -167,10 +182,7 @@
/// 璐︽埛鐧诲綍鎴愬姛鐨勪富ID
/// </summary>
public int MasterID = 0;
- /// <summary>
- /// 鐢ㄦ埛ID
- /// </summary>
- public int UserID = 0;
+
public static void ReFresh()
{
@@ -269,7 +281,7 @@
public List<string> HomeFilePathList = new List<string> { };
public string HomeId = string.Empty;
-
+
[Newtonsoft.Json.JsonIgnore]
private House m_Home = null;
/// <summary>
--
Gitblit v1.8.0