From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs | 63 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
index f1b5642..4aa704a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
@@ -40,13 +40,48 @@
#region 鈻� Log鍑哄姏____________________________
/// <summary>
+ /// 璋冭瘯鐢�,杩藉姞鍐欏叆鍏朵粬Log
+ /// </summary>
+ /// <param name="fullName">鍏ㄨ矾寰�</param>
+ /// <param name="i_text">瑕佸啓鍏ョ殑鍐呭</param>
+ /// <param name="deleteFile">鏄惁鍏堝垹闄ゆ枃浠�</param>
+ /// <param name="encrypt">鍐欏叆鐨勫唴瀹规槸鍚﹀姞瀵�</param>
+ public void WriteOtherText(string fullName, string i_text, bool deleteFile, bool encrypt)
+ {
+ if (deleteFile == true)
+ {
+ HdlFileLogic.Current.DeleteFile(fullName);
+ }
+ System.IO.StreamWriter sw = null;
+ try
+ {
+ string strLog = "[" + DateTime.Now.ToString("yyyyMMdd HH:mm:ss") + "] " + i_text;
+ if (encrypt == true)
+ {
+ strLog = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, strLog);
+ }
+ strLog = "\r\n" + strLog + "\r\n";
+ sw = new System.IO.StreamWriter(fullName, true, Encoding.UTF8);
+ sw.WriteLine(strLog);
+ }
+ catch { }
+ finally
+ {
+ sw?.Close();
+ sw = null;
+ }
+ }
+
+ /// <summary>
/// Log鍑哄姏
/// </summary>
/// <param name="ex"></param>
- public void WriteLog(Exception ex)
+ /// <param name="appendMsg">闄勫姞娑堟伅</param>
+ public void WriteLog(Exception ex, string appendMsg = "")
{
//Log鍑哄姏
- string msg = ex.Message + "\r\n";
+ string msg = appendMsg == "" ? string.Empty : appendMsg + "\r\n";
+ msg += ex.Message + "\r\n";
msg += ex.StackTrace;
this.WriteLog(-1, msg);
}
@@ -54,13 +89,13 @@
/// <summary>
/// Log鍑哄姏
/// </summary>
- /// <param name="div">1:鏅�歀og,-1:鑷村懡閿欒Log</param>
+ /// <param name="div">1:鏅�歀og,-1:鑷村懡閿欒Log,2,3:鐗规畩Log</param>
/// <param name="strLog">Log鍐呭</param>
public void WriteLog(int div, string strLog)
{
lock (objLock)
{
- if (div != -1 && UserCenterResourse.HideOption.DetailedLog == 0)
+ if (div == 1 && UserCenterResourse.HideOption.DetailedLog == 0)
{
//鏆傛椂鍙褰曞紓甯镐俊鎭�
return;
@@ -69,9 +104,21 @@
System.IO.StreamWriter sw = null;
try
{
- string fileName = this.GetLogFile(div);
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.LogDirectory, fileName);
- strLog = "[" + DateTime.Now.ToString("yyyyMMdd HH:mm:ss") + "] " + strLog + "\r\n";
+ string fullName = string.Empty;
+ if (div == 1 || div == -1)
+ {
+ string fileName = this.GetLogFile(div);
+ fullName = System.IO.Path.Combine(DirNameResourse.LogDirectory, fileName);
+ }
+ else if (div == 2)
+ {
+ fullName = DirNameResourse.SendAndReceveDataLog;
+ }
+ else if (div == 3)
+ {
+ 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);
sw.WriteLine(strLog);
}
@@ -92,7 +139,7 @@
private string GetLogFile(int div)
{
//鍔犲瘑,鍥犱负杩欐槸鏀堕泦鏁版嵁,鏈�濂戒笉璁╁埆浜虹煡閬撹繖鏄粈涔堟渶濂�
- string fileName = DateTime.Now.ToString("yyyyMMdd");
+ string fileName = UserCenterResourse.UserInfo.Account + "-" + DateTime.Now.ToString("yyyyMMdd");
if (div == -1)
{
fileName += "Error";
--
Gitblit v1.8.0