From 108b3cd44e9e2a36748cae8dccd22eff0c8cf989 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 16:16:58 +0800
Subject: [PATCH] 2019-11-13-1
---
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
old mode 100755
new mode 100644
index 11f8a3b..224de26
--- 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
@@ -158,7 +173,10 @@
return (DateTime.Now - LoginDateTime).Days < 7;
}
}
-
+ /// <summary>
+ ///鏆傛椂榛樿
+ /// </summary>
+ public string UserName = string.Empty;
/// <summary>
/// 璐︽埛鐧诲綍鎴愬姛鐨勮处鎴风被鍨�
/// </summary>
@@ -167,10 +185,7 @@
/// 璐︽埛鐧诲綍鎴愬姛鐨勪富ID
/// </summary>
public int MasterID = 0;
- /// <summary>
- /// 鐢ㄦ埛ID
- /// </summary>
- public int UserID = 0;
+
public static void ReFresh()
{
@@ -182,7 +197,8 @@
config = new Config { };
}
}
-
+
+ public string Name = string.Empty;
/// <summary>
/// 褰撳墠鐧诲綍鐨勫笎鍙�
/// </summary>
@@ -269,7 +285,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