com.amanotes.gdk 0.2.45 → 0.2.47

package/Runtime/{AmaGDK.Internal.SemVer.cs → Internal/AmaGDK.Internal.SemVer.cs}

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using UnityEngine.Profiling;
 using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
@@ -8,6 +9,7 @@ namespace Amanotes.Core.Internal
     public struct SemVer : IComparable<SemVer>, IComparer<SemVer>
     {
         public static readonly SemVer ZERO = new SemVer(0, 0, 0);
+        private static readonly Regex VERSION_PATTERN = new Regex(@"^(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?$");
 
         public int major;
         public int minor;
@@ -30,25 +32,27 @@ namespace Amanotes.Core.Internal
             extra = -1;
 
             if (string.IsNullOrEmpty(version)) return;
-
-            version = version.Trim();
-
-            var regex = new Regex(@"^(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?$");
-            Match match = regex.Match(version);
-            if (!match.Success)
+            
+            Profiler.BeginSample("AmaGDK.SemVer()");
             {
-                LogWarning($"Invalid SemVer string: [{version}]");
-                return;
+                version = version.Trim();
+                Match match = VERSION_PATTERN.Match(version);
+                if (!match.Success)
+                {
+                    LogWarning($"Invalid SemVer string: [{version}]");
+                    Profiler.EndSample();
+                    return;
+                }
+                major = int.Parse(match.Groups[1].Value);
+                minor = int.Parse(match.Groups[2].Value);
+                patch = int.Parse(match.Groups[3].Value);
+                if (match.Groups.Count > 3)
+                {
+                    if (!int.TryParse(match.Groups[4].Value, out extra))
+                        extra = -1;
+                }
             }
-            major = int.Parse(match.Groups[1].Value);
-            minor = int.Parse(match.Groups[2].Value);
-            patch = int.Parse(match.Groups[3].Value);
-            if (match.Groups.Count > 3)
-            {
-                if (!int.TryParse(match.Groups[4].Value, out extra))
-                    extra = -1;
-            }
-
+            Profiler.EndSample();
         }
 
         public bool isValid => this != ZERO;

package/Runtime/{AmaGDK.Internal.cs → Internal/AmaGDK.Internal.cs}

@@ -22,7 +22,7 @@ namespace Amanotes.Core.Internal
 
     public static class Messsage
     {
-        public const string READY = "init success";
+        public const string READY = "Init success";
         public const string SDK_INIT_CALLED = "init has been called!";
         public const string MULTIPLE_INSTANCE = "multiple instance found!";
         public const string CONFIG_NOT_FOUND = "AmaGDKConfig not found in Resources!";
@@ -52,11 +52,11 @@ namespace Amanotes.Core.Internal
                 return;
             }
 
-            var newPrefab = PrefabUtility.InstantiatePrefab(prefab) as GameObject;
-            newPrefab.name = "AmaGDK";
-            newPrefab.transform.SetAsLastSibling();
+            GameObject go = UnityObject.Instantiate(prefab);
+            go.name = "AmaGDK";
+            go.transform.SetAsLastSibling();
             Selection.activeObject = null;
-            Selection.activeObject = newPrefab;
+            Selection.activeObject = go;
         }
 #endif
     }
@@ -113,7 +113,18 @@ namespace Amanotes.Core.Internal
                 // Logging.LogWarning("Something wrong: another AmaGDK instance found!");
                 UnityObject.Destroy(result[i].gameObject);
             }
-
+            
+            // Reset all adapter status
+            var allAdapters = Adapter2.GetAllAdapter<Adapter2>();
+            foreach (var adapter in allAdapters)
+            {
+                adapter.status = Status.None;
+            }
+            
+            // Reset all modules
+            Ads.context = null;
+            Ads._adapter = null;
+            
             _status = Status.None;
             _allowInit = false;
 

package/Runtime/{AmaGDK.Utils.cs → Internal/AmaGDK.Utils.cs}

@@ -2,9 +2,11 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using UnityEngine;
+using UnityEngine.Profiling;
 using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
@@ -15,12 +17,75 @@ namespace Amanotes.Core.Internal
         {
             AmaGDK._instance.StartCoroutine(DelayCallRoutine(seconds, action));
         }
+        
+        public static void RegisterUnityCallbacks<T>(T target)
+        {
+            if (target == null)
+            {
+                LogWarning("RegisterUnityCallbacks: Target is null!");
+                return;
+            }
+            
+            if (target is IOnFrameUpdate u)
+            {
+                AmaGDK.onFrameUpdate -= u.OnFrameUpdate;
+                AmaGDK.onFrameUpdate += u.OnFrameUpdate;
+            }
+
+            if (target is IOnApplicationPause p)
+            {
+                AmaGDK.onApplicationPause -= p.OnApplicationPause;
+                AmaGDK.onApplicationPause += p.OnApplicationPause;
+            }
+            
+            if (target is IOnApplicationFocus f)
+            {
+                AmaGDK.applicationFocus -= f.OnApplicationFocus;
+                AmaGDK.applicationFocus += f.OnApplicationFocus;
+            }
+            
+            if (target is IOnApplicationQuit q)
+            {
+                AmaGDK.applicationQuit -= q.OnApplicationQuit;
+                AmaGDK.applicationQuit += q.OnApplicationQuit;
+            }
+        }
 
         private static IEnumerator DelayCallRoutine(float seconds, Action callback)
         {
             yield return new WaitForSecondsRealtime(seconds);
             callback();
         }
