com.amanotes.gdk 0.2.81-alpha.11 → 0.2.81-alpha.13

package/Runtime/Ad/AdLogic.cs

@@ -8,7 +8,6 @@ namespace Amanotes.Core.Internal
 {
     public abstract class AdLogic
     {
-        private const int MAX_FRAMES_WAIT_FOR_CALLBACK = 60; 
         protected AdModuleConfig adConfig => Config.ad;
         protected AdShowContext context => Ads.context;
         
@@ -256,20 +255,18 @@ namespace Amanotes.Core.Internal
                 }
             };
             unityCallbacks.OnApplicationFocus += onApplicationFocusCallback;
-            int counter = 0;
             while (context != null && !context.potentiallyCompleted)
             {
                 if (hasFocusAgain && hasOutOfFocus)
                 {
-                    // Start counting frames only after closed the ad
-                    counter++;
-                }
-                if (counter > MAX_FRAMES_WAIT_FOR_CALLBACK)
-                {
-                    // Timeout reached, force close the ad
-                    LogError("Force close the ad");
-                    StopShowAd();
-                    break;
+                    // Start counting only after closed the ad
+                    yield return GDKUtils.WaitForSecondsRealtime(Config.ad.adCallBackTimeOut);
+                    if (context != null && !context.potentiallyCompleted)
+                    {
+                        LogError("Force close the ad");
+                        StopShowAd();
+                        break;   
+                    }
                 }
                 yield return null;
             }
