com.amanotes.gdk 0.2.68 → 0.2.69

package/Editor/Utils/AmaGDKEditor.ExtractVersion.cs

@@ -5,11 +5,14 @@ using System.Linq;
 using System.Reflection;
 using System.Xml;
 using Amanotes.Core.Internal;
+using System.Text.RegularExpressions;
+
 #if !UNITY_2021_1_OR_NEWER
-using UnityEditor;
 using UnityEditor.PackageManager;
 using UnityEditor.PackageManager.Requests;
 #endif
+
+using UnityEditor;
 using UnityEngine;
 using static Amanotes.Core.AmaGDK.AdapterID;
 
@@ -179,7 +182,8 @@ namespace Amanotes.Editor
                 case FIREBASE_ANALYTICS: return FirebaseAnalytics();
                 case FIREBASE_REMOTE_CONFIG: return FirebaseRemoteConfig();
                 case APPSFLYER: return AppsFlyer();
-                case IRONSOURCE: return Ironsource();
+                case IRONSOURCE: return IronSource();
+                case MAX: return Max();
                 case REVENUECAT: return RevenueCat();
                 default:
                     Debug.LogWarning($"Unsupported sdkID <{sdkId}>");
@@ -261,7 +265,35 @@ namespace Amanotes.Editor
             return version.Trim();
         }
 
