com.amanotes.gdk 0.2.38 → 0.2.40

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [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"
+- Load Ad timeout should cancel
+
 ## [0.2.38 - 2023-11-22]
 - Improve Ads API
 - Add Ad Quality

package/Runtime/AmaGDK.Ads.cs

@@ -529,7 +529,7 @@ namespace Amanotes.Core.Internal
                 int timeout = Ads._adConfig.adLoadTimeoutInSecs;
                 var counter = 0;
 
-                while (counter < timeout || timeout == 0)
+                while (counter < timeout || timeout == -1)
                 {
                     yield return wait1Sec;
                     counter++;
@@ -634,31 +634,46 @@ 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;
+                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;
@@ -667,7 +682,6 @@ namespace Amanotes.Core.Internal
             
             _showState = ShowAdsState.Showing;
             OnAdShowReadyStatus(true, AdShowReadyStatus.None);
-            
             HandleBeforeAdShow();
             ShowAd();
             

package/Runtime/AmaGDK.cs

@@ -9,12 +9,13 @@ using Amanotes.Core.Internal;
 using UnityEngine;
 using static Amanotes.Core.Internal.Logging;
 using static Amanotes.Core.Internal.Messsage;
+using Debug = UnityEngine.Debug;
 
 namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.38";
+        public const string VERSION = "0.2.40";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -291,17 +292,45 @@ namespace Amanotes.Core
         public void ChangeDevMode()
         {
             string variableName = "GDK_HOME";
-            string output = RunShellCommand($"source ~/.zshrc && echo file:${variableName}");
-            output = output.Trim();
-
-            if (string.IsNullOrEmpty(output))
+            string zshrcPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".zshrc");
+            string zshrcContent;
+        
+            try
+            {
+                zshrcContent = File.ReadAllText(zshrcPath);
+            }
+            catch (FileNotFoundException)
+            {
+                Debug.LogWarning($"Zsh configuration file {zshrcPath} not found.");
+                return;
+            }
+        
+            if (!zshrcContent.Contains($"export {variableName}="))
             {
-                LogWarning($"{variableName} environment variable is not set.");
+                Debug.LogWarning($"{variableName} environment variable is not set in {zshrcPath}.");
                 return;
             }
+        
+            int startIndex = zshrcContent.IndexOf($"export {variableName}=");
+            if (startIndex >= 0)
+            {
+                startIndex += $"export {variableName}=".Length;
+                int endIndex = zshrcContent.IndexOfAny(new char[] { '\n', '\r' }, startIndex);
+                string gdkHomeValue = endIndex >= 0
+                    ? zshrcContent.Substring(startIndex, endIndex - startIndex).Trim()
+                    : zshrcContent.Substring(startIndex).Trim();
             
-            UpdateManifest(output);
-            Log("AmaGDK changes to dev mode successfully");
+                if (string.IsNullOrEmpty(gdkHomeValue))
+                {
+                    Debug.LogWarning($"{variableName} environment variable is set but has an empty value in {zshrcPath}.");
+                    return;
+                }
+            }
+        
+            string output = RunShellCommand($"source ~/.zshrc && echo file:${variableName}");
+            output = output.Trim();
+            UpdateManifest(output); 
+            Debug.Log("AmaGDK changes to dev mode successfully");
         }
             
         private string RunShellCommand(string command)

package/package.json

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