@@ -351,24 +348,27 @@ namespace Amanotes.Core.Internal
 
         private void TriggerBeforeAdShow()
         {
-            bool willSaveVolume = Config.ad.autoMute
-                && AudioListener.volume > 0
-                && Ads._savedVolume < 0;
+            if (Application.platform == RuntimePlatform.IPhonePlayer)
+            {
+                bool willSaveVolume = Config.ad.autoMute
+                    && AudioListener.volume > 0
+                    && Ads._savedVolume < 0;
 
-            bool willSaveTimeScale = Config.ad.autoTimeScale
-                && Time.timeScale > 0
-                && Ads._savedTimeScale < 0;
+                bool willSaveTimeScale = Config.ad.autoTimeScale
+                    && Time.timeScale > 0
+                    && Ads._savedTimeScale < 0;
 
-            if (willSaveVolume)
-            {
-                Ads._savedVolume = AudioListener.volume;
-                AudioListener.volume = 0;
-            }
+                if (willSaveVolume)
+                {
+                    Ads._savedVolume = AudioListener.volume;
+                    AudioListener.volume = 0;
+                }
 
-            if (willSaveTimeScale)
-            {
-                Ads._savedTimeScale = Time.timeScale;
-                Time.timeScale = 0;
+                if (willSaveTimeScale)
+                {
+                    Ads._savedTimeScale = Time.timeScale;
+                    Time.timeScale = 0;
+                }
             }
 
             dispatcher.Dispatch(_isInterstitial ? AmaGDK.Event.INTER_SHOW_BEGIN : AmaGDK.Event.REWARD_VIDEO_SHOW_BEGIN);
@@ -377,24 +377,27 @@ namespace Amanotes.Core.Internal
 
         private void TriggerOnAfterAdShow()
         {
-            bool willRestoreVolume = Config.ad.autoMute
-                && AudioListener.volume == 0
-                && Ads._savedVolume > 0;
+            if (Application.platform == RuntimePlatform.IPhonePlayer)
+            {
+                bool willRestoreVolume = Config.ad.autoMute
+                    && Mathf.Approximately(AudioListener.volume, 0)
+                    && Ads._savedVolume > 0;
 
-            bool willRestoreTimeScale = Config.ad.autoTimeScale
-                && Time.timeScale == 0
-                && Ads._savedTimeScale > 0;
+                bool willRestoreTimeScale = Config.ad.autoTimeScale
+                    && Mathf.Approximately(Time.timeScale, 0)
+                    && Ads._savedTimeScale > 0;
 
-            if (willRestoreVolume)
-            {
-                AudioListener.volume = Ads._savedVolume;
-                Ads._savedVolume = -1;
-            }
+                if (willRestoreVolume)
+                {
+                    AudioListener.volume = Ads._savedVolume;
+                    Ads._savedVolume = -1;
+                }
 
-            if (willRestoreTimeScale)
-            {
-                Time.timeScale = Ads._savedTimeScale;
-                Ads._savedTimeScale = -1;
+                if (willRestoreTimeScale)
+                {
+                    Time.timeScale = Ads._savedTimeScale;
+                    Ads._savedTimeScale = -1;
+                }   
             }
             
             bool isSuccess = _showState == ShowAdsState.ShowSuccess;

package/Runtime/Ad/AdModuleConfig.cs

@@ -45,6 +45,9 @@ namespace Amanotes.Core.Internal
         [Header("EDITOR")]
         [Tooltip("Only applicable in Editor\n0 = 0% success\n1 = 100% success")]
         [Range(0f, 1f)] public float rewardAdShowSuccessRate = 1;
+
+        [Tooltip(("The maximum time (in seconds) to wait for the callback response after the ad activity has finished and the app returns to the Unity activity (default = 5s)"))]
+        public float adCallBackTimeOut = 5f;
     }
 
     public partial class ConfigAsset

package/Runtime/AmaGDK.IAP.cs

@@ -21,7 +21,10 @@ namespace Amanotes.Core
             public static DateTime? SubscriptionExpiredDate => localData.SubscriptionExpiredDate;
             public static DateTime? UnsubscribedDate => localData.UnsubscribedDate;
             public static readonly Dictionary<string, ProductInfo> AllProducts = new Dictionary<string, ProductInfo>();
+            
             private const string DATE_FORMAT = "yyyy/MM/yy HH:mm:ss";
+            private static readonly GDKTaskTracker<bool> _syncTaskTracker = new GDKTaskTracker<bool>();
+            private static readonly GDKTaskTracker _getProductsTaskTracker = new GDKTaskTracker();
             
             public static void SetCallback_OnModuleReady(Action onReady)
             {
@@ -37,42 +40,32 @@ namespace Amanotes.Core
                 _onModuleReady += onReady;
             }
             
-            public static void SetCallback_OnGetProductsComplete(Action onComplete)
-            {
-                if (onComplete == null) return;
-            
-                if (isGetProductComplete)
-                {
-                    onComplete();
-                    return;
-                }
-            
-                _onGetProductsComplete -= onComplete;
-                _onGetProductsComplete += onComplete;
-            }
-            
-            public static void SetCallback_OnGetCustomerInfoComplete(Action onComplete)
-            {
-                if (onComplete == null) return;
-            
-                if (isGetCustomerInfoComplete)
-                {
-                    onComplete();
-                    return;
-                }
-            
-                _onGetCustomerInfoComplete -= onComplete;
-                _onGetCustomerInfoComplete += onComplete;
-            }
-
             public static void SyncCustomerInfo(Action<bool> onComplete = null)
             {
-                if (_adapter == null)
+                if (Adapter == null)
                 {
                     onComplete?.Invoke(false);
                     return;
                 }
-                _adapter.SyncCustomerInfo(onComplete);
+
+                _syncTaskTracker.RegisterOnCompleteCallback(onComplete);
+                if (_syncTaskTracker.HasStarted) return;
+
+                _syncTaskTracker.MarkStarted();
+                Adapter.SyncCustomerInfo(getSuccess =>
+                {
+                    if (getSuccess)
+                    {
+                        localData.Sync();
+                        _syncTaskTracker.MarkCompleted(true);
+                    }
+                    else
+                    {
+                        _syncTaskTracker.MarkCompleted(false);
+                        _syncTaskTracker.Reset();
+                        LogWarning("[IAP] Fail to sync customer info. Please try again later.");
+                    }
+                });
             }
             
             public static ISetupBuilder GetProducts(bool appendExistingList = false)
@@ -181,13 +174,8 @@ namespace Amanotes.Core
                 }
             }
 
-            private static bool isGetProductComplete;
-            private static bool isGetCustomerInfoComplete;
-            private static bool IsModuleReady => isGetProductComplete && isGetCustomerInfoComplete;
-            private static Action _onGetProductsComplete;
-            private static Action _onGetCustomerInfoComplete;
+            private static bool IsModuleReady => _syncTaskTracker.HasCompleted && _getProductsTaskTracker.HasCompleted;
             private static Action _onModuleReady;
-
             internal static bool InitModule()
             {
                 _adapter = Adapter2.GetAdapter<IAPAdapter>();
@@ -199,14 +187,8 @@ namespace Amanotes.Core
             internal static void StartModule()
             {
                 if (_adapter == null) return;
-                _adapter.SyncCustomerInfo(
-                    success =>
-                    {
-                        isGetCustomerInfoComplete = true;
-                        GDKUtils.SafeInvokeAndClear(ref _onGetCustomerInfoComplete);
-                        if (IsModuleReady) GDKUtils.SafeInvokeAndClear(ref _onModuleReady);
-                    });
-                localData.Sync();
+                SyncCustomerInfo(_ => CheckModuleReady());
+                _getProductsTaskTracker.MarkStarted();
                 if (Config.iap.autoGetProducts)
                 {
                     GetProducts()
@@ -218,11 +200,15 @@ namespace Amanotes.Core
                     OnGetProductsComplete();
                 }
             }
-
+            
             private static void OnGetProductsComplete()
             {
-                isGetProductComplete = true;
-                GDKUtils.SafeInvokeAndClear(ref _onGetProductsComplete);
+                _getProductsTaskTracker.MarkCompleted();
+                CheckModuleReady();
+            }
+
+            private static void CheckModuleReady()
+            {
                 if (IsModuleReady) GDKUtils.SafeInvokeAndClear(ref _onModuleReady);
             }
         }
@@ -284,19 +270,8 @@ namespace Amanotes.Core
                     }
                 }
 
