com.amanotes.gdk 0.2.71 → 0.2.72

package/Runtime/Fps/AmaFPS.Utils.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 using UnityEngine;
 namespace Amanotes.Core
 {

package/Runtime/Fps/AmaFPS.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Amanotes.Core.Internal;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 using UnityEngine;
 using UnityEngine.Events;
 

package/Runtime/Fps/AmaFPSVisualizer.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Profiling;
 using UnityEngine.UI;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {

package/Runtime/Fps/FrameRecorder.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {

package/Runtime/GDKAudio/GDKAudio.cs

@@ -7,9 +7,12 @@
 // 2. On Android devices (excluding the Unity Editor).
 // 3. In the Unity Editor running on macOS with Apple Silicon (M1, M2, etc.).
 #if UNITY_2021_1_OR_NEWER && ((UNITY_MOBILE && !UNITY_EDITOR) || (UNITY_MOBILE && UNITY_EDITOR_OSX))
+
 using System;
 using System.Runtime.InteropServices;
 using Amanotes.Core.Internal;
+using static Amanotes.Core.GDKDebug;
+
 using UnityEngine;
 
 namespace Amanotes.Core
@@ -212,7 +215,7 @@ namespace Amanotes.Core
                     ) / numChannel;
                 audioData = new float[numSamples*numChannel];
                 Marshal.Copy(audioDataResample, audioData, 0, numSamples*numChannel);
-                Logging.LogWarning(
+                LogWarning(
                     "Warning: The input AudioClip has a sample rate of " + fs + " Hz," +
                     " which does not match AudioSetting sample rate of " + AudioSettings.outputSampleRate + " Hz." +
                     " GDKAudio will resample the audio to match AudioSetting with high memory usage." +
@@ -220,17 +223,17 @@ namespace Amanotes.Core
                 );
             }
 
-            Logging.Log("[AAA]numSamples: " + numSamples);
-            Logging.Log("[AAA]numChannel:" + numChannel);
-            Logging.Log("[AAA]bufferLength:" + bufferLength);
-            Logging.Log("[AAA]numBuffer:" + numBuffer);
+            Log("[AAA]numSamples: " + numSamples);
+            Log("[AAA]numChannel:" + numChannel);
+            Log("[AAA]bufferLength:" + bufferLength);
+            Log("[AAA]numBuffer:" + numBuffer);
 
             nFFT = 2048;
             // hop = 512;
 
             numFrame = (numSamples - nFFT) / hop;
             // Initialize
-            Logging.Log("[AAA]TSM_Init");
+            Log("[AAA]TSM_Init");
             TSM_Init(audioData, speed, fs, numChannel,  nFFT,  hop, ref ptrL, ref ptrR);
             initialized = true;
             hopFrame = new float[hop*numChannel];
@@ -239,7 +242,7 @@ namespace Amanotes.Core
 
             audioSource.clip = audioClip;
             audioSource.loop = loop;
-            Logging.Log("[AAA]AudioSettings.outputSampleRate (later): " + AudioSettings.outputSampleRate);
+            Log("[AAA]AudioSettings.outputSampleRate (later): " + AudioSettings.outputSampleRate);
         }
 
         private void OnAudioFilterRead(float[] data, int channels)
@@ -257,7 +260,7 @@ namespace Amanotes.Core
                     return;
                 }
                 idxFrame = 0;
-                Logging.Log("[AAA] Loop");
+                Log("[AAA] Loop");
             }
 
 

package/Runtime/Internal/AmaGDK.Internal.cs

@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
-using System.Text;
 using UnityEngine;
 using UnityObject = UnityEngine.Object;
 using static Amanotes.Core.AmaGDK.Analytics;
 using static Amanotes.Core.AmaGDK;
+using static Amanotes.Core.GDKDebug;
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -63,40 +63,29 @@ namespace Amanotes.Core.Internal
         }
 #endif
     }
-
+    
+    #if !AMAGDK_DEV
+    
+    [Obsolete("Deprecated class - use GDKDebug instead!")]
     public static class Logging
     {
-        public static Action<string> logNonfatalErrorHook = null;
-        private static readonly HashSet<string> nonFatalDict = new HashSet<string>();
-        public static readonly HashSet<string> logWarningDict = new HashSet<string>();
-
+        [Obsolete("Deprecated method - use GDKDebug.LogWarningOnce() instead!")]
         public static void LogWarningOnce(string message, string key = null)
-        {
-            if (Config.common.logLevel < LogLevel.Warning) return;
-            if (string.IsNullOrEmpty(key)) key = message;
-            if (!logWarningDict.Add(key)) return;
-            Debug.LogWarning($"AmaGDK {message}");
-        }
+            => GDKDebug.LogWarningOnce(message, key);
+    
+        [Obsolete("Deprecated method - use GDKDebug.LogWarning() instead!")]
         public static void LogWarning(string message)
-        {
-            if (Config.common.logLevel >= LogLevel.Warning) Debug.LogWarning($"AmaGDK {message}");
-        }
+            => GDKDebug.LogWarning(message);
+        
+        [Obsolete("Deprecated method - use GDKDebug.LogError() instead!")]
         public static void LogError(string message)
-        {
-            if (Config.common.logLevel >= LogLevel.Error) Debug.LogError($"AmaGDK {message}");
-            if (logNonfatalErrorHook == null) return;
-            GDKUtils.DoOnMainThread(() =>
-            {
-                if (nonFatalDict.Contains(message)) return; // LogOnce
-                nonFatalDict.Add(message);
-                logNonfatalErrorHook(message);    
-            });
-        }
+            => GDKDebug.LogError(message);
+        
+        [Obsolete("Deprecated method - use GDKDebug.Log() instead!")]
         public static void Log(string message)
-        {
-            if (Config.common.logLevel == LogLevel.Verbose) Debug.Log($"AmaGDK {message}");
-        }
+            => GDKDebug.Log(message);
     }
