com.amanotes.gdk 0.2.45 → 0.2.47

package/Runtime/AmaGDK.Ads.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using Amanotes.Core.Internal;
+
 using static Amanotes.Core.Internal.Logging;
 using static Amanotes.Core.AmaGDK;
 
@@ -96,7 +97,6 @@ namespace Amanotes.Core
             return isValid;
         }
     }
-
     public partial class AmaGDK // Ads module
     {
         [Serializable]
@@ -168,27 +168,30 @@ namespace Amanotes.Core
 
         public partial class Ads
         {
-            public static ShowAdContext context;
             public static bool allowAdRequest = true;
 
-            internal static AdAdapterConfig _adConfig;
-            internal static IAdAdapter _adapter;
-            internal static float _savedVolume = -1;
-            internal static float _savedTimeScale = -1;
-            
+            // internal use
             internal static readonly AdsData localData = new AdsData().LoadJsonFromFile();
-            
-            public static AdAdapterConfig adConfig => _adConfig;
+
+            internal protected static AdShowContext context;
+            internal protected static AdAdapter _adapter;
+            internal protected static float _savedVolume = -1;
+            internal protected static float _savedTimeScale = -1;
         }
 
         public partial class Ads // Public
         {
-            internal static void Init()
+            internal static bool InitModule()
             {
-                _adapter = Adapter.GetSingleAdapter<IAdAdapter>();
-                _adConfig = ((AdapterContext)_adapter)?.GetAdapterConfig<AdAdapterConfig>();
-                _adapter?.interstitial.StartLoadAd();
-                _adapter?.rewardVideo.StartLoadAd();
+                _adapter = Adapter2.GetAdapter<AdAdapter>();
+                return _adapter == null;
+            }
+            
+            internal static void StartModule()
+            {
+                if (_adapter == null) return;
+                _adapter.interstitial.StartLoadAd();
+                _adapter.rewardVideo.StartLoadAd();
 
                 if (_isBannerShowing)
                 {
@@ -201,92 +204,54 @@ namespace Amanotes.Core
             public static bool HasRewardedVideo => _adapter.rewardVideo.hasAd;
             public static bool IsBannerShowing => _isBannerShowing;
             public static bool IsAdShowing => context != null;
-            
+
             private static bool ClearPrevContext()
             {
                 if (context == null) return true;
                 float duration = Time.realtimeSinceStartup - context.showCallAt;
-                // bool willSkip = duration < Mathf.Max(60f, _adConfig.adShowTimeoutInSecs);
                 LogWarning($"[AD] ShowRequest IGNORED as another ad is showing (elapsedTime: {duration:n2}s):\n" + JsonUtility.ToJson(context, true));
                 return false;
-
-                // if (willSkip)
-                // {
-                //     LogWarning($"[AD] ShowRequest IGNORED as another ad is showing (elapsedTime: {duration:n2}s):\n" + JsonUtility.ToJson(context, true));
-                //     return false;
-                // }
-                //
-                // LogWarning($"[AD] FORCE STOPPED the previous ad, as it seems to hang (elapsedTime: {duration:n2}s):\n" + JsonUtility.ToJson(context, true));
-                // // possibly hang: force stop
-                // if (context.adType == AdType.Interstitial)
-                // {
-                //     _adapter.interstitial.StopShowAd();
-                // } else
-                // {
-                //     _adapter.rewardVideo.StopShowAd();
-                // }
-                // return true;
             }
 
             public static IAdCallback ShowInterstitial(string placementName = null, Dictionary<string, object> userData = null)
             {
                 if (!ClearPrevContext()) return null;
 
-                context = new ShowAdContext(AdType.Interstitial, placementName, userData);
+                context = new AdShowContext(AdType.Interstitial, placementName, userData);
                 _adapter.interstitial.StartShowAd();
                 return context;
             }
 
-            public static bool IsInterstitialShowing
-            {
-                get
-                {
-                    if (context == null)  return false;
-                    return context.adType == AdType.Interstitial;
-                }
-            }
+            public static bool IsInterstitialShowing => (context != null) && (context.adType == AdType.Interstitial);
 
             public static IAdCallback ShowRewardedVideo(string placementName = null, Dictionary<string, object> userData = null)
             {
                 if (!ClearPrevContext()) return null;
-                
-                context = new ShowAdContext(AdType.VideoReward, placementName, userData);
+
+                context = new AdShowContext(AdType.VideoReward, placementName, userData);
                 _adapter.rewardVideo.StartShowAd();
                 return context;
             }
-            
-            public static bool IsRewardedVideoShowing
-            {
-                get
-                {
-                    if (context == null)  return false;
-                    return context.adType == AdType.VideoReward;
-                }
-            }
-            
+
+            public static bool IsRewardedVideoShowing => (context != null) && (context.adType == AdType.VideoReward);
+
+
             private static bool _isBannerShowing;
-            private static BannerPosition? _showingBannerPosition = null;
+            private static BannerPosition _showingBannerPosition;
             
             public static void ShowBanner(BannerPosition? bannerPosition = null)
             {
                 if (_isBannerShowing) return;
                 _isBannerShowing = true;
-                _showingBannerPosition = bannerPosition;
-                
+                _showingBannerPosition = bannerPosition ?? Config.ad.bannerPosition;
+
                 if (_adapter == null)
                 {
                     //Debug.LogWarning("Adapter not found???");
                     return;
                 }
-
-                if (_adConfig == null)
-                {
-                    //Debug.LogWarning("_adConfig not found???");
-                    return;
-                }
-
-                _showingBannerPosition = bannerPosition ?? _adConfig.bannerPosition;
-                _adapter.ShowBanner(_showingBannerPosition.Value);
+                
+                _adapter.ShowBanner(_showingBannerPosition);
             }
 
             public static void HideBanner()
@@ -306,7 +271,7 @@ namespace Amanotes.Core
                 else
                     _adapter.rewardVideo.StopShowAd();
             }
-            
+
             /// <summary>
             /// Capping for interstitial ad
             /// - Time since last interstitial show success > interstitialCappingTime
@@ -321,16 +286,16 @@ namespace Amanotes.Core
                 bool rewardCapped = (rewardedVideoCappingTime > 0) && TimeSinceLastVideoRewardSucceed < rewardedVideoCappingTime;
                 return interCapped || rewardCapped;
             }
-            
+
             public static int TimeSinceLastInterstitialSucceed => localData.TimeSinceLastShowSuccess(AdType.Interstitial);
             public static int TimeSinceLastVideoRewardSucceed => localData.TimeSinceLastShowSuccess(AdType.VideoReward);
-            public static int TimeSinceLastAdSucceed => Math.Min(TimeSinceLastInterstitialSucceed, TimeSinceLastVideoRewardSucceed) ;
+            public static int TimeSinceLastAdSucceed => Math.Min(TimeSinceLastInterstitialSucceed, TimeSinceLastVideoRewardSucceed);
             public static int TimeSinceLastInterstitialShowCalled => localData.TimeSinceLastShowCalled(AdType.Interstitial);
             public static int TimeSinceLastVideoRewardShowCalled => localData.TimeSinceLastShowCalled(AdType.VideoReward);
-            
+
             public static int InterstitialShowCalledInSession => localData.ShowCallCount(AdType.Interstitial);
             public static int RewardVideoShowCalledInSession => localData.ShowCallCount(AdType.VideoReward);
-            
+
             public static void SetUserId(string userId)
             {
                 _adapter.SetUserId(userId);
@@ -341,22 +306,51 @@ namespace Amanotes.Core
 
 namespace Amanotes.Core.Internal
 {
-    public interface IAdCallback { }
+    [Serializable] public class AdModuleConfig
+    {
+        // [Header("-----     MODULE CONFIG      -----")]
+        // public bool manualInit;
+        public int adLoadTimeoutInSecs = 60;
+        public int adShowTimeoutInSecs = 5;
+        public BannerPosition bannerPosition = BannerPosition.BOTTOM;
+        public bool autoLogEvent = true;
+
+        public bool enableInterstitial = true;
+        public bool enableRewarded = true;
+        public bool enableBanner = true;
+
+        public bool autoMute = true;
+        public bool autoTimeScale = true;
+
+        [Header("EDITOR")]
+        [Range(0f, 1f)] public float rewardAdShowSuccessRate = 1;
+    }
 
-    public interface IAdAdapter
+    public partial class ConfigAsset
     {
-        AdLogic interstitial { get; }
-        AdLogic rewardVideo { get; }
+        [SerializeField] public AdModuleConfig ad;
+    }
+    
+    [Serializable] public abstract class AdAdapter : Adapter2
+    {
+        protected AdShowContext context => Ads.context;
+        protected AdModuleConfig moduleConfig => Config.ad;
 
-        void HandleBeforeAdShow();
-        void HandleAfterAdShow();
-        
-        void ShowBanner(BannerPosition position);
-        void HideBanner();
+        // APIs
+        internal protected abstract AdLogic interstitial { get; }
+        internal protected abstract AdLogic rewardVideo { get; }
 
-        void SetUserId(string userId);
-    }
+        public abstract void ShowBanner(BannerPosition bannerPosition);
+        public abstract void HideBanner();
 
+        // Internally used
+        internal protected abstract void HandleBeforeAdShow();
+        internal protected abstract void HandleAfterAdShow();
+        internal protected abstract void SetUserId(string userId);
+    }
+    
+    public interface IAdCallback { }
+    
     public enum LoadAdsState
     {
         None,
@@ -412,7 +406,7 @@ namespace Amanotes.Core.Internal
         Ready,
     }
     
-    public class ShowAdContext : IAdCallback
+    public class AdShowContext : IAdCallback
     {
         public readonly AdType adType;
         public readonly string placementName;
@@ -433,7 +427,7 @@ namespace Amanotes.Core.Internal
         public float showCallAt;
         public float showFinishAt;
         
-        public ShowAdContext(AdType adType, string placementName, Dictionary<string, object> userData)
+        public AdShowContext(AdType adType, string placementName, Dictionary<string, object> userData)
         {
             this.adType = adType;
             this.userData = userData;
@@ -452,6 +446,10 @@ namespace Amanotes.Core.Internal
 
     public abstract class AdLogic
     {
+        internal protected AdAdapter adapter => Ads._adapter;
+        protected AdModuleConfig adConfig => Config.ad;
+        protected AdShowContext context => Ads.context;
+        
         internal LoadAdsState _loadState = LoadAdsState.None;
         internal bool hasAd
         {
@@ -463,7 +461,7 @@ namespace Amanotes.Core.Internal
                     _loadState = LoadAdsState.None;
                     StartLoadAd();
                 }
-                
+
                 return _loadState == LoadAdsState.Ready;
             }
         }
@@ -481,7 +479,7 @@ namespace Amanotes.Core.Internal
             Log("[Ad] StartLoadAd");
             _loadRoutine = _instance.StartCoroutine(LoadAdRoutine());
         }
-        
+
         public void StopLoadAd()
         {
             Log("[Ad] StopLoadAd");
@@ -489,7 +487,7 @@ namespace Amanotes.Core.Internal
             {
                 _loadState = LoadAdsState.None;
             }
-            
+
             if (_loadRoutine == null) return;
             _instance.StopCoroutine(_loadRoutine);
             _loadRoutine = null;
@@ -503,7 +501,7 @@ namespace Amanotes.Core.Internal
                 _loadState = LoadAdsState.Ready;
                 yield break;
             }
-            
+
             var wait1Sec = new WaitForSecondsRealtime(1f);
             Log("[Ad] LoadAdRoutine start(): isAdReady = " + isAdReady);
             while (true)
@@ -515,19 +513,19 @@ namespace Amanotes.Core.Internal
                     Log("[Ad] LoadAdRoutine: allowAdRequest = false");
                     continue;
                 }
-                
+
                 if (!HasLocalNetworkConnection)
                 {
                     Log("[Ad] LoadAdRoutine: hasInternet = " + HasLocalNetworkConnection);
                     continue;
                 }
-                
+
                 _loadState = LoadAdsState.Requesting;
                 _isRequesting = true;
                 Log("[Ad] LoadAdRoutine: RequestAd()");
                 RequestAd();
 
-                int timeout = Ads._adConfig.adLoadTimeoutInSecs;
+                int timeout = Config.ad.adLoadTimeoutInSecs;
                 var counter = 0;
 
                 while (counter < timeout || timeout == -1)
@@ -576,15 +574,15 @@ namespace Amanotes.Core.Internal
             {
                 LogWarning("[Ad] StartShowAd() --> Invalid _showState: " + _showState);
             }
-            
+
             Log($"[Ad] {adType} StartShowAd");
             _showState = ShowAdsState.ShowCalled;
-            
-            AdStat stat = Ads.localData.GetStat(adType); 
+
+            AdStat stat = Ads.localData.GetStat(adType);
             stat.callCount++;
             stat.lastCallTime = Time.realtimeSinceStartup;
             OnAdShowCalled();
-            
+
             if (_showAdRoutine != null) _instance.StopCoroutine(_showAdRoutine);
             _showAdRoutine = _instance.StartCoroutine(ShowAdRoutine());
         }
@@ -598,7 +596,7 @@ namespace Amanotes.Core.Internal
                 _loadState = LoadAdsState.None;
                 StartLoadAd();
             }
