From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
index 2895fed..5ad7ed1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
@@ -43,10 +43,12 @@
/// 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);
}
@@ -60,7 +62,7 @@
{
lock (objLock)
{
- if (div != -1)
+ if (div != -1 && UserCenterResourse.HideOption.DetailedLog == 0)
{
//鏆傛椂鍙褰曞紓甯镐俊鎭�
return;
@@ -92,16 +94,16 @@
private string GetLogFile(int div)
{
//鍔犲瘑,鍥犱负杩欐槸鏀堕泦鏁版嵁,鏈�濂戒笉璁╁埆浜虹煡閬撹繖鏄粈涔堟渶濂�
- string fileName = DateTime.Now.ToString("yyyyMMdd");
+ string fileName = UserCenterResourse.UserInfo.Account + "-" + DateTime.Now.ToString("yyyyMMdd");
if (div == -1)
- {
- fileName += "Log";
- }
- else if (div == 1)
{
fileName += "Error";
}
- fileName = UserCenterLogic.EncryptPassword("4^Olh_3f", fileName);
+ else if (div == 1)
+ {
+ fileName += "Log";
+ }
+ fileName = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, fileName);
return fileName;
}
#endregion
--
Gitblit v1.8.0