+        
+        public static IEnumerator Timeout(float timeoutInSecs, Func<bool> completeCheckFunc)
+        {
+            float time = Time.realtimeSinceStartup;
+            while (completeCheckFunc() == false)
+            {
+                yield return null;
+                if (Time.realtimeSinceStartup - time > timeoutInSecs) yield break;
+            }
+        }
+    }
+    
+    public static class GDKReflection
+    {
+        internal static readonly BindingFlags FLAGS = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
+        public static T GetFieldValue<T>(this object source, string fieldName, BindingFlags? flags = null)
+        {
+            if (source == null) return default(T);
+            Type sourceType = source.GetType();
+            FieldInfo field = sourceType.GetField(fieldName, flags ?? FLAGS);
+            
+            if (field == null)
+            {
+                LogWarning($"fieldName <{fieldName}> not found in {sourceType}?");
+                return default(T);
+            }
+            
+            return (T)field.GetValue(source);
+        }
+        
     }
     
     internal static class GDKFileUtils
@@ -165,12 +230,12 @@ namespace Amanotes.Core.Internal
         
         internal static void ClearCacheData()
         {
-            StringBuilder logBuilder = new StringBuilder();
-            logBuilder.AppendLine("[AmaGDK] All cached data & stats cleared");
+            var sb = new StringBuilder();
+            sb.AppendLine("[AmaGDK] All cached data & stats cleared");
             
             if (!Directory.Exists(basePath))
             {
-                logBuilder.AppendLine("Cache path not exists: " + basePath);
+                sb.AppendLine("Cache path not exists: " + basePath);
                 return;
             }
             
@@ -178,9 +243,9 @@ namespace Amanotes.Core.Internal
             foreach (string path in filePaths)
             {
                 Delete(path);
-                logBuilder.AppendLine($"[deleted] - {path}");
+                sb.AppendLine($"[deleted] - {path}");
             }
-            Debug.Log(logBuilder);
+            Debug.Log(sb);
         }
     }
 
@@ -253,14 +318,21 @@ namespace Amanotes.Core.Internal
     {
         public static T LoadJsonFromFile<T>(this T instance) where T : IJsonFile, new()
         {
-            if (instance == null)
-            {
-                var result = new T();
-                instance = result;
-            }
+            instance ??= new T();
+            
             string fileName = instance.GetType().Name;
             string json = GDKFileUtils.Load(fileName);
-            JsonUtility.FromJsonOverwrite(json, instance);
+            if (!string.IsNullOrEmpty(json))
+            {
+                try
+                {
+                    JsonUtility.FromJsonOverwrite(json, instance);
+                } catch (Exception e)
+                {
+                    LogWarning("LoadJsonFromFile error: " + fileName + "\n" + e);
+                }
+            }
+            
             return instance;
         }
 
@@ -293,7 +365,8 @@ namespace Amanotes.Core.Internal
         public static string DictionaryToJson(IDictionary inputDict, bool format = false, bool checkJsonInString = true)
         {
             if (inputDict == null) return "{}";
-
+            
+            Profiler.BeginSample("AmaGDK.JsonUtils.DictionaryToJson()");
             var jsonSb = new StringBuilder();
             jsonSb.Append("{");
             var isFirstElement = true;
@@ -311,12 +384,13 @@ namespace Amanotes.Core.Internal
 
                 jsonSb.AppendFormat("{0}\"{1}\":", format ? "\n" : "", key);
                 AppendJsonValue(ref jsonSb, key, value, format, checkJsonInString);
-
             }
 
             jsonSb.AppendFormat("{0}{1}", format ? "\n" : "", "}");
-
-            return jsonSb.ToString();
+            var result = jsonSb.ToString();
+            Profiler.EndSample();
+            
+            return result;
         }
 
         private static void GetJsonIListValue(ref StringBuilder jsonSb, string key, IList list, bool format)
@@ -396,8 +470,8 @@ namespace Amanotes.Core.Internal
 
         private static string EscapeJsonString(string input)
         {
-            //Match any occurrence of a backslash(\), single quotation('), or double quotation (")
-            string pattern = "[\\\'\"]";
+            //Match any occurrence of a backslash(\) and double quotation (")
+            string pattern = "[\\\"]";
             return Regex.Replace(input, pattern, match => $"\\{match.Value}");
         }
 

package/Runtime/Internal.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cdfa0e7b648474e318ef91524d78c99a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

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

package/Packages/IronsourceAdapter_v7.2.6.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1a3999539db3049c998b0c84b7f92f07
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Packages/RevenueCatAdapter_v6.0.0.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8143c4447d1894317ac84680e221eec3
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: