From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Common/AccountOption.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs
similarity index 71%
rename from ZigbeeApp/Shared/Phone/Common/Common/AccountOption.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs
index f4324f7..4f2cad3 100644
--- a/ZigbeeApp/Shared/Phone/Common/Common/AccountOption.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 璐﹀彿璁剧疆淇℃伅
@@ -42,6 +42,21 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
public bool AppCanSignout = false;
+ /// <summary>
+ /// 鍓嶄竴娆＄殑浣忓畢ID锛岃繖涓笢瑗挎槸缁橴serCenterLogic.InitUserCenterMenmoryAndThread()鐢ㄧ殑
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public string OldHomeStringId = string.Empty;
+ /// <summary>
+ /// 鍓嶄竴娆＄殑鐧诲綍璐﹀彿锛岃繖涓笢瑗挎槸缁橴serCenterLogic.InitUserCenterMenmoryAndThread()鐢ㄧ殑
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public string OldAccountId = string.Empty;
+ /// <summary>
+ /// 鐢ㄦ埛鍥剧墖鐩綍璺緞
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public string UserPictruePath = string.Empty;
#endregion
@@ -57,13 +72,13 @@
//鍔犲瘑瀵嗙爜
string hdlKey = "hD1(La3o";
string oldPswAuthentication = PswAuthentication;
- PswAuthentication = HdlCommonLogic.Current.EncryptPassword(hdlKey, oldPswAuthentication);
+ PswAuthentication = UserCenterLogic.EncryptPassword(hdlKey, oldPswAuthentication);
string oldGestureAuthentication = GestureAuthentication;
- GestureAuthentication = HdlCommonLogic.Current.EncryptPassword(hdlKey, oldGestureAuthentication);
+ GestureAuthentication = UserCenterLogic.EncryptPassword(hdlKey, oldGestureAuthentication);
//鍐欏叆鍐呭
- HdlFileLogic.Current.SaveFileContent(HdlFileNameResourse.AccountOptionFile, this);
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.AccountOptionFile, this);
//杩樺師鏄庣爜
PswAuthentication = oldPswAuthentication;
GestureAuthentication = oldGestureAuthentication;
@@ -80,7 +95,7 @@
/// <returns></returns>
public AccountOptionClass Load()
{
- string fileName = HdlFileNameResourse.AccountOptionFile;
+ string fileName = DirNameResourse.AccountOptionFile;
if (System.IO.File.Exists(fileName) == false)
{
return new AccountOptionClass();
@@ -92,8 +107,8 @@
var info = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountOptionClass>(strValue);
//瑙ｅ瘑瀵嗙爜
string hdlKey = "hD1(La3o";
- info.PswAuthentication = HdlCommonLogic.Current.DecryptPassword(hdlKey, info.PswAuthentication);
- info.GestureAuthentication = HdlCommonLogic.Current.DecryptPassword(hdlKey, info.GestureAuthentication);
+ info.PswAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.PswAuthentication);
+ info.GestureAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.GestureAuthentication);
return info;
}
--
Gitblit v1.8.0