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