+    #endif
 
     public static class Forbidden
     {
@@ -141,7 +130,7 @@ namespace Amanotes.Core.Internal
                 }
 #endif
 
-                // Logging.LogWarning("Something wrong: another AmaGDK instance found!");
+                // LogWarning("Something wrong: another AmaGDK instance found!");
                 UnityObject.Destroy(result[i].gameObject);
             }
             
@@ -203,10 +192,10 @@ namespace Amanotes.Core.Internal
         public static void ThrowExceptionIfEditor(string message)
         {
             #if UNITY_EDITOR
-            throw new GDKException(message);
-            #else
-            Logging.LogError(message);
+            if (Application.isEditor) throw new GDKException(message);
             #endif
+            
+            LogError(message);
         }
         
         /// <summary>

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using UnityEngine;
 using UnityEngine.Profiling;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {
@@ -268,7 +268,7 @@ namespace Amanotes.Core.Internal
         
         public static void ClearCacheData()
         {
-            var sb = GDKPool.TakeStringBuilder();
+            var sb = GDKPool.GetStringBuilder();
             sb.AppendLine("[AmaGDK] All cached data & stats cleared");
             
             if (!Directory.Exists(basePath))
@@ -411,7 +411,7 @@ namespace Amanotes.Core.Internal
             if (inputDict == null) return "{}";
             
             Profiler.BeginSample("AmaGDK.JsonUtils.DictionaryToJson()");
-            var jsonSb = GDKPool.TakeStringBuilder(8192);
+            var jsonSb = GDKPool.GetStringBuilder(8);
             jsonSb.Append("{");
             bool isFirstElement = true;
             
@@ -431,7 +431,7 @@ namespace Amanotes.Core.Internal
             }
             
             jsonSb.AppendFormat("{0}{1}", format ? "\n" : "", "}");
-            var result = GDKPool.ReturnAndStringify(jsonSb);
+            var result = GDKPool.ReturnString(jsonSb);
             Profiler.EndSample();
             
             return result;

package/Runtime/Internal/AmaGDK.WebUtils.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Text;
 using UnityEngine;
 using UnityEngine.Networking;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {

package/Runtime/Internal/GDKGeoLocationcs.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections;
 using UnityEngine;
 using UnityEngine.Networking;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {
@@ -39,7 +40,7 @@ namespace Amanotes.Core.Internal
             {
                 result?.Invoke(data.countryCode?.ToUpper());
                 if (data.errorMessage != null)
-                    Logging.Log(data.errorMessage);
+                    Log(data.errorMessage);
             });
         }
 

package/Runtime/Internal/GDKServerTime.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Networking;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {
@@ -189,7 +190,7 @@ namespace Amanotes.Core.Internal
                 else
                 {
                     result?.Invoke(null);
-                    Logging.Log(data.errorMessage);
+                    Log(data.errorMessage);
                     FetchTimeWithOtherProvider();
                 }
             });

package/Runtime/Klavar/KlavarContainer.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Reflection;
-using Amanotes.Core.Internal;
 using UnityEngine;
 using GUID = System.Guid;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {
@@ -26,10 +26,10 @@ namespace Amanotes.Core
         public static void ThrowIfEditor(string message)
         {
             #if UNITY_EDITOR
-            throw new KlavarException(message);
-            #else
-            Logging.LogError(message);
+            if (Application.isEditor) throw new KlavarException(message);
             #endif
+            
+            LogError(message);
         }
 
         public static void ThrowErrorOnField(object parent, FieldInfo fieldInfo, string message)

package/Runtime/UserProfile/Plugins/Android/AdvertisingIdFetcher.cs

@@ -1,6 +1,6 @@
 using System;
 using UnityEngine;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {

package/Runtime/Utils/GDKUtils.cs

@@ -1,6 +1,6 @@
 using System;
 using UnityEngine;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.71",
+    "version": "0.2.72",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",