com.amanotes.gdk 0.1.20 → 0.2.1

package/Runtime/AmaGDK.Utils.cs

@@ -4,23 +4,42 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using UnityEngine;
-
 using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
 {
     internal class FileUtils
     {
+
+        private static string _basePath;
+        private static string basePath
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(_basePath)) return _basePath;
+                _basePath = Application.isEditor
+                    ? Path.Combine(Directory.GetCurrentDirectory(), "Library", "AmaGDK")
+                    : Path.Combine(Application.persistentDataPath, "AmaGDK");
+
+                if (!Directory.Exists(_basePath)) Directory.CreateDirectory(_basePath);
+                return _basePath;
+            }
+        }
         internal static string GetPath(string fileName)
         {
             return Path.Combine(basePath, fileName);
         }
 
+        internal static bool Exist(string fileName)
+        {
+            return File.Exists(GetPath(fileName));
+        }
+
         internal static void Save(string fileName, string content)
         {
             if (string.IsNullOrWhiteSpace(fileName))
             {
-                LogWarningOnce($"File name must be not null or empty");
+                LogWarningOnce("File name must be not null or empty");
                 return;
             }
 
@@ -45,7 +64,7 @@ namespace Amanotes.Core.Internal
         {
             if (string.IsNullOrWhiteSpace(fileName))
             {
-                LogWarningOnce($"File name must be not null or empty");
+                LogWarningOnce("File name must be not null or empty");
                 return;
             }
 
@@ -62,14 +81,14 @@ namespace Amanotes.Core.Internal
             catch (Exception ex)
             {
                 LogWarningOnce(path + "\n" + ex);
-            }            
+            }
         }
 
         internal static void SaveAppend(string fileName, string content)
         {
             if (string.IsNullOrWhiteSpace(fileName))
             {
-                LogWarningOnce($"File name must be not null or empty");
+                LogWarningOnce("File name must be not null or empty");
                 return;
             }
 
@@ -87,15 +106,15 @@ namespace Amanotes.Core.Internal
             {
                 LogWarningOnce(path + "\n" + ex);
             }
-        }        
+        }
 
         internal static string Load(string fileName)
         {
-            string content = "";
+            var content = "";
 
             if (string.IsNullOrWhiteSpace(fileName))
             {
-                LogWarningOnce($"File name must be not null or empty");
+                LogWarningOnce("File name must be not null or empty");
                 return content;
             }
 
@@ -128,28 +147,13 @@ namespace Amanotes.Core.Internal
                 LogWarningOnce(path + "\n" + ex);
             }
         }
-
-        private static string _basePath;
-        private static string basePath
-        {
-            get
-            {
-                if (!string.IsNullOrEmpty(_basePath)) return _basePath;
-                _basePath = Application.isEditor
-                    ? Path.Combine(Directory.GetCurrentDirectory(), "Library", "AmaGDK")
-                    : Path.Combine(Application.persistentDataPath, "AmaGDK");
-
-                if (!Directory.Exists(_basePath)) Directory.CreateDirectory(_basePath);
-                return _basePath;
-            }
-        }
     }
 
     public class ActionQueue
     {
-        private Queue<Action<Action>> queue;
-        private bool isProcessing = false;
-        private Action onComplete;
+        private bool isProcessing;
+        private readonly Action onComplete;
+        private readonly Queue<Action<Action>> queue;
 
         public ActionQueue(Action onComplete)
         {
@@ -165,7 +169,7 @@ namespace Amanotes.Core.Internal
                 return;
             }
 
-            foreach (var action in actions)
+            foreach (Action<Action> action in actions)
             {
                 if (action == null) continue;
                 queue.Enqueue(action);
@@ -174,8 +178,7 @@ namespace Amanotes.Core.Internal
 
         private void ProcessQueue()
         {
-            if (isProcessing)
-                return;
+            if (isProcessing) return;
             if (queue.Count == 0)
             {
                 onComplete?.Invoke();
@@ -194,8 +197,7 @@ namespace Amanotes.Core.Internal
                 }
             }
 
-            if(nextAction == null)
-                onComplete?.Invoke();
+            if (nextAction == null) onComplete?.Invoke();
         }
 
         public void StartQueue()
@@ -222,7 +224,7 @@ namespace Amanotes.Core.Internal
                 instance = result;
             }
             string fileName = instance.GetType().Name;
