From eb424d24e39bab4a245725f35deab3f234ea0f13 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 13 十二月 2019 10:48:50 +0800
Subject: [PATCH] 2019.12.13
---
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 189 +++++-----------------------------------------
1 files changed, 23 insertions(+), 166 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 cd51328..e8c0307
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -19,119 +19,6 @@
return config;
}
}
- /// <summary>
- /// 璐︽埛鐧诲綍鎴愬姛鐨凪qttKey
- /// </summary>
- public string MqttKey
- {
- get
- {
- if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
- {
- return AdminMqttKey;
- }
- return MeMqttKey;
- }
- set { MeMqttKey = value; }
- }
- /// <summary>
- /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ュ湴鍧�
- /// </summary>
- public string ZigbeeMqttBrokerLoadSubDomain
- {
- get
- {
- if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
- {
- return AdminZigbeeMqttBrokerLoadSubDomain;
- }
- return MeZigbeeMqttBrokerLoadSubDomain;
- }
- set { MeZigbeeMqttBrokerLoadSubDomain = value; }
- }
- /// <summary>
- /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑ClientId
- /// </summary>
- public string ConnectZigbeeMqttClientId
- {
- get
- {
- if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
- {
- return AdminConnectZigbeeMqttClientId;
- }
- return MeConnectZigbeeMqttClientId;
- }
- set { MeConnectZigbeeMqttClientId = value; }
- }
- /// <summary>
- /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑瀵嗙爜
- /// </summary>
- public string ConnectZigbeeMqttBrokerPwd
- {
- get
- {
- if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
- {
- return AdminConnectZigbeeMqttBrokerPwd;
- }
- return MeConnectZigbeeMqttBrokerPwd;
- }
- set { MeConnectZigbeeMqttBrokerPwd = value; }
- }
- /// <summary>
- /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑瀵嗙爜
- /// </summary>
- public string ConnectZigbeeMqttBrokerName
- {
- get
- {
- if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
- {
- return AdminConnectZigbeeMqttBrokerName;
- }
- return Config.Instance.Account;
- }
- }
-
- /// <summary>
- /// 璐︽埛鐧诲綍鎴愬姛鐨凪qttKey
- /// </summary>
- private string MeMqttKey = string.Empty;
- /// <summary>
- /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ュ湴鍧�
- /// </summary>
- private string MeZigbeeMqttBrokerLoadSubDomain = string.Empty;
- /// <summary>
- /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑ClientId
- /// </summary>
- private string MeConnectZigbeeMqttClientId = string.Empty;
- /// <summary>
- /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑瀵嗙爜
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- private string MeConnectZigbeeMqttBrokerPwd = string.Empty;
- /// <summary>
- /// 璐︽埛鐧诲綍鎴愬姛鐨凪qttKey(绠＄悊鍛樿韩浠界敤)
- /// </summary>
- public string AdminMqttKey = string.Empty;
- /// <summary>
- /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ュ湴鍧�(绠＄悊鍛樿韩浠界敤)
- /// </summary>
- public string AdminZigbeeMqttBrokerLoadSubDomain = string.Empty;
- /// <summary>
- /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑ClientId(绠＄悊鍛樿韩浠界敤)
- /// </summary>
- public string AdminConnectZigbeeMqttClientId = string.Empty;
- /// <summary>
- /// 搴旇鏄彨杩滅▼杩炴帴鐨勫悕瀛楀惂
- /// </summary>
- public string AdminConnectZigbeeMqttBrokerName = string.Empty;
- /// <summary>
- /// 褰撳墠闇�瑕佽繛鎺ヤ簯绔痁igbeeMqttBroker鐨勮繛鎺ョ殑瀵嗙爜(绠＄悊鍛樿韩浠界敤)
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public string AdminConnectZigbeeMqttBrokerPwd = string.Empty;
/// <summary>
/// 鏈嶅姟鍣ㄦ敞鍐孖D
@@ -162,10 +49,7 @@
/// 璐︽埛鐧诲綍鎴愬姛鐨勪富ID
/// </summary>
public int MasterID = 0;
- /// <summary>
- /// 鐢ㄦ埛ID
- /// </summary>
- public int UserID = 0;
+
public static void ReFresh()
{
@@ -177,7 +61,7 @@
config = new Config { };
}
}
-
+
/// <summary>
/// 褰撳墠鐧诲綍鐨勫笎鍙�
/// </summary>
@@ -195,7 +79,7 @@
/// </summary>
public string Guid = string.Empty;
/// <summary>
- /// 鏄惁鏄鐞嗗憳鏉冮檺(涓轰粈涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken)
+ /// 鏄惁鏄鐞嗗憳鏉冮檺(鍙樻洿浜�,鎴愬憳鐨勬椂鍊�,杩欎釜涔熶负ture銆備负浠�涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken)
/// </summary>
public bool isAdministrator = false;
/// <summary>
@@ -206,42 +90,15 @@
/// 鎴愬憳璇锋眰鎺у埗涓诲笎鍙锋浣忓畢鏃惰姹傚熀鍦板潃鐨凩oginAccessToken鐨勫��
/// </summary>
public string AdminRequestToken = string.Empty;
- /// <summary>
- /// 鍥轰欢鍚嶇О
- /// </summary>
- //public string Name = string.Empty;
- ///// <summary>
- ///// 鍥轰欢鍞竴鏍囪瘑
- ///// </summary>
- //public string DistributedMark = string.Empty;
- ///// <summary>
- ///// 鍥轰欢鐗堟湰
- ///// </summary>
- //public string FirmwareVersion = string.Empty;
- ///// <summary>
- ///// 鍥轰欢澶囨敞
- ///// </summary>
- //public string Remarks = string.Empty;
- ///// <summary>
- ///// 鍥轰欢ID
- ///// </summary>
- //public string Id;
[Newtonsoft.Json.JsonIgnore]
/// <summary>
/// 褰撳墠甯愬彿鐨凾oken
/// </summary>
- private string Token1 = "";
public string Token
{
get
{
- //鍚敤绠＄悊鍛樻潈闄�
- if (this.isAdministrator == true)
- {
- return this.AdminRequestToken;
- }
-
string md5Password;
if (string.IsNullOrEmpty(Password))
{
@@ -263,29 +120,21 @@
}
/// <summary>
- /// 褰撳墠甯愬彿鐨凾oken(鎷ユ湁绠＄悊鍛樻潈闄愮殑鎴愬憳浣跨敤杩滅▼鐨勬椂鍊欎娇鐢�)
+ /// 鐧诲綍鏃禩oken
/// </summary>
- public string AdminToken
- {
- get
- {
- if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
- {
- return this.AdminRequestToken;
- }
- return this.Token;
- }
- }
+ public string LoginToken = string.Empty;
- /// <summary>
+ /// <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 +144,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