-            
+
             HandleAfterAdShow();
             if (_showAdRoutine == null) return;
             _instance.StopCoroutine(_showAdRoutine);
@@ -606,9 +604,8 @@ namespace Amanotes.Core.Internal
 
             if (Ads.context.adType == AdType.Interstitial)
             {
-                ShowAdRoutineCompleted(!Ads.context.hasFailedOrCancelled);    
-            }
-            else
+                ShowAdRoutineCompleted(!Ads.context.hasFailedOrCancelled);
+            } else
             {
                 ShowAdRoutineCompleted(Ads.context.hasReward);
             }
@@ -618,7 +615,7 @@ namespace Amanotes.Core.Internal
         {
             // Wait to end frame so that all AdCallbacks finish registering
             yield return new WaitForEndOfFrame();
-            
+
             // Wait for Ad
             if (!isAdReady)
             {
@@ -627,7 +624,7 @@ namespace Amanotes.Core.Internal
                     LogWarning("[Ad] Inconsistent state report: isAdReady == false while _loadState == Ready");
                     _loadState = LoadAdsState.None;
                 }
-                
+
                 if (!HasLocalNetworkConnection)
                 {
                     _showState = ShowAdsState.ShowFail;
@@ -635,8 +632,8 @@ namespace Amanotes.Core.Internal
                     ShowAdRoutineCompleted(false);
                     yield break;
                 }
-                
-                int timeout = Ads._adConfig.adShowTimeoutInSecs;
+
+                int timeout = Config.ad.adShowTimeoutInSecs;
                 if (timeout == 0) // do not wait for Ad
                 {
                     _showState = ShowAdsState.ShowFail;
@@ -644,15 +641,15 @@ namespace Amanotes.Core.Internal
                     ShowAdRoutineCompleted(false);
                     yield break;
                 }
-                
+
                 _showState = ShowAdsState.WaitForAd;
                 OnAdShowReadyStatus(false, AdShowReadyStatus.WaitForAd);
-                
+
                 if (_loadState != LoadAdsState.Requesting) StartLoadAd();
                 var counter = 0;
                 bool? hasInternet = null;
                 _instance.StartCoroutine(WebUtils.CheckInternet(result => hasInternet = result));
-                
+
                 var wait1Sec = new WaitForSecondsRealtime(1f);
                 while (counter < timeout || timeout == -1)
                 {
@@ -673,7 +670,7 @@ namespace Amanotes.Core.Internal
                     Log("[Ad] WaitForAd success after " + counter + " | timeout = " + timeout + " secs");
                     break;
                 }
-                
+
                 if (!isAdReady)
                 {
                     Log("[Ad] WaitForAd failed (timeout) " + counter + " | timeout = " + timeout + " secs");
@@ -682,13 +679,13 @@ namespace Amanotes.Core.Internal
                     yield break;
                 }
             }