-            var json = FileUtils.Load(fileName);
+            string json = FileUtils.Load(fileName);
             JsonUtility.FromJsonOverwrite(json, instance);
             return instance;
         }
@@ -230,7 +232,7 @@ namespace Amanotes.Core.Internal
         public static void SaveJsonToFile<T>(this T instance) where T : IJsonFile
         {
             string fileName = instance.GetType().Name;
-            var json = JsonUtility.ToJson(instance);
+            string json = JsonUtility.ToJson(instance);
             FileUtils.Save(fileName, json);
         }
     }
@@ -239,7 +241,7 @@ namespace Amanotes.Core.Internal
     {
         public static string TupleToJson(params (string key, object value)[] parameters)
         {
-            Dictionary<string, object> tupleToDict = new Dictionary<string, object>();
+            var tupleToDict = new Dictionary<string, object>();
             foreach (var item in parameters)
             {
                 tupleToDict.Add(item.key, item.value);
@@ -249,24 +251,21 @@ namespace Amanotes.Core.Internal
 
         public static string KeyValueToJson(string key, object value)
         {
-            return DictionaryToJson(new Dictionary<string, object>() { { key, value } });
+            return DictionaryToJson(new Dictionary<string, object>
+                { { key, value } });
         }
 
-        public static string DictionaryToJson(IDictionary inputDict, bool format = false)
+        public static string DictionaryToJson(IDictionary inputDict, bool format = false, bool checkJsonInString = true)
         {
-            if (inputDict == null)
-                return "{}";
+            if (inputDict == null) return "{}";
 
-            StringBuilder jsonSb = new StringBuilder();
+            var jsonSb = new StringBuilder();
             jsonSb.Append("{");
             var isFirstElement = true;
 
             foreach (DictionaryEntry entry in inputDict)
             {
-                if (entry.Key == null || string.IsNullOrEmpty(entry.Key.ToString()))
-                {
-                    continue;
-                }
+                if (entry.Key == null || string.IsNullOrEmpty(entry.Key.ToString())) continue;
                 var key = entry.Key.ToString();
                 var value = entry.Value;
 
@@ -276,7 +275,7 @@ namespace Amanotes.Core.Internal
                     jsonSb.Append(",");
 
                 jsonSb.AppendFormat("{0}\"{1}\":", format ? "\n" : "", key);
-                AppendJsonValue(ref jsonSb, key, value, format);
+                AppendJsonValue(ref jsonSb, key, value, format, checkJsonInString);
 
             }
 
@@ -297,48 +296,68 @@ namespace Amanotes.Core.Internal
                 else
                     jsonSb.Append(",");
 
-                if (format)
-                    jsonSb.AppendLine();
-                AppendJsonValue(ref jsonSb, key, item, format);
+                if (format) jsonSb.AppendLine();
+                AppendJsonValue(ref jsonSb, key, item, format, false);
             }
 
-            if (format)
-            {
-                jsonSb.AppendLine();
-            }
+            if (format) jsonSb.AppendLine();
             jsonSb.Append("]");
         }
 
-        private static void AppendJsonValue(ref StringBuilder jsonSb, string key, object value, bool format)
+        private static void AppendJsonValue(ref StringBuilder jsonSb, string key, object value, bool format, bool checkJsonInString)
         {
             if (value == null)
             {
                 jsonSb.Append("null");
+                return;
             }
+
             if (value is string)
             {
+                var s = value.ToString();
+                if (checkJsonInString)
+                {
+                    if (s.StartsWith("{") && s.EndsWith("}"))
+                    {
+                        jsonSb.Append(s);
+                        return;
+                    }
+                    if (s.StartsWith("[") && s.EndsWith("]"))
+                    {
+                        jsonSb.Append(s);
+                        return;
+                    }
+                }
+
                 jsonSb.Append($"\"{value}\"");
+                return;
             }
-            else if (value is int || value is float || value is double || value is long)
+
+            if (value is int || value is float || value is double || value is long)
             {
                 jsonSb.Append($"{value}");
+                return;
             }
-            else if (value is bool)
+
+            if (value is bool)
             {
                 jsonSb.Append((bool)value ? "true" : "false");
+                return;
             }
-            else if (value is IDictionary)
+
+            if (value is IDictionary)
             {
                 jsonSb.Append($"{DictionaryToJson((IDictionary)value, format)}");
+                return;
             }
-            else if (value is IList || value is Array)
+
+            if (value is IList || value is Array)
             {
                 GetJsonIListValue(ref jsonSb, key, (IList)value, format);
+                return;
             }
-            else
-            {
-                jsonSb.Append($"{JsonUtility.ToJson(value, format)}");
-            }
+
+            jsonSb.Append($"{JsonUtility.ToJson(value, format)}");
         }
 
         //public static T[] FromJsonToArray<T>(string json)

package/Runtime/AmaGDK.WebUtils.cs

@@ -1,34 +1,20 @@
-using System.Collections;
-using UnityEngine.Networking;
-using System;
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Text;
 using UnityEngine;
+using UnityEngine.Networking;
 using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
 {
     public class JsonWebRequest<T> : UnityWebRequest where T : class
     {
-
-        [Serializable]
-        internal class ResponseError
-        {
-            public string error;
-            public string message;
-            public string statusCode;
-        }
-
-        [Serializable]
-        internal class ResponseT
-        {
-            public T data;
-            public ResponseError error = null;
-        }
-
-        private string requestJson;
-        private string requestHeader;
         public T data;
         public bool isResponseError;
+        private readonly string requestHeader;
+
+        private readonly string requestJson;
 
         public JsonWebRequest(string url, string json, string header = "") : base(url, "POST")
         {
@@ -47,24 +33,23 @@ namespace Amanotes.Core.Internal
 
         public new IEnumerator Send()
         {
-            byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(requestJson);
+            byte[] bodyRaw = Encoding.UTF8.GetBytes(requestJson);
             uploadHandler = new UploadHandlerRaw(bodyRaw);
             downloadHandler = new DownloadHandlerBuffer();
             SetRequestHeader(new Dictionary<string, string>
             {
-                {"Authorization", $"bearer {requestHeader}"},
-                {"Content-Type", "application/json"},
-                {"api-token", requestHeader}
+                { "Authorization", $"bearer {requestHeader}" },
+                { "Content-Type", "application/json" },
+                { "api-token", requestHeader }
             });
             yield return SendWebRequest();
-            
-            var httpError = result == Result.ConnectionError || result == Result.ProtocolError;
-            if (httpError)
+
+            if (!string.IsNullOrEmpty(error))
             {
                 LogWarning($"{url} returned {responseCode}: {error}");
                 yield break;
             }
-            
+
             try
             {
                 string result = downloadHandler.text;
@@ -88,22 +73,36 @@ namespace Amanotes.Core.Internal
             {
                 LogWarning($"Error parsing {typeof(T)}: {ex.Message}\n");
                 isResponseError = true;
-                yield break;
             }
         }
+
+        [Serializable]
+        internal class ResponseError
+        {
+            public string error;
+            public string message;
+            public string statusCode;
+        }
+
+        [Serializable]
+        internal class ResponseT
+        {
+            public T data;
+            public ResponseError error;
+        }
     }
 
 
     internal class WebUtils
     {
-        public static Coroutine PostJson(string url, string jsonData, Action<bool, string> onComplete = null, Dictionary<string, string> headers = null)
-        {
-            return AmaGDK._instance.StartCoroutine(PostJsonCoroutine(url, jsonData, onComplete, headers));
-        }
+        public static Coroutine PostJson(string url, string jsonData, Action<bool, string> onComplete = null, Dictionary<string, string> headers = null)
+        {
+            return AmaGDK._instance.StartCoroutine(PostJsonCoroutine(url, jsonData, onComplete, headers));
+        }
 
-        static IEnumerator PostJsonCoroutine(string url, string jsonData, Action<bool, string> onComplete = null, Dictionary<string, string> headers = null)
+        private static IEnumerator PostJsonCoroutine(string url, string jsonData, Action<bool, string> onComplete = null, Dictionary<string, string> headers = null)
         {
-            UnityWebRequest webRequest = new UnityWebRequest(url, "POST");
+            var webRequest = new UnityWebRequest(url, "POST");
             if (headers != null)
             {
                 foreach (KeyValuePair<string, string> kvp in headers)
@@ -112,21 +111,19 @@ namespace Amanotes.Core.Internal
                 }
             }
 
-            byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(jsonData);
+            byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonData);
             webRequest.uploadHandler = new UploadHandlerRaw(bodyRaw);
             webRequest.downloadHandler = new DownloadHandlerBuffer();
             yield return webRequest.SendWebRequest();
 
-            if (webRequest.result != UnityWebRequest.Result.Success)
-            {
-                onComplete?.Invoke(false, webRequest.error);
-                
-            }
-            else
-            {
-                onComplete?.Invoke(true, webRequest.downloadHandler.text);
-            }
-            yield return null;
+            if (!string.IsNullOrEmpty(webRequest.error))
+            {
+                onComplete?.Invoke(false, webRequest.error);
+            }
+            else
+            {
+                onComplete?.Invoke(true, webRequest.downloadHandler.text);
+            }
         }
     }
-}
+}

package/Runtime/AmaGDK.cs

@@ -2,9 +2,6 @@ using System;
 using System.Collections;
 using Amanotes.Core.Internal;
 using UnityEngine;
-
-using ConfigAsset = Amanotes.Core.Internal.ConfigAsset;
-using Status = Amanotes.Core.Internal.Status;
 using static Amanotes.Core.Internal.Logging;
 using static Amanotes.Core.Internal.Messsage;
 
@@ -12,10 +9,9 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.1.20";
+        public const string VERSION = "0.2.1";
 
         internal static AmaGDK _instance;
-        internal static event Action _frameUpdate;
         internal static Status _status = Status.None;
         internal static Action _onReadyCallback;
         internal static bool _allowInit = false;
@@ -28,12 +24,13 @@ namespace Amanotes.Core
             {
                 if (_config != null) return _config;
                 _config = Resources.Load<ConfigAsset>("AmaGDKConfig");
+
                 // if (_config == null) LogWarningOnce(CONFIG_NOT_FOUND);
                 return _config;
             }
         }
 
