From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 218 +++++++++++-------------------------------------------
1 files changed, 44 insertions(+), 174 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
index cd51328..0e9c605 100755
--- 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()
{
@@ -176,8 +60,13 @@
{
config = new Config { };
}
- }
-
+ if (config.PasswordEncrypt != string.Empty)
+ {
+ //瑙ｅ瘑
+ config.Password = Phone.UserCenter.UserCenterLogic.DecryptPassword("hD1(La3o", config.PasswordEncrypt);
+ }
+ }
+
/// <summary>
/// 褰撳墠鐧诲綍鐨勫笎鍙�
/// </summary>
@@ -185,7 +74,12 @@
/// <summary>
/// 褰撳墠甯愬彿瀵嗙爜
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string Password = string.Empty;
+ /// <summary>
+ /// 鍔犲瘑瀵嗙爜
+ /// </summary>
+ public string PasswordEncrypt = string.Empty;
/// <summary>
/// 鐭俊鐧诲綍杩斿洖鐨刴d5鍚庣殑瀵嗙爜
/// </summary>
@@ -193,11 +87,7 @@
/// <summary>
/// 鐧婚檰璐﹀彿鐨凣uid
/// </summary>
- public string Guid = string.Empty;
- /// <summary>
- /// 鏄惁鏄鐞嗗憳鏉冮檺(涓轰粈涔堜細澹版槑杩欐牱鍙橀噺,鍥犱负鏈変簺鎺ュ彛蹇呴』浣跨敤鍘熸潵鐨凾oken)
- /// </summary>
- public bool isAdministrator = false;
+ public string Guid = string.Empty;
/// <summary>
/// 鎴愬憳璇锋眰鎺у埗涓诲笎鍙锋浣忓畢鏃惰姹傚熀鍦板潃
/// </summary>
@@ -206,42 +96,25 @@
/// 鎴愬憳璇锋眰鎺у埗涓诲笎鍙锋浣忓畢鏃惰姹傚熀鍦板潃鐨凩oginAccessToken鐨勫��
/// </summary>
public string AdminRequestToken = string.Empty;
- /// <summary>
- /// 鍥轰欢鍚嶇О
+ /// <summary>
+ /// 杩滅▼杩炴帴鐨凪qtt鐨勫鎴风ID
/// </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]
+ public string ConnEmqClientId = string.Empty;
+ /// <summary>
+ /// 褰撳墠鐧诲綍鐨勮处鍙锋槸涓嶆槸涔嬪墠鐨勮处鍙�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public bool TheSameLoginAccount = false;
[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 +136,16 @@
}
/// <summary>
- /// 褰撳墠甯愬彿鐨凾oken(鎷ユ湁绠＄悊鍛樻潈闄愮殑鎴愬憳浣跨敤杩滅▼鐨勬椂鍊欎娇鐢�)
+ /// 鐧诲綍鏃禩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 string LoginToken = string.Empty;
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 +155,20 @@
{
get
{
- var house = House.GetHouseByHouseId(HomeId);
- if (house == null)
- {
- return new House { };
+ if (m_Home != null)
+ {
+ return m_Home;
}
- return house;
+ m_Home = Phone.UserCenter.HdlResidenceLogic.Current.GetHouseByHouseId(HomeId);
+ if (m_Home == null)
+ {
+ m_Home = new House();
+ }
+ return m_Home;
+ }
+ set
+ {
+ m_Home = value;
}
}
@@ -323,6 +191,8 @@
/// </summary>
public void Save()
{
+ //鍔犲瘑,涓嶈兘淇濆瓨鏄庣爜
+ this.PasswordEncrypt = Phone.UserCenter.UserCenterLogic.EncryptPassword("hD1(La3o", this.Password);
var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
Shared.IO.FileUtils.WriteFileByBytes(fileName, bytes);
ReFresh();
--
Gitblit v1.8.0