-            
+
             _showState = ShowAdsState.Showing;
             OnAdShowReadyStatus(true, AdShowReadyStatus.Ready);
             HandleBeforeAdShow();
             ShowAd();
-            
-            ShowAdContext context = Ads.context;
+
+            AdShowContext context = Ads.context;
             while (!context.potentiallyCompleted)
             {
                 yield return null; // callback as quickly as possible
@@ -715,7 +712,7 @@ namespace Amanotes.Core.Internal
                 ShowAdRoutineCompleted(context.hasReward);
                 yield break;
             }
-            
+
             while (!context.hasClosed)
             {
                 Log($"[Ad] {adType} Waiting for [close]");
@@ -732,13 +729,13 @@ namespace Amanotes.Core.Internal
                 _loadState = isAdReady ? LoadAdsState.Ready : LoadAdsState.None;
                 if (_loadState == LoadAdsState.None) StartLoadAd();
             }
-            
+
             _showState = isSuccess ? ShowAdsState.ShowSuccess : ShowAdsState.ShowFail;
-            
+
             // Extra callback
             Ads.context.showFinishAt = Time.realtimeSinceStartup;
             Ads.context.onAdResult?.Invoke(isSuccess);
-            
+
             var localData = Ads.localData;
             var stat = _isInterstitial ? localData.interstitial : localData.reward;
             if (isSuccess)
