com.amanotes.gdk 0.2.63 → 0.2.65-1

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [0.2.66 - 2024-06-13]
+- [Fix] Missing Google CMP in package release
+
+## [0.2.65 - 2024-06-13]
+- [Dev] Add GDKRoutine
+- [Dev] Add option to preload banners
+- [Fix] Handle GoogleCMP callback in main-thread
+- Also: Ensure Logging.LogError is thead-safe
+- [Fix] Manage banner status so not to request banner load multiple times
+- [Add] GDKUnityCallback with thread-safe
+- [Feature] Add fullads_impression & videoads_impression events for better fill rate tracking
+- [Klavar] Improve parameter validation
+
+## [0.2.64 - 2024-06-06]
+- [Dev] Log gdk_init
+- [Fix] map_user_id must contain FRB, AF, [GAID, IDFA]
+- [Dev] Check duplicated SKAdNetwork
+- [Dev] New editor attribute [HideInNormalInspector]
+- [Dev] Public ClearCacheData method
+- [Feature] Add adapter config validation
+- [Feature] Add DevMode for remote config fetching
+- [Fix] Create button did not create a new AmaGDKConfig asset in Resources
+- Also: Hide config details
+- [Feature] Support AF Purchase Connector and deeplinking
+
 ## [0.2.63 - 2024-06-01]
 - [Fix] Do not include default GDK config asset
 - [Fix] Support compare SemVer with an invalid value

package/Editor/AmaGDKEditor.cs

@@ -100,6 +100,11 @@ namespace Amanotes.Editor
                     if (AmaGUI.BigButton("CREATE", 40f, BLUE))
                     {
                         AssetDatabase.ImportPackage(Res.AMAGDK_CONFIG_PACKAGE, false);
+
+                        ScriptableObject config = CreateInstance("Amanotes.Core.AmaGDKConfigAsset");
+                        AssetDatabase.CreateAsset(config, "Assets/AmaGDK/Resources/AmaGDKConfig.asset");
+                        AssetDatabase.SaveAssets();
+                        TryLoadConfigAsset();
                         adapterScanned = false;
                     }
 
@@ -301,17 +306,16 @@ namespace Amanotes.Editor
 
             configSO = new SerializedObject(configAsset);
             configSO.Update();
-
             DrawProperty(configSO, "common");
+            EditorGUILayout.ObjectField("Config", configAsset, typeof(ScriptableObject), false);
             GUILayout.Space(8f);
             for (var i = 0; i < allAdapters.Count; i++)
             {
                 var item = allAdapters[i];
                 DrawAdapterDetail(item.id, item.adapter);
             }
-
             EditorGUILayout.Space();
-            AmaGUI.Foldout("Config", ref showConfigDetail, DrawGUI_ConfigDetail, DrawGUI_ConfigAsset);
+            
             AmaGUI.Foldout("Adapters", ref showAdapterInstaller, DrawGUI_AdapterList);
             AmaGUI.Foldout("Extras", ref showExtra, DrawGUI_ExtraList);
             Profiler.EndSample();
@@ -370,6 +374,11 @@ namespace Amanotes.Editor
                 configOpen.Add(adapterId, isOpen = false);
             }
             
+            var configStatus = adapter?.configStatus ?? Adapter2.ConfigStatus.Ok;
+            Texture2D icon =
+                configStatus == Adapter2.ConfigStatus.Invalid ? (Texture2D)EditorGUIUtility.IconContent("console.erroricon.sml").image :
+                configStatus == Adapter2.ConfigStatus.Warning ? (Texture2D)EditorGUIUtility.IconContent("console.warnicon.sml").image : null;
+            
             SDKStatus status = SDKStatus.Get(adapterId);
             bool changed = AmaGUI.Foldout(ObjectNames.NicifyVariableName(adapterId), ref isOpen, () =>
             {
@@ -392,10 +401,17 @@ namespace Amanotes.Editor
 
             }, () =>
             {
+                if (icon != null)
+                {
+                    Rect rect = GUILayoutUtility.GetRect(6f, 6f, 16f, 16f);
+                    rect.xMin -= 10f;
+                    rect.y += 1f;
+                    GUI.DrawTexture(rect, icon);
+                }
                 GUILayout.FlexibleSpace();
-
+                
                 bool installed = status.adapterInstalled;
-                bool adapterActive = installed && adapter.enabled;
+                bool adapterActive = installed && adapter != null && adapter.enabled;
 
                 if (!adapterActive)
                 {
@@ -407,7 +423,7 @@ namespace Amanotes.Editor
                     GUILayout.Label(label, GUILayout.Width(w));
                     GUI.color = c;
                 }
-
+                
                 AmaGUI.DrawVersionTag(status.sdkVersion, adapterActive);
 
                 if (installed)
@@ -421,7 +437,7 @@ namespace Amanotes.Editor
                     }
                 }
             });