-        internal static string Ironsource()
+        internal static string Max()
+        {
+            string[] guids = AssetDatabase.FindAssets("t:monoscript MaxSdk");
+            if (guids.Length == 0) return string.Empty;
+
+            foreach (string guid in guids)
+            {
+                string path = AssetDatabase.GUIDToAssetPath(guid);
+                if (!path.EndsWith("MaxSdk.cs")) continue;
+                
+                try
+                {
+                    string fileContent = File.ReadAllText(path);
+                    const string pattern = @"private const string _version = ""(?<version>[\d\.]+)"";";
+                    var regex = new Regex(pattern);
+                    Match match = regex.Match(fileContent);
+                    return match.Success ? match.Groups["version"].Value : string.Empty;
+                }
+                catch (IOException ex)
+                {
+                    Debug.LogWarning($"Can not get Max Version : {ex}");
+                    return string.Empty;
+                }
+            }
+            
+            return string.Empty;
+        }
+
+        internal static string IronSource()
         {
             var version = "";
             string[] issdk = Directory.GetFiles("Assets", "IronSourceSDKDependencies.xml", SearchOption.AllDirectories);

package/Extra/{GoogleCMP.unitypackage.meta → Consent.unitypackage.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4e220bd58ce0646bcbbb209dc8451d25
+guid: c76a726b63046449ab0d11191aa3980b
 DefaultImporter:
   externalObjects: {}
   userData: 

package/{Editor/Resources.meta → Packages/MaxAdNetworkAdapter.unitypackage.meta}

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: aa56aa5c6656f415ebac7089cf7cf7dc
-folderAsset: yes
+guid: 4d9f3e2a9be574df390eff5ef9f11fa9
 DefaultImporter:
   externalObjects: {}
   userData: 

package/Runtime/Ad/AdExtension.cs

@@ -76,10 +76,12 @@ namespace Amanotes.Core
             AmaGDK.Ads.context.onAdShowReadyStatus += callback;
             return ad;
         }
+        
         /// <summary>
         /// The finalize callback that will always trigger to mark an end for the AdShowRoutine
         /// 
         /// </summary>
+        [Obsolete("OnAdResult is obsolete. Please use the onAdResult callback in AmaGDK.Ads.ShowInterstitial(Action<bool> onAdResult) or AmaGDK.Ads.ShowRewardedVideo(Action<bool> onAdResult) instead.")]
         public static IAdCallback OnAdResult(this IAdCallback ad, Action<bool> callback)
         {
             if (!MakeSureAdNotNull(ad)) return null;

package/Runtime/Ad/AdLogic.cs

@@ -7,6 +7,7 @@ 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;
         
@@ -130,9 +131,11 @@ namespace Amanotes.Core.Internal
         private Coroutine _showAdRoutine;
         protected bool _isRequesting;
         protected bool _isInterstitial => adType == AdType.Interstitial;
+        private bool isFocus;
         
         public void StartShowAd()
         {
+            isFocus = false;
             unityCallbacks.OnApplicationFocus -= OnApplicationFocus;
             unityCallbacks.OnApplicationFocus += OnApplicationFocus;
             
@@ -157,16 +160,12 @@ namespace Amanotes.Core.Internal
             _showAdRoutine = _instance.StartCoroutine(ShowAdRoutine());
         }
 
-        void OnApplicationFocus(bool isFocus)
+        private void OnApplicationFocus(bool focus)
         {
-            if (!isFocus) return;
+            if (!focus) return;
             
             unityCallbacks.OnApplicationFocus -= OnApplicationFocus;
-            if (context == null) return;
-            
-            Log($"OnApplicationFocus Before: {context.hasClosed}");
-            context.adCallback |= AdCallback.Close;
-            Log($"OnApplicationFocus After: {context.hasClosed}");
+            isFocus = true;
         }
 
         public void StopShowAd()
@@ -209,55 +208,26 @@ namespace Amanotes.Core.Internal
 
                 if (!HasLocalNetworkConnection)
                 {
-                    _showState = ShowAdsState.ShowFail;
-                    OnAdShowReadyStatus(false, AdShowReadyStatus.Wifi3GDisabled);
-                    ShowAdRoutineCompleted(false);
+                    EndShowAdRoutineWithFailure(AdShowReadyStatus.Wifi3GDisabled);
                     yield break;
                 }
 
                 int timeout = Config.ad.adShowTimeoutInSecs;
                 if (timeout == 0) // do not wait for Ad
                 {
-                    _showState = ShowAdsState.ShowFail;
-                    OnAdShowReadyStatus(false, AdShowReadyStatus.TimeOut);
-                    ShowAdRoutineCompleted(false);
+                    EndShowAdRoutineWithFailure(AdShowReadyStatus.TimeOut);
                     yield break;
                 }
 
                 _showState = ShowAdsState.WaitForAd;
                 OnAdShowReadyStatus(false, AdShowReadyStatus.WaitForAd);
 
-                if (_loadState != LoadAdsState.Requesting) StartLoadAd();
-                var counter = 0;
-                bool? hasInternet = null;
-                if (adConfig.checkInternet) _instance.StartCoroutine(WebUtils.CheckInternet(result => hasInternet = result));
-
-                var wait1Sec = new WaitForSecondsRealtime(1f);
-                while (counter < timeout || timeout == -1)
-                {
-                    yield return wait1Sec;
-                    counter++;
-
-                    // finish checking internet & result is false
-                    if (adConfig.checkInternet && hasInternet == false)
-                    {
-                        Log("[Ad] Stop WaitForAd : No internet!");
-                        _showState = ShowAdsState.ShowFail;
-                        OnAdShowReadyStatus(false, AdShowReadyStatus.NoInternet);
-                        ShowAdRoutineCompleted(false);
-                        yield break;
-                    }
-
-                    if (_loadState != LoadAdsState.Ready) continue;
-                    Log("[Ad] WaitForAd success after " + counter + " | timeout = " + timeout + " secs");
-                    break;
-                }
-
+                yield return WaitForAdReadyWithTimeout(timeout);
+                
                 if (!isAdReady)
                 {
-                    Log("[Ad] WaitForAd failed (timeout) " + counter + " | timeout = " + timeout + " secs");
-                    OnAdShowReadyStatus(false, AdShowReadyStatus.TimeOut);
-                    ShowAdRoutineCompleted(false);
+                    Log("[Ad] WaitForAd failed (timeout) " + " | timeout = " + timeout + " secs");
+                    EndShowAdRoutineWithFailure(AdShowReadyStatus.TimeOut);
                     yield break;
                 }
             }
@@ -266,43 +236,78 @@ namespace Amanotes.Core.Internal
             OnAdShowReadyStatus(true, AdShowReadyStatus.Ready);
             TriggerBeforeAdShow();
             ShowAd();
+
+            yield return WaitForMediationCallback();
             
-            while (!context.potentiallyCompleted)
-            {
-                yield return null; // callback as quickly as possible
-            }
+            // wait 1 frame in case hasReward callback after onClose
+            if (!context.hasReward && adType == AdType.VideoReward && !context.hasFailedOrCancelled) yield return null;
+            ShowAdRoutineCompleted(context.isSuccess);
+        }
 
