com.amanotes.gdk 0.2.39 → 0.2.41

package/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Changelog
 
+## [0.2.41 - 2023-11-28]
+- Add more state callbacks for AdShowReadyStatus
+- Fix not wait for RewardCancel event (not exist any more)
+- Timeout for Adapter init should be 1s
+
+## [0.2.40 - 2023-11-27]
+- Fix ShowAdTimeout = 0 should not wait for Ad
+
 ## [0.2.39 - 2023-11-27]
 - Fix variable name and variable value of "ChangeDevMode"
-- Fix Timeout = 0 should cancel the wait for Ad
+- Load Ad timeout should cancel
 
 ## [0.2.38 - 2023-11-22]
 - Improve Ads API

package/Runtime/AmaGDK.Ads.cs

@@ -407,7 +407,9 @@ namespace Amanotes.Core.Internal
         None,
         Wifi3GDisabled,
         NoInternet,
-        TimeOut
+        WaitForAd,
+        TimeOut,
+        Ready,
     }
     
     public class ShowAdContext : IAdCallback
@@ -634,31 +636,47 @@ namespace Amanotes.Core.Internal
                     ShowAdRoutineCompleted(false);
                     yield break;
                 }
-
-                var hasInternet = false;
-                yield return WebUtils.CheckInternet(result => hasInternet = result);
-                if (!hasInternet)
+                
+                int timeout = Ads._adConfig.adShowTimeoutInSecs;
+                if (timeout == 0) // do not wait for Ad
                 {
                     _showState = ShowAdsState.ShowFail;
-                    OnAdShowReadyStatus(false, AdShowReadyStatus.NoInternet);
+                    OnAdShowReadyStatus(false, AdShowReadyStatus.TimeOut);
                     ShowAdRoutineCompleted(false);
                     yield break;
                 }
-
-                if (_loadState != LoadAdsState.Requesting) StartLoadAd();
+                
                 _showState = ShowAdsState.WaitForAd;
-                int timeout = Ads._adConfig.adShowTimeoutInSecs;
+                OnAdShowReadyStatus(false, AdShowReadyStatus.WaitForAd);
+                
+                if (_loadState != LoadAdsState.Requesting) StartLoadAd();
                 var counter = 0;
-
-                while (counter < timeout || timeout == 0)
+                bool? hasInternet = null;
+                _instance.StartCoroutine(WebUtils.CheckInternet(result => hasInternet = result));
+                
+                while (counter < timeout || timeout == -1)
                 {
                     yield return wait1Sec;
                     counter++;
-                    if (_loadState == LoadAdsState.Ready) break;
-                }
 
+                    // finish checking internet & result is false
+                    if (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;
+                }
+                
                 if (!isAdReady)
                 {
+                    Log("[Ad] WaitForAd failed (timeout) " + counter + " | timeout = " + timeout + " secs");
                     OnAdShowReadyStatus(false, AdShowReadyStatus.TimeOut);
                     ShowAdRoutineCompleted(false);
                     yield break;
@@ -666,8 +684,7 @@ namespace Amanotes.Core.Internal
             }
             
             _showState = ShowAdsState.Showing;
-            OnAdShowReadyStatus(true, AdShowReadyStatus.None);
-            
+            OnAdShowReadyStatus(true, AdShowReadyStatus.Ready);
             HandleBeforeAdShow();
             ShowAd();
             
@@ -693,13 +710,9 @@ namespace Amanotes.Core.Internal
 
             if (context.hasClosed)
             {
-                while (!context.hasFailedOrCancelled && !context.hasReward)
-                {
-                    Log($"[Ad] {adType} Waiting for [cancel] or [reward]");
-                    yield return null;
-                }
-
-                ShowAdRoutineCompleted(!context.hasFailedOrCancelled);
+                // wait 1 frame in case hasReward callback after onClose
+                if (!context.hasReward) yield return null;
+                ShowAdRoutineCompleted(context.hasReward);
                 yield break;
             }
             
@@ -871,6 +884,7 @@ namespace Amanotes.Core.Internal
                     OnAdShowNotReady(status);
                 } else
                 {
+                    Ads.context.onAdShowReadyStatus?.Invoke(AdShowReadyStatus.Ready);
                     OnAdShowReady();
                 }
             }

package/Runtime/AmaGDK.cs

@@ -15,7 +15,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.39";
+        public const string VERSION = "0.2.41";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -69,7 +69,7 @@ namespace Amanotes.Core
             yield return StartCoroutine(User.Init());
 
             float time = 0;
-            float timeout = 10;
+            float timeout = 1;
 
             var counter = 0;
             const int INIT_TOLERANCE = 10 * 60;

package/package.json

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