-
+            
 
 
             if (changed) configOpen[adapterId] = isOpen;

package/Editor/HideInNormalInspectorDrawer.cs

@@ -0,0 +1,22 @@
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEditor;
+
+namespace Amanotes.Core.Editor
+{
+    [CustomPropertyDrawer(typeof(HideInNormalInspectorAttribute))]
+    public class HideInNormalInspectorDrawer : PropertyDrawer
+    {
+        public override VisualElement CreatePropertyGUI(SerializedProperty property)
+        {
+            var mode = ActiveEditorTracker.sharedTracker.inspectorMode;
+            return mode == InspectorMode.Normal ? new VisualElement() : base.CreatePropertyGUI(property);
+        }
+        
+        public override float GetPropertyHeight(SerializedProperty property, GUIContent label) {
+            return 0f;
+        }
+	
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) {}
+    }
+}

package/Editor/HideInNormalInspectorDrawer.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 66d88278f0e44820aebc1e5a5e94e15f
+timeCreated: 1717409948

package/Extra/GoogleCMP.unitypackage.meta

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

package/Packages/AppsFlyerAdapter.PurchaseConnector.unitypackage.meta

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

package/Runtime/AmaGDK.Adapters.cs

@@ -6,16 +6,27 @@ using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
 {
+    
+    
     public abstract partial class Adapter2
     {
+        internal protected enum ConfigStatus
+        {
+            Ok,
+            Invalid,
+            Warning
+        }
+        
         // internal use
-        [HideInInspector] [SerializeField] internal int initOrder;
-        [HideInInspector] [SerializeField] internal bool enabled = true;
+        [HideInNormalInspector] [SerializeField] internal int initOrder;
+        [HideInNormalInspector] [SerializeField] internal bool enabled = true;
         [NonSerialized] internal string adapterId;
         [NonSerialized] internal string adapterVersion;
         [NonSerialized] internal protected Status status = Status.None;
         
         protected abstract void Init(Action<bool> onComplete);
+        internal protected abstract string GetServiceKey();
+        internal protected abstract ConfigStatus configStatus { get; }
         
         public bool IsReady => status == Status.Ready;
         
@@ -55,7 +66,7 @@ namespace Amanotes.Core.Internal
             
             adapter.adapterId = id;
             adapter.adapterVersion = version;
-            GDKUtils.RegisterUnityCallbacks(adapter);
+            GDKUtils.AddUnityCallbacks(adapter);
             adapterMap.Add(id, adapter);
             return true;
         }

package/Runtime/AmaGDK.Ads.cs

@@ -275,7 +275,7 @@ namespace Amanotes.Core
                 
                 if (Config.ad.enableInterstitial) _adapter.interstitial.StartLoadAd();
                 if (Config.ad.enableRewarded) _adapter.rewardVideo.StartLoadAd();
-
+                if (Config.ad.preloadBanner) PreloadBanner();
                 if (_isBannerShowing)
                 {
                     _isBannerShowing = false;
@@ -323,6 +323,30 @@ namespace Amanotes.Core
 
             [NonSerialized] private static bool _isBannerShowing = false;
             
+            public static void PreloadBanner()
+            {
+                if (!_config.ad.enableBanner)
+                {
+                    LogWarning($"Banner not enabled! {_config.ad.enableBanner}");
+                    return;
+                }
+                
+                if (_adapter == null)
+                {
+                    LogWarning($"Adapter is null!");
+                    return;
+                }
+                
+                if (_isBannerShowing)
+                {
+                    LogWarning($"Banner is showing!");
+                    return;
+                }
+                
+                _adapter.ShowBanner();
+                _adapter.HideBanner();
+            }
+            
             public static void ShowBanner()
             {
                 if (!_config.ad.enableBanner)
@@ -426,6 +450,9 @@ namespace Amanotes.Core.Internal
         [Tooltip("Before showing an ad: set Time.timeScale to 0\nAfter the ad is closed: restore the previously saved Time.timeScale")]
         public bool autoTimeScale = true;
 
+        [Tooltip("Preload banner right when Ad module init (default = false)")]
+        public bool preloadBanner = false;
+
         [Header("EDITOR")]
         [Tooltip("Only applicable in Editor\n0 = 0% success\n1 = 100% success")]
         [Range(0f, 1f)] public float rewardAdShowSuccessRate = 1;
@@ -444,7 +471,7 @@ namespace Amanotes.Core.Internal
         // APIs
         internal protected abstract AdLogic interstitial { get; }
         internal protected abstract AdLogic rewardVideo { get; }
-
+        
         public abstract void ShowBanner();
         public abstract void HideBanner();
 

package/Runtime/AmaGDK.Analytics.cs

@@ -160,14 +160,6 @@ namespace Amanotes.Core
                 logEventHook = condition;
             }
 
-            public static void SetUserId(string userId)
-            {
-                foreach (AnalyticsAdapter s in listAdapters)
-                {
-                    s.SetUserId(userId);
-                }
-            }
-
             public static void SetUserProperty(string key, string value)
             {
                 foreach (AnalyticsAdapter s in listAdapters)
@@ -351,8 +343,7 @@ namespace Amanotes.Core
                 // All adapters should be ready now!
                 
                 // TODO: Refactor Resolve Early Calls
-                onFrameUpdate -= ProcessEventQueue;
-                onFrameUpdate += ProcessEventQueue;
+                GDKUtils.OnFrameUpdate(ProcessEventQueue);
             }
             
             internal static EventParams PrepareEvent(string eventName)
@@ -1104,11 +1095,11 @@ namespace Amanotes.Core.Internal
     {
         // [Header("-----     MODULE CONFIG      -----")]
         public bool showAnalyticsLog;
-        [HideInInspector] public bool normalizeEventName = true;
-        [HideInInspector] public bool checkMigrationIntegrity = true;
-        [HideInInspector] public bool migrateAccumulatedCount = true;
-        [HideInInspector] public bool enableEventStat;
-        [HideInInspector] public List<string> immediatelyLoggedEvents = new List<string>(){"ad_impression", "ad_impression_ama"};
+        [HideInNormalInspector] public bool normalizeEventName = true;
+        [HideInNormalInspector] public bool checkMigrationIntegrity = true;
+        [HideInNormalInspector] public bool migrateAccumulatedCount = true;
+        [HideInNormalInspector] public bool enableEventStat;
+        [HideInNormalInspector] public List<string> immediatelyLoggedEvents = new List<string>(){"ad_impression", "ad_impression_ama"};
         public AnalyticQualityConfig quality;
     }
     
@@ -1134,8 +1125,8 @@ namespace Amanotes.Core.Internal
     
     public abstract class AnalyticsAdapter : Adapter2
     {
-        [HideInInspector] public List<string> NeverSend = new List<string>();
-        [HideInInspector] public List<string> AlwaysSend = new List<string>();
+        [HideInNormalInspector] public List<string> NeverSend = new List<string>();
+        [HideInNormalInspector] public List<string> AlwaysSend = new List<string>();
         protected abstract bool SendEventByDefault { get; }
         
         public bool IsForbidden(string eventName)
@@ -1147,10 +1138,8 @@ namespace Amanotes.Core.Internal
         
         public abstract void LogEvent(string eventNameToSend, Dictionary<string, object> parameters);
 
-        public abstract void SetUserId(string userId);
+        // public abstract void SetUserId(string userId);
 
         public abstract void SetUserProperty(string key, string value);
-
-        public abstract void GetAppInstanceID(Action<string> appId);
     }
 }

package/Runtime/AmaGDK.Mono.cs

@@ -0,0 +1,111 @@
+using Amanotes.Core.Internal;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+using UnityEngine;
+
+namespace Amanotes.Core
+{
+    public partial class AmaGDK
+    {
+        internal static int mainThreadId = -1;
+        internal static readonly GDKUnityCallback unityCallbacks = new GDKUnityCallback();
+        
+        internal static float realtimeSinceStartup;
+        internal static float time;
+        
+        private void Update()
+        {
+            if (!isReady) return;
+            
+            time = Time.time;
+            realtimeSinceStartup = Time.realtimeSinceStartup;
+
+            var cb = unityCallbacks;
+            cb.Invoke(ref cb.OnFrameUpdate);
+            cb.Invoke(ref cb.DoOnceNextFrame);
+        }
+        
+        private void OnApplicationPause(bool pauseStatus)
+        {
+            var cb = unityCallbacks;
+            cb.Invoke(ref cb.OnApplicationPause, pauseStatus);
+        }
+        
+        private void OnApplicationFocus(bool hasFocus)
+        {
+            var cb = unityCallbacks;
+            cb.Invoke(ref cb.OnApplicationFocus, hasFocus);
+        }
+        
+        private void OnApplicationQuit()
+        {
+            var cb = unityCallbacks;
+            cb.Invoke(ref cb.OnApplicationQuit);
+        }
+    }
+}
+
+namespace Amanotes.Core.Internal
+{
+    
+    
+    public static partial class GDKUtils
+    {
+        public static bool isOnMainThread => Thread.CurrentThread.ManagedThreadId == AmaGDK.mainThreadId;
+        public static void DoOnMainThread(Action action)
+        {
+            if (isOnMainThread)
+            {
+                SafeInvoke(action);
+                return;
+            }
+
+            DoOnceNextFrame(action);
+        }
+        
+        public static void OnFrameUpdate(Action action)
+        {
+            var cb = AmaGDK.unityCallbacks;
+            cb.AddCallback(ref cb.OnFrameUpdate, action);
+        }
+        
+        public static void DoOnceNextFrame(Action action)
+        {
+            var cb = AmaGDK.unityCallbacks;
+            cb.AddCallback(ref cb.DoOnceNextFrame, action);
+        }
+        
+        public static void DelayCall(float seconds, Action action)
+        {
+            DoOnMainThread(() => AmaGDK._instance.StartCoroutine(DelayCallRoutine(seconds, action)));
+        }
+        
+        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;
+            }
+        }
+        
+        private static IEnumerator DelayCallRoutine(float seconds, Action callback)
+        {
+            yield return new WaitForSecondsRealtime(seconds);
+            callback();
+        }
+        
+        public static void AddUnityCallbacks<T>(T observer)
+        {
+            AmaGDK.unityCallbacks.AddObserver(observer);
+        }
+        
+        public static void RemoveUnityCallbacks<T>(T observer)
+        {
+            AmaGDK.unityCallbacks.RemoveObserver(observer);
+        }
+    }
+}