@@ -746,8 +743,7 @@ namespace Amanotes.Core.Internal
                 stat.success++;
                 stat.successTotal++;
                 stat.lastSuccessTime = (int)Time.realtimeSinceStartup;
-            }
-            else
+            } else
             {
                 stat.failed++;
                 stat.failedTotal++;
@@ -755,60 +751,60 @@ namespace Amanotes.Core.Internal
 
             localData.Save();
             HandleAfterAdShow();
-            
+
             Log($"[Ad] {adType} ShowAdRoutineCompleted: {isSuccess}\n{JsonUtility.ToJson(Ads.context)}");
             Ads.context = null;
             _showState = ShowAdsState.None;
         }
-        
+
         private void HandleBeforeAdShow()
         {
-            bool willSaveVolume = Ads._adConfig.autoMute
+            bool willSaveVolume = Config.ad.autoMute
                 && AudioListener.volume > 0
                 && Ads._savedVolume < 0;
-            
-            bool willSaveTimeScale = Ads._adConfig.autoTimeScale
+
+            bool willSaveTimeScale = Config.ad.autoTimeScale
                 && Time.timeScale > 0
                 && Ads._savedTimeScale < 0;
-            
+
             if (willSaveVolume)
             {
                 Ads._savedVolume = AudioListener.volume;
                 AudioListener.volume = 0;
             }
-            
+
             if (willSaveTimeScale)
             {
                 Ads._savedTimeScale = Time.timeScale;
                 Time.timeScale = 0;
             }
-            
+
             Ads.context.onBeforeAdOpen?.Invoke();
             Ads._adapter.HandleBeforeAdShow();
         }