-                public void Sync()
+                internal void Sync()
                 {
-                    GDKUtils.StartCoroutine(SyncRoutine());
-                }
-
-                IEnumerator SyncRoutine()
-                {
-                    if (Adapter == null)
-                    {
-                        LogWarning("[IAP] Adapter is not available");
-                        yield break;
-                    }
-                    yield return new WaitUntil(() => Adapter.IsReady);
                     activeSubscriptionId = Adapter.GetActiveSubscriptionId();
                     subscriptionPeriodType = Adapter.GetSubscriptionPeriodType();
                     purchasedProducts = Adapter.GetPurchasedProducts();

package/Runtime/AmaGDK.cs

@@ -27,7 +27,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "v0.2.81-alpha.11";
+        public const string VERSION = "v0.2.81-alpha.13";
         
         internal static Status _status = Status.None;
         internal static ConfigAsset _config = null;

package/Runtime/Core/GDKDebug.cs

@@ -100,7 +100,7 @@ namespace Amanotes.Core
         public static void Log(string message)
         {
             if (AmaGDK.logLevel < LogLevel.Verbose) return;
-            using (NoStackTrace.Log)
+            using (GDKUtils.isOnMainThread ? NoStackTrace.Log: NoStackTraceNull)
             {
                 Debug.Log($"AmaGDK {message}");   
             }
@@ -108,7 +108,7 @@ namespace Amanotes.Core
         
         public static void ForceLog(string message)
         {
-            using (NoStackTrace.Log)
+            using (GDKUtils.isOnMainThread ? NoStackTrace.Log: NoStackTraceNull)
             {
                 Debug.Log($"AmaGDK {message}");
             }

package/Runtime/Utils/GDKUtils.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using UnityEngine;
 using static Amanotes.Core.GDKDebug;
 
@@ -96,5 +97,37 @@ namespace Amanotes.Core.Internal
             
             LogWarning(message);
         }
+        
+        public static IEnumerator WaitForSecondsRealtime(float duration, bool focusOnly = true)
+        {
+            if (!focusOnly)
+            {
+                yield return new WaitForSecondsRealtime(duration);
+                yield break;
+            }
+            float elapsedTime = 0f;
+            float lastTimeStamp = Time.realtimeSinceStartup;
+            bool focusChangedSinceLastFrame = false;
+            Action<bool> onApplicationFocusCallback = _ => focusChangedSinceLastFrame = true;
+            Application.focusChanged += onApplicationFocusCallback;
+            
+            while (elapsedTime < duration)
+            {
+                if (Application.isFocused)
+                {
+                    if (focusChangedSinceLastFrame)
+                    {
+                        lastTimeStamp = Time.realtimeSinceStartup;
+                        focusChangedSinceLastFrame = false;
+                    }
+                    
+                    elapsedTime += Time.realtimeSinceStartup - lastTimeStamp;
+                    lastTimeStamp = Time.realtimeSinceStartup;
+                }
+                
+                yield return null;
+            }
+            Application.focusChanged -= onApplicationFocusCallback;
+        }
     }
 }

package/package.json

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