johnclot69 il y a 1 an
Parent
commit
3657355b17

+ 5 - 12
DotNet/Model/Module/RobotCase/RobotLog.cs

@@ -2,26 +2,19 @@ namespace ET.Server
 {
     public static class RobotLog
     {
-#if DOTNET
-        public static void Debug(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
-        {
-            Logger.Instance.Debug(message.ToStringAndClear());
-        }
-
-        public static void Console(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
+        public static void Debug(string msg)
         {
-            Logger.Instance.Console(message.ToStringAndClear());
+            Log.Info(msg);
         }
-#endif
 
-        public static void Debug(string msg)
+        public static void Debug(string msg, params object[] args)
         {
-            Logger.Instance.Debug(msg);
+            Log.Info(msg, args);
         }
 
         public static void Console(string msg)
         {
-            Logger.Instance.Console(msg);
+            Log.Console(msg);
         }
     }
 }

+ 18 - 19
Unity/Assets/Scripts/Core/Module/Log/Log.cs

@@ -34,46 +34,45 @@ namespace ET
             Logger.Instance.Error(msg);
         }
 
-        public static void Error(Exception msg)
+        public static void Error(Exception e)
         {
-            Logger.Instance.Error(msg);
+            Logger.Instance.Error(e);
         }
 
-        public static void Console(string msg)
+        public static void Trace(string message, params object[] args)
         {
-            Logger.Instance.Console(msg);
+            Logger.Instance.Trace(message, args);
         }
 
-#if DOTNET
-        public static void Trace(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
+        public static void Warning(string message, params object[] args)
         {
-            Logger.Instance.Trace(message.ToStringAndClear());
+            Logger.Instance.Warning(string.Format(message, args));
         }
 
-        public static void Warning(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
+        public static void Info(string message, params object[] args)
         {
-            Logger.Instance.Warning(message.ToStringAndClear());
+            Logger.Instance.Info(string.Format(message, args));
         }
 
-        public static void Info(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
+        public static void Debug(string message, params object[] args)
         {
-            Logger.Instance.Info(message.ToStringAndClear());
+            Logger.Instance.Debug(string.Format(message, args));
+
         }
 
-        public static void Debug(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
+        public static void Error(string message, params object[] args)
         {
-            Logger.Instance.Debug(message.ToStringAndClear());
+            Logger.Instance.Error(message, args);
         }
 
-        public static void Error(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
+        public static void Console(string message)
         {
-            Logger.Instance.Error(message.ToStringAndClear());
+            Logger.Instance.Console(message);
         }
 
-        public static void Console(ref System.Runtime.CompilerServices.DefaultInterpolatedStringHandler message)
+        public static void Console(string message, params object[] args)
         {
-            Logger.Instance.Console(message.ToStringAndClear());
+            Logger.Instance.Console(message, args);
         }
-#endif
     }
-}
+}