-        
+
         private void HandleAfterAdShow()
         {
-            bool willRestoreVolume = Ads._adConfig.autoMute
+            bool willRestoreVolume = Config.ad.autoMute
                 && AudioListener.volume == 0
                 && Ads._savedVolume > 0;
-            
-            bool willRestoreTimeScale = Ads._adConfig.autoTimeScale
+
+            bool willRestoreTimeScale = Config.ad.autoTimeScale
                 && Time.timeScale == 0
                 && Ads._savedTimeScale > 0;
-            
+
             if (willRestoreVolume)
             {
                 AudioListener.volume = Ads._savedVolume;
                 Ads._savedVolume = -1;
             }
-            
+
             if (willRestoreTimeScale)
             {
                 Time.timeScale = Ads._savedTimeScale;
                 Ads._savedTimeScale = -1;
             }
-            
+
             Ads._adapter.HandleAfterAdShow();
         }
 
@@ -816,13 +812,12 @@ namespace Amanotes.Core.Internal
         protected void OnAdClosed()
         {
             Log($"[Ad] {adType} OnAdClosed");
-            
+
             if (Ads.context != null)
             {
                 Ads.context.adCallback |= AdCallback.Close;
                 Ads.context.onClosed?.Invoke();
-            }
-            else
+            } else
             {
                 LogWarning("[Ad] OnAdClosed() Something wrong - No AdContext");
             }