-        void Awake()
+        private void Awake()
         {
             if (_instance != null && _instance != this)
             {
@@ -42,10 +39,7 @@ namespace Amanotes.Core
                 return;
             }
 
-            if (_instance != null)
-            {
-                LogWarning("Should never be here!");
-            }
+            if (_instance != null) LogWarning("Should never be here!");
 
             _instance = this;
             DontDestroyOnLoad(this);
@@ -54,7 +48,7 @@ namespace Amanotes.Core
             _allowInit = _allowInit || autoInit;
             StartCoroutine(InitRoutine());
         }
-
+        
         IEnumerator InitRoutine()
         {
             if (Config == null)
@@ -84,24 +78,29 @@ namespace Amanotes.Core
 
             // sort on priority
             Adapter.listAdapters.Sort((a1, a2) => a1.initOrder.CompareTo(a2.initOrder));
-            foreach (var adapter in Adapter.listAdapters)
+            foreach (AdapterContext adapter in Adapter.listAdapters)
             {
-                Log($"Initing {adapter.adapterId} --> initOrder: {adapter.initOrder}");
+                Log($"Initiating {adapter.adapterId} --> initOrder: {adapter.initOrder}");
                 adapter.Init();
+                RegisterUnityCallback(adapter);
+                
+                time = 0;
 
                 while (!adapter.IsReady)
                 {
                     time += Time.deltaTime;
                     yield return null;
                     if (time <= timeout) continue;
-                    LogWarningOnce($"{adapter.adapterId} init time out: {timeout}");
+                    LogWarning($"{adapter.adapterId} init time out: {timeout}");
+                    break;
                 }
 
-                Log($"Adapter {adapter.adapterId} inited!");
+                Log(string.Format("Adapter {0} {1}", adapter.adapterId, adapter.IsReady ? "inited!" : "is not ready!"));
             }
 
             // Init modules (Adapter managers)
             Analytics.Init();
+
             //Ads.Init();
 
             _status = Status.Ready;
@@ -110,11 +109,38 @@ namespace Amanotes.Core
             Debug.Log($"[AmaGDK] {READY}");
         }
 
