From 404cdc88627f942df7944af04ee05b9d527752d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 九月 2019 13:22:40 +0800
Subject: [PATCH] 合并了徐梅的按键面板绑定
---
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 64 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
index cd51328..11f8a3b 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -26,7 +26,8 @@
{
get
{
- if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
+ if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2
+ || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
{
return AdminMqttKey;
}
@@ -41,7 +42,8 @@
{
get
{
- if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
+ if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2
+ || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
{
return AdminZigbeeMqttBrokerLoadSubDomain;
}
@@ -56,7 +58,8 @@
{
get
{
- if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
+ if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2
+ || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
{
return AdminConnectZigbeeMqttClientId;
}
@@ -71,7 +74,8 @@
{
get
{
- if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
+ if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2
+ || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
{
return AdminConnectZigbeeMqttBrokerPwd;
}
@@ -86,13 +90,14 @@
{
get
{
- if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
+ if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2
+ || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
{
return AdminConnectZigbeeMqttBrokerName;
}
return Config.Instance.Account;
- }
- }
+ }
+ }
/// <summary>
/// 璐︽埛鐧诲綍鎴愬姛鐨凪qttKey
@@ -236,12 +241,6 @@
{
get
{
- //鍚敤绠＄悊鍛樻潈闄�
- if (this.isAdministrator == true)
- {
- return this.AdminRequestToken;
- }
-
string md5Password;
if (string.IsNullOrEmpty(Password))
{
@@ -263,29 +262,16 @@
}
/// <summary>
- /// 褰撳墠甯愬彿鐨凾oken(鎷ユ湁绠＄悊鍛樻潈闄愮殑鎴愬憳浣跨敤杩滅▼鐨勬椂鍊欎娇鐢�)
- /// </summary>
- public string AdminToken
- {
- get
- {
- if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
- {
- return this.AdminRequestToken;
- }
- return this.Token;
- }
- }
-
- /// <summary>
/// 鐧诲綍杩囩殑甯愬彿淇℃伅
/// </summary>
public List<string> AccountList = new List<string> { };
public List<string> HomeFilePathList = new List<string> { };
- public string HomeId = string.Empty;
-
+ public string HomeId = string.Empty;
+
+ [Newtonsoft.Json.JsonIgnore]
+ private House m_Home = null;
/// <summary>
/// 褰撳墠浣忓畢
/// </summary>
@@ -295,12 +281,20 @@
{
get
{
- var house = House.GetHouseByHouseId(HomeId);
- if (house == null)
- {
- return new House { };
+ if (m_Home != null)
+ {
+ return m_Home;
}
- return house;
+ m_Home = House.GetHouseByHouseId(HomeId);
+ if (m_Home == null)
+ {
+ m_Home = new House();
+ }
+ return m_Home;
+ }
+ set
+ {
+ m_Home = value;
}
}
--
Gitblit v1.8.0