package/Runtime/AmaGDK.Mono.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 66a09cd9d2b8423e885352a8441c6468
+timeCreated: 1718074317

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -5,6 +5,7 @@ using System.Text;
 using UnityEngine;
 using Amanotes.Core.Internal;
 using UnityEngine.Profiling;
+using UnityEngine.Serialization;
 using static Amanotes.Core.Internal.Logging;
 
 #if UNITY_EDITOR
@@ -369,9 +370,11 @@ namespace Amanotes.Core.Internal
     [Serializable]
     public class RemoteConfigConfig
     {
+        [FormerlySerializedAs("firstFetchTimeOutInSeconds")]
         [Tooltip("Fetch timeout for first session (in secs)")]
         public float firstFetchTimeOutInSeconds = 10;
         
+        [FormerlySerializedAs("defaultTimeOutInSeconds")]
         [Tooltip("Fetch timeout for 2nd+ session (in secs)")]
         public float defaultTimeOutInSeconds = 3;
         

package/Runtime/AmaGDK.Singleton.cs

@@ -0,0 +1,27 @@
+
+using System.Threading;
+using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.Internal.Messsage;
+
+namespace Amanotes.Core
+{
+    public partial class AmaGDK
+    {
+        internal static AmaGDK _instance;
+        
+        private void Awake()
+        {
+            if (_instance != null)
+            {
+                LogWarning(MULTIPLE_INSTANCE);
+                Destroy(this);
+                return;
+            }
+            
+            _instance = this;
+            mainThreadId = Thread.CurrentThread.ManagedThreadId;
+            DontDestroyOnLoad(this);
+            StartCoroutine(InitRoutine());
+        }
+    }
+}

package/Runtime/AmaGDK.Singleton.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 059e9f9cfffd44639fc660df9537fa37
+timeCreated: 1718081104