-        private void Update()
+        void RegisterUnityCallback(AdapterContext adapter)
         {
-            if (!isReady) return;
-            _frameUpdate?.Invoke();
+            switch (adapter)
+            {
+                case IOnFrameUpdate a: {
+                    onFrameUpdate -= a.OnFrameUpdate;
+                    onFrameUpdate += a.OnFrameUpdate;
+                    break;
+                }
+
+                case IOnApplicationPause a: {
+                    onApplicationPause -= a.OnApplicationPause;
+                    onApplicationPause += a.OnApplicationPause;
+                    break;
+                }
+
+                case IOnApplicationFocus a:
+                {
+                    applicationFocus -= a.OnApplicationFocus;
+                    applicationFocus += a.OnApplicationFocus;
+                    break;
+                }
+                
+                case IOnApplicationQuit a:
+                {
+                    applicationQuit -= a.OnApplicationQuit;
+                    applicationQuit += a.OnApplicationQuit;
+                    break;  
+                }
+            }
         }
+        
     }
 
     public partial class AmaGDK // PUBLIC APIS
@@ -149,8 +175,6 @@ namespace Amanotes.Core
             _instance = sdk.AddComponent<AmaGDK>();
         }
 
-
-
         public static void SetOnReadyCallback(Action onReady)
         {
             if (onReady == null)
@@ -161,7 +185,6 @@ namespace Amanotes.Core
             _onReadyCallback -= onReady;
             _onReadyCallback += onReady;
         }
