合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

 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:普通Log,-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();