Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 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