-
     }
 
     public partial class AmaGDK
@@ -175,4 +198,33 @@ namespace Amanotes.Core
             public const string REVENUECAT = "RevenueCat";
         }
     }
-}
+
+    public partial class AmaGDK
+    {
+        internal static event Action onFrameUpdate;
+        internal static event Action<bool> onApplicationPause;
+        internal static event Action<bool> applicationFocus;
+        internal static event Action applicationQuit;
+        
+        private void OnApplicationPause(bool pauseStatus)
+        {
+            onApplicationPause?.Invoke(pauseStatus);
+        }
+
+        private void OnApplicationFocus(bool hasFocus)
+        {
+            applicationFocus?.Invoke(hasFocus);
+        }
+        
+        private void Update()
+        {
+            if (!isReady) return;
+            onFrameUpdate?.Invoke();
+        }
+        
+        private void OnApplicationQuit()
+        {
+            applicationQuit?.Invoke();
+        }
+    }
+}

package/Runtime/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Runtime.CompilerServices;
-
 [assembly: InternalsVisibleTo("AmaGDK.Test")]
 
 #if UNITY_EDITOR

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.1.20",
+    "version": "0.2.1",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2020.3",

package/Runtime/AmaPassport/Plugins/Android/AdvertisingIdCallback.java

@@ -1,7 +0,0 @@
-
-package com.miniit.android;
-
-public interface AdvertisingIdCallback
-{
-    public void onResult(String adid);
-}

package/Runtime/AmaPassport/Plugins/Android/AdvertisingIdCallback.java.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: b20a41b7f3c814bbd905559d73f7d253
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: