From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/Common/Common/AccountOption.cs | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs b/ZigbeeApp/Shared/Phone/Common/Common/AccountOption.cs
similarity index 71%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs
rename to ZigbeeApp/Shared/Phone/Common/Common/AccountOption.cs
index 4f2cad3..f4324f7 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Common/AccountOption.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone.UserCenter
+namespace Shared.Phone
{
/// <summary>
/// 璐﹀彿璁剧疆淇℃伅
@@ -42,21 +42,6 @@
/// </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
@@ -72,13 +57,13 @@
//鍔犲瘑瀵嗙爜
string hdlKey = "hD1(La3o";
string oldPswAuthentication = PswAuthentication;
- PswAuthentication = UserCenterLogic.EncryptPassword(hdlKey, oldPswAuthentication);
+ PswAuthentication = HdlCommonLogic.Current.EncryptPassword(hdlKey, oldPswAuthentication);
string oldGestureAuthentication = GestureAuthentication;
- GestureAuthentication = UserCenterLogic.EncryptPassword(hdlKey, oldGestureAuthentication);
+ GestureAuthentication = HdlCommonLogic.Current.EncryptPassword(hdlKey, oldGestureAuthentication);
//鍐欏叆鍐呭
- HdlFileLogic.Current.SaveFileContent(DirNameResourse.AccountOptionFile, this);
+ HdlFileLogic.Current.SaveFileContent(HdlFileNameResourse.AccountOptionFile, this);
//杩樺師鏄庣爜
PswAuthentication = oldPswAuthentication;
GestureAuthentication = oldGestureAuthentication;
@@ -95,7 +80,7 @@
/// <returns></returns>
public AccountOptionClass Load()
{
- string fileName = DirNameResourse.AccountOptionFile;
+ string fileName = HdlFileNameResourse.AccountOptionFile;
if (System.IO.File.Exists(fileName) == false)
{
return new AccountOptionClass();
@@ -107,8 +92,8 @@
var info = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountOptionClass>(strValue);
//瑙ｅ瘑瀵嗙爜
string hdlKey = "hD1(La3o";
- info.PswAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.PswAuthentication);
- info.GestureAuthentication = UserCenterLogic.DecryptPassword(hdlKey, info.GestureAuthentication);
+ info.PswAuthentication = HdlCommonLogic.Current.DecryptPassword(hdlKey, info.PswAuthentication);
+ info.GestureAuthentication = HdlCommonLogic.Current.DecryptPassword(hdlKey, info.GestureAuthentication);
return info;
}
--
Gitblit v1.8.0