From 8b4d79ca03495e522a1953e04ca17527f33c853a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 13:22:17 +0800
Subject: [PATCH] 合并完成代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
index 3f2e723..df93dac 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
@@ -42,23 +42,34 @@
/// <summary>
/// Log鍑哄姏
/// </summary>
+ /// <param name="ex"></param>
+ public void WriteLog(Exception ex)
+ {
+ //Log鍑哄姏
+ string msg = ex.Message + "\r\n";
+ msg += ex.StackTrace;
+ this.WriteLog(-1, msg);
+ }
+
+ /// <summary>
+ /// Log鍑哄姏
+ /// </summary>
/// <param name="div">1:鏅�歀og,-1:鑷村懡閿欒Log</param>
/// <param name="strLog">Log鍐呭</param>
public void WriteLog(int div, string strLog)
{
lock (objLock)
{
- if (div != -1)
- {
- //鏆傛椂鍙褰曞紓甯镐俊鎭�
- return;
- }
+ //if (div != -1)
+ //{
+ // //鏆傛椂鍙褰曞紓甯镐俊鎭�
+ // return;
+ //}
//Log鏂囦欢
string fileName = this.GetLogFile(div);
string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.LogDirectory, fileName);
- strLog = "[" + DateTime.Now.ToString("yyyyMMdd HH:mm:ss") + "] " + strLog;
- strLog = UserCenterLogic.EncryptPassword("1|Oli]7p", strLog);
+ strLog = "[" + DateTime.Now.ToString("yyyyMMdd HH:mm:ss") + "] " + strLog + "\r\n";
var sw = new System.IO.StreamWriter(fullName, true, Encoding.UTF8);
sw.WriteLine(strLog);
sw.Close();
--
Gitblit v1.8.0