1、合并master与2021.1

PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/logger.h

@@ -20,6 +20,7 @@ public:
 
   CLogger(CString m_Name)
   {
+      IsEnabledLog = false;
     m_File = NULL;
     CString Path=_T("");            // Speed optimization - noticed slow in GlowCode
     if (Path.IsEmpty()) {
@@ -36,22 +37,26 @@ public:
     }
     m_FileName=Path + m_Name;//_T("\\SO7_SSILog.txt");
     m_lLogMask=0;
+    InitializeCriticalSection(&m_lockLogger);
   };
   ~CLogger()
   {
     if (m_File)
       fclose(m_File);
+    DeleteCriticalSection(&m_lockLogger);
   };
-  void SendAtTime(const char* buffer);
+  void SendAtTime(const TCHAR* buffer);
   void Send(LPCTSTR, ...);
   void SendAndFlush(LPCTSTR, ...);
   void SendAndFlushPerMode(LPCTSTR, ...);
   void SendAndFlushWithTime(LPCTSTR, ...);
+  bool IsEnabledLog/* = false*/;//ÊÇ·ñÆôÓÃÈÕÖ¾
   CString m_FileName;
   long m_lLogMask;
   FILE *m_File;
   _TCHAR  m_Str[20000];
   _TCHAR  m_Str2[20000];
+  CRITICAL_SECTION m_lockLogger;
 };
 
 #endif // !defined(LOGGER_H__5142BB38_5565_4124_88A4_56EA08298154__INCLUDED_)