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/Logic/HdlLogLogic.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlLogLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
similarity index 81%
rename from ZigbeeApp/Shared/Phone/Common/Logic/HdlLogLogic.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
index b46ce58..ed94277 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlLogLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// Log閫昏緫
@@ -58,7 +58,7 @@
string strLog = "[" + DateTime.Now.ToString("yyyyMMdd HH:mm:ss") + "] " + i_text;
if (encrypt == true)
{
- strLog = HdlCommonLogic.Current.EncryptPassword(HdlUserCenterResourse.FileEncryptKey, strLog);
+ strLog = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, strLog);
}
strLog = "\r\n" + strLog + "\r\n";
sw = new System.IO.StreamWriter(fullName, true, Encoding.UTF8);
@@ -95,7 +95,7 @@
{
lock (objLock)
{
- if (div == 1 && HdlUserCenterResourse.HideOption.DetailedLog == 0)
+ if (div == 1 && UserCenterResourse.HideOption.DetailedLog == 0)
{
//鏆傛椂鍙褰曞紓甯镐俊鎭�
return;
@@ -107,19 +107,16 @@
string fullName = string.Empty;
if (div == 1 || div == -1)
{
- //鍒涘缓LOG鏂囦欢澶�
- HdlFileLogic.Current.CreateDirectory(HdlFileNameResourse.LogDirectory);
-
string fileName = this.GetLogFile(div);
- fullName = System.IO.Path.Combine(HdlFileNameResourse.LogDirectory, fileName);
+ fullName = System.IO.Path.Combine(DirNameResourse.LogDirectory, fileName);
}
else if (div == 2)
{
- fullName = HdlFileNameResourse.SendAndReceveDataLog;
+ fullName = DirNameResourse.SendAndReceveDataLog;
}
else if (div == 3)
{
- fullName = HdlFileNameResourse.SocketReceiveDataLog;
+ fullName = DirNameResourse.SocketReceiveDataLog;
}
strLog = "\r\n[" + DateTime.Now.ToString("yyyyMMdd HH:mm:ss") + "] " + strLog + "\r\n";
sw = new System.IO.StreamWriter(fullName, true, Encoding.UTF8);
@@ -142,13 +139,16 @@
private string GetLogFile(int div)
{
//鍔犲瘑,鍥犱负杩欐槸鏀堕泦鏁版嵁,鏈�濂戒笉璁╁埆浜虹煡閬撹繖鏄粈涔堟渶濂�
- string fileName = DateTime.Now.ToString("yyyyMMdd") + "Log";
- if (HdlUserCenterResourse.UserInfo.Account != string.Empty)
+ string fileName = UserCenterResourse.UserInfo.Account + "-" + DateTime.Now.ToString("yyyyMMdd");
+ if (div == -1)
{
- fileName = HdlUserCenterResourse.UserInfo.Account + "-" + fileName;
+ fileName += "Error";
}
-
- fileName = HdlCommonLogic.Current.EncryptPassword(HdlUserCenterResourse.FileEncryptKey, fileName);
+ else if (div == 1)
+ {
+ fileName += "Log";
+ }
+ fileName = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, fileName);
return fileName;
}
#endregion
--
Gitblit v1.8.0