@@ -831,13 +826,12 @@ namespace Amanotes.Core.Internal
         protected void OnAdClicked()
         {
             Log($"[Ad] {adType} OnAdClicked");
-            
+
             if (Ads.context != null)
             {
                 Ads.context.adCallback |= AdCallback.Click;
                 Ads.context.onClicked?.Invoke();
-            }
-            else
+            } else
             {
                 LogWarning("[Ad] OnAdClicked() Something wrong - No AdContext");
             }
@@ -846,13 +840,12 @@ namespace Amanotes.Core.Internal
         protected void OnAdShowFailed()
         {
             Log($"[Ad] {adType} OnAdShowFailed");
-            
+
             if (Ads.context != null)
             {
                 Ads.context.adCallback |= AdCallback.Fail;
                 Ads.context.onShowFailed?.Invoke();
-            }
-            else
+            } else
             {
                 LogWarning("[Ad] OnAdShowFailed() Something wrong - No AdContext");
             }
@@ -861,13 +854,12 @@ namespace Amanotes.Core.Internal
         protected void OnAdShowSucceeded()
         {
             Log($"[Ad] {adType} OnAdShowSucceeded");
-            
+
             if (Ads.context != null)
             {
                 Ads.context.adCallback |= AdCallback.Success;
                 Ads.context.onShowSuccess?.Invoke();
-            }
-            else
+            } else
             {
                 LogWarning("[Ad] OnAdShowSucceeded() Something wrong - No AdContext");
             }
@@ -880,33 +872,34 @@ namespace Amanotes.Core.Internal
                 LogWarning("[Ad] OnAdOpen() Something wrong - No AdContext");
                 return;
             }
-            
-                Ads.context.adCallback |= AdCallback.ShowReadyStatus;
-                    Ads.context.onAdShowReadyStatus?.Invoke(status);
+
+            Ads.context.adCallback |= AdCallback.ShowReadyStatus;
+            Ads.context.onAdShowReadyStatus?.Invoke(status);
             if (status == AdShowReadyStatus.Ready)
-                {
-                    OnAdShowReady();
-                }
-            else if (status == AdShowReadyStatus.NoInternet || status == AdShowReadyStatus.TimeOut || status == AdShowReadyStatus.Wifi3GDisabled)
             {
-                OnAdShowNotReady(status);    
+                OnAdShowReady();
+            } else if (status == AdShowReadyStatus.NoInternet || status == AdShowReadyStatus.TimeOut || status == AdShowReadyStatus.Wifi3GDisabled)
+            {
+                OnAdShowNotReady(status);
             }
         }
-        
-        protected virtual void OnAdShowCalled(){}
-        protected virtual void OnAdShowReady(){}
-        protected virtual void OnAdShowNotReady(AdShowReadyStatus status){}
-        
+
+        protected virtual void OnAdShowCalled()
+        { }
+        protected virtual void OnAdShowReady()
+        { }
+        protected virtual void OnAdShowNotReady(AdShowReadyStatus status)
+        { }
+
         protected void OnAdOpen()
         {
             Log($"[Ad] {adType} OnAdOpen");
-                
+
             if (Ads.context != null)
             {
                 Ads.context.adCallback |= AdCallback.Open;
                 Ads.context.onOpened?.Invoke();
-            }
-            else
+            } else
             {
                 LogWarning("[Ad] OnAdOpen() Something wrong - No AdContext");
             }
@@ -915,13 +908,12 @@ namespace Amanotes.Core.Internal
         protected void OnAdReward()
         {
             Log($"[Ad] {adType} OnAdReward");
-            
+
             if (Ads.context != null)
             {
                 Ads.context.adCallback |= AdCallback.Reward;
                 Ads.context.onRewardReceived?.Invoke();
-            }
-            else
+            } else
             {
                 LogWarning("[Ad] OnAdReward() Something wrong - No AdContext");
             }
@@ -930,7 +922,7 @@ namespace Amanotes.Core.Internal
         protected void OnAdLoadSuccess()
         {
             Log($"[Ad] {adType} OnAdLoadSuccess");
-            
+
             if (!_isRequesting && adType == AdType.Interstitial)
             {
                 LogWarning("[Ad] Something wrong? OnAdReady called when no ad is loading! AdType=" + adType);