-            if (adType == AdType.Interstitial)
-            {
-                ShowAdRoutineCompleted(!context.hasFailedOrCancelled);
-                yield break;
-            }
+        private void EndShowAdRoutineWithFailure(AdShowReadyStatus status)
+        {
+            _showState = ShowAdsState.ShowFail;
+            OnAdShowReadyStatus(false, status);
+            ShowAdRoutineCompleted(false);
+        }
+
+        private IEnumerator WaitForAdReadyWithTimeout(int timeout)
+        {
+            if (_loadState != LoadAdsState.Requesting) StartLoadAd();
+            var counter = 0;
+            bool? hasInternet = null;
+            if (adConfig.checkInternet) _instance.StartCoroutine(WebUtils.CheckInternet(result => hasInternet = result));
 
-            if (context.hasFailedOrCancelled)
+            var wait1Sec = new WaitForSecondsRealtime(1f);
+            while (counter < timeout || timeout == -1)
             {
-                Log($"[Ad] {adType} Waiting for [close]");
-                yield return null;
-                ShowAdRoutineCompleted(false);
-                yield break;
+                yield return wait1Sec;
+                counter++;
+                Log($"[Ad] Waiting for ad {counter} secs");
+
+                // finish checking internet & result is false
+                if (adConfig.checkInternet && hasInternet == false)
+                {
+                    Log("[Ad] Stop WaitForAd : No internet!");
+                    EndShowAdRoutineWithFailure(AdShowReadyStatus.NoInternet);
+                    yield break;
+                }
+
+                if (_loadState != LoadAdsState.Ready) continue;
+                Log("[Ad] WaitForAd success after " + counter + " | timeout = " + timeout + " secs");
+                break;
             }
+        }
 
-            if (context.hasClosed)
+        private IEnumerator WaitForMediationCallback()
+        {
+            #if !UNITY_EDITOR
+            while (!isFocus) yield return null; 
+            #endif
+            
+            int wait4CallbackCounter = 0;
+            while (!context.potentiallyCompleted && wait4CallbackCounter <= MAX_FRAMES_WAIT_FOR_CALLBACK)
             {
-                // wait 1 frame in case hasReward callback after onClose
-                if (!context.hasReward) yield return null;
-                ShowAdRoutineCompleted(context.hasReward);
-                yield break;
+                wait4CallbackCounter++;
+                yield return null;
             }
+            Log($"[Ad] Waiting for potentially completed callback: {wait4CallbackCounter} frames");
+            
+            if (!context.hasClosed) yield return WaitForAdClosedCallback();
+        }
 
-            var wait4CloseCounter = 0;
-            while (!context.hasClosed)
+        private IEnumerator WaitForAdClosedCallback()
+        {
+            int counter = 0;
+            while (!context.hasClosed && counter <= MAX_FRAMES_WAIT_FOR_CALLBACK)
             {
-                wait4CloseCounter++;
-                Log($"[Ad] {adType} Waiting for [close]:  {wait4CloseCounter}");
+                counter++;
                 yield return null;
             }
-            
-            ShowAdRoutineCompleted(true);
+            Log($"[Ad] Waiting for ad closed callback: {counter} frames");
+            if (context.hasClosed) yield break;
+            LogWarning("[Ad] Force close ad (mediation missing OnAdClose callback)");
+            OnAdClosed();
         }
 
         private void ShowAdRoutineCompleted(bool isSuccess)
@@ -316,8 +321,8 @@ namespace Amanotes.Core.Internal
             _showState = isSuccess ? ShowAdsState.ShowSuccess : ShowAdsState.ShowFail;
 
             // Extra callback
-            Ads.context.showFinishAt = Time.realtimeSinceStartup;
-            Ads.context.onAdResult?.Invoke(isSuccess);
+            context.showFinishAt = Time.realtimeSinceStartup;
+            context.onAdResult?.Invoke(isSuccess);
 
             var localData = Ads.localData;
             var stat = _isInterstitial ? localData.interstitial : localData.reward;
@@ -399,6 +404,11 @@ namespace Amanotes.Core.Internal
 
             if (Ads.context != null)
             {
+                if ((Ads.context.adCallback & AdCallback.Close) != 0)
+                {
+                    LogWarning("[Ad] OnAdClosed() has been called multiple times for the same ad.");
+                    return;
+                }
                 Ads.context.adCallback |= AdCallback.Close;
                 Ads.context.onClosed?.Invoke();
             } else

