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 | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
index 79c3b95..0e9c605 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -60,8 +60,13 @@
{
config = new Config { };
}
- }
-
+ if (config.PasswordEncrypt != string.Empty)
+ {
+ //瑙ｅ瘑
+ config.Password = Phone.UserCenter.UserCenterLogic.DecryptPassword("hD1(La3o", config.PasswordEncrypt);
+ }
+ }
+
/// <summary>
/// 褰撳墠鐧诲綍鐨勫笎鍙�
/// </summary>
@@ -69,7 +74,12 @@
/// <summary>
/// 褰撳墠甯愬彿瀵嗙爜
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string Password = string.Empty;
+ /// <summary>
+ /// 鍔犲瘑瀵嗙爜
+ /// </summary>
+ public string PasswordEncrypt = string.Empty;
/// <summary>
/// 鐭俊鐧诲綍杩斿洖鐨刴d5鍚庣殑瀵嗙爜
/// </summary>
@@ -90,7 +100,12 @@
/// 杩滅▼杩炴帴鐨凪qtt鐨勫鎴风ID
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public string ConnEmqClientId = string.Empty;
+ public string ConnEmqClientId = string.Empty;
+ /// <summary>
+ /// 褰撳墠鐧诲綍鐨勮处鍙锋槸涓嶆槸涔嬪墠鐨勮处鍙�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public bool TheSameLoginAccount = false;
[Newtonsoft.Json.JsonIgnore]
/// <summary>
@@ -125,11 +140,6 @@
/// </summary>
public string LoginToken = string.Empty;
- /// <summary>
- /// 鐧诲綍杩囩殑甯愬彿淇℃伅
- /// </summary>
- public List<string> AccountList = new List<string> { };
-
public List<string> HomeFilePathList = new List<string> { };
public string HomeId = string.Empty;
@@ -149,7 +159,7 @@
{
return m_Home;
}
- m_Home = House.GetHouseByHouseId(HomeId);
+ m_Home = Phone.UserCenter.HdlResidenceLogic.Current.GetHouseByHouseId(HomeId);
if (m_Home == null)
{
m_Home = new House();
@@ -181,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