合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

 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);

        }

@@ -101,7 +103,7 @@
            {

                fileName += "Log";

            }

            fileName = UserCenterLogic.EncryptPassword("4^Olh_3f", fileName);

            fileName = UserCenterLogic.EncryptPassword(UserCenterResourse.FileEncryptKey, fileName);

            return fileName;

        }

        #endregion