package/Runtime/Ad/AdShowContext.cs

@@ -39,5 +39,6 @@ namespace Amanotes.Core.Internal
         public bool hasReward => (adCallback & AdCallback.Reward) != 0;
         public bool hasClosed => (adCallback & AdCallback.Close) != 0;
         public bool hasClicked => (adCallback & AdCallback.Click) != 0;
+        public bool isSuccess => (hasReward || adType == AdType.Interstitial) && !hasFailedOrCancelled;
     }
 }

package/Runtime/Ad/AmaGDK.Ads.cs

@@ -150,8 +150,12 @@ namespace Amanotes.Core
         {
             internal static bool InitModule()
             {
+                if (Adapter2.GetAllAdapter<AdAdapter>().Count > 1)
+                {
+                    Utils.ThrowExceptionIfEditor("Multiple AdAdapters is not supported!");                    
+                }
                 _adapter = Adapter2.GetAdapter<AdAdapter>();
-                return _adapter == null;
+                return _adapter != null;
             }
             
             internal static void StartModule()
@@ -181,24 +185,34 @@ namespace Amanotes.Core
                 return false;
             }
 
-            public static IAdCallback ShowInterstitial(string placementName = null, Dictionary<string, object> userData = null)
+            public static IAdCallback ShowInterstitial(Action<bool> onAdResult = null, string placementName = null, Dictionary<string, object> userData = null)
             {
                 if (_adapter == null) return null;
                 if (!ClearPrevContext()) return null;
 
                 context = new AdShowContext(AdType.Interstitial, placementName, userData);
+                if (onAdResult != null)
+                {   
+                    context.onAdResult += onAdResult;
+                }
+                
                 _adapter.interstitial.StartShowAd();
                 return context;
             }
 
             public static bool IsInterstitialShowing => (context != null) && (context.adType == AdType.Interstitial);
 
-            public static IAdCallback ShowRewardedVideo(string placementName = null, Dictionary<string, object> userData = null)
+            public static IAdCallback ShowRewardedVideo(Action<bool> onAdResult = null, string placementName = null, Dictionary<string, object> userData = null)
             {
                 if (_adapter == null) return null;
                 if (!ClearPrevContext()) return null;
 
                 context = new AdShowContext(AdType.VideoReward, placementName, userData);
+                if (onAdResult != null)
+                {   
+                    context.onAdResult += onAdResult;
+                }
+                
                 _adapter.rewardVideo.StartShowAd();
                 return context;
             }

package/Runtime/AmaGDK.Adapters.cs

@@ -10,7 +10,7 @@ namespace Amanotes.Core.Internal
     
     public abstract partial class Adapter2
     {
-        internal protected enum ConfigStatus
+        protected internal enum ConfigStatus
         {
             Ok,
             Invalid,
@@ -22,12 +22,15 @@ namespace Amanotes.Core.Internal
         [HideInNormalInspector] [SerializeField] internal bool enabled = true;
         [NonSerialized] internal string adapterId;
         [NonSerialized] internal string adapterVersion;
-        [NonSerialized] internal protected Status status = Status.None;
+        [NonSerialized] protected internal Status status = Status.None;
         
         protected abstract void Init(Action<bool> onComplete);
-        internal protected abstract string GetServiceKey();
-        internal protected abstract ConfigStatus configStatus { get; }
-        
+        protected internal abstract string GetServiceKey();
+        protected virtual float GetTimeoutInEditor() => 0.1f;
+        protected virtual float GetTimeoutInRuntime() => 0.1f;
+        protected internal abstract ConfigStatus configStatus { get; }
+        protected internal float Timeout => Application.isEditor ? GetTimeoutInEditor() : GetTimeoutInRuntime();
+
         public bool IsReady => status == Status.Ready;
         
         internal void InitSDK() // call by AmaGDK
@@ -63,6 +66,10 @@ namespace Amanotes.Core.Internal
                 LogWarning($"Adapter <{id}> == null in ConfigAsset? (non-serialized?)");
                 return false;
             }
+            if (!adapter.enabled)
+            {
+                return false;
+            }
             
             adapter.adapterId = id;
             adapter.adapterVersion = version;