com.amanotes.gdk 0.2.73-1 → 0.2.73-2

package/Runtime/AmaGDK.IAP.cs

@@ -14,12 +14,26 @@ namespace Amanotes.Core
     {
         public partial class IAP //Public
         {
-            public static bool IsVIP => !string.IsNullOrEmpty(localData.activeSubscriptionId);
-            public static string ActiveSubscriptionId => localData.activeSubscriptionId;
-            public static string SubscriptionPeriodType => localData.subscriptionPeriodType;
-            public static DateTime? SubscriptionLastPurchaseDate => localData.SubscriptionLastPurchaseDate;
-            public static DateTime? SubscriptionExpiredDate => localData.SubscriptionExpiredDate;
-            public static DateTime? UnsubscribedDate => localData.UnsubscribedDate;
+            public static string SubscriptionPeriodType(string entitlement = "")
+            {
+                return Adapter?.GetSubscriptionPeriodType(entitlement); 
+            }
+            
+            public static DateTime? SubscriptionLastPurchaseDate(string entitlement = "")
+            {
+                return Adapter?.GetSubscriptionLastPurchaseDate(entitlement);
+            }
+
+            public static DateTime? SubscriptionExpiredDate(string entitlement = "")
+            {
+                return Adapter?.GetSubscriptionExpiredDate(entitlement);
+            }
+
+            public static DateTime? UnsubscribedDate(string entitlement = "")
+            {
+                return Adapter?.GetUnsubscribedDate(entitlement);
+            }
+
             public static readonly Dictionary<string, ProductInfo> AllProducts = new Dictionary<string, ProductInfo>();
             private const string DATE_FORMAT = "yyyy/MM/yy HH:mm:ss";
             
@@ -150,58 +164,8 @@ namespace Amanotes.Core
             [Serializable]
             internal class IAPData : IJsonFile
             {
-                public string activeSubscriptionId;
-                public string subscriptionPeriodType;
-                public string subscriptionLastPurchaseDate;
-                public string subscriptionExpiredDate;
-                public string unsubscribedDate;
                 public List<string> purchasedProducts;
                 
-                private DateTime? _subscriptionLastPurchaseDate;
-                public DateTime? SubscriptionLastPurchaseDate
-                {
-                    get
-                    {
-                        if (_subscriptionLastPurchaseDate != null) return _subscriptionLastPurchaseDate;
-                        if (DateTime.TryParseExact(subscriptionLastPurchaseDate, DATE_FORMAT,
-                                CultureInfo.InvariantCulture, DateTimeStyles.None, out var pd))
-                        {
-                            _subscriptionLastPurchaseDate = pd;
-                        }
-                        return _subscriptionLastPurchaseDate;
-                    }
-                }
-                
-                private DateTime? _subscriptionExpiredDate;
-                public DateTime? SubscriptionExpiredDate
-                {
-                    get
-                    {
-                        if (_subscriptionExpiredDate != null) return _subscriptionExpiredDate;
-                        if (DateTime.TryParseExact(subscriptionExpiredDate, DATE_FORMAT,
-                                CultureInfo.InvariantCulture, DateTimeStyles.None, out var pd))
-                        {
-                            _subscriptionExpiredDate = pd;
-                        }
-                        return _subscriptionExpiredDate;
-                    }
-                }
-                
-                private DateTime? _unsubscribedDate;
-                public DateTime? UnsubscribedDate
-                {
-                    get
-                    {
-                        if (_unsubscribedDate != null) return _unsubscribedDate;
-                        if (DateTime.TryParseExact(unsubscribedDate, DATE_FORMAT,
-                                CultureInfo.InvariantCulture, DateTimeStyles.None, out var pd))
-                        {
-                            _unsubscribedDate = pd;
-                        }
-                        return _unsubscribedDate;
-                    }
-                }
-
                 public void Sync()
                 {
                     GDKUtils.StartCoroutine(SyncRoutine());
@@ -215,15 +179,7 @@ namespace Amanotes.Core
                         yield break;
                     }
                     yield return new WaitUntil(() => Adapter.IsReady);
-                    activeSubscriptionId = Adapter.GetActiveSubscriptionId();
-                    subscriptionPeriodType = Adapter.GetSubscriptionPeriodType();
                     purchasedProducts = Adapter.GetPurchasedProducts();
-                    _subscriptionLastPurchaseDate = Adapter.GetSubscriptionLastPurchaseDate();
-                    subscriptionLastPurchaseDate = _subscriptionLastPurchaseDate?.ToString(DATE_FORMAT);
-                    _subscriptionExpiredDate = Adapter.GetSubscriptionExpiredDate();
-                    subscriptionExpiredDate = _subscriptionExpiredDate?.ToString(DATE_FORMAT);
-                    _unsubscribedDate = Adapter.GetUnsubscribedDate();
-                    unsubscribedDate = _unsubscribedDate?.ToString(DATE_FORMAT);
                     this.SaveJsonToFile();
                 }
             }
@@ -566,11 +522,11 @@ namespace Amanotes.Core.Internal
         public abstract void  RestorePurchase(Action<PurchaseSuccess> onSuccess = null, Action<PurchaseError> onFail = null);
         public abstract List<string> GetActiveSubscriptions();
         public abstract List<string> GetPurchasedProducts();
-        public abstract string GetActiveSubscriptionId();
-        public abstract string GetSubscriptionPeriodType();
-        public abstract DateTime? GetSubscriptionLastPurchaseDate();
-        public abstract DateTime? GetSubscriptionExpiredDate();
-        public abstract DateTime? GetUnsubscribedDate();
+        public abstract string GetActiveSubscriptionId(string entitlement = "");
+        public abstract string GetSubscriptionPeriodType(string entitlement = "");
+        public abstract DateTime? GetSubscriptionLastPurchaseDate(string entitlement = "");
+        public abstract DateTime? GetSubscriptionExpiredDate(string entitlement = "");
+        public abstract DateTime? GetUnsubscribedDate(string entitlement = "");
         public abstract HashSet<PurchaseRecord> GetPurchaseHistory();
         public abstract DateTime? GetLastPurchaseDate(string productAndPlanId);
     }

package/Runtime/AmaGDK.cs

@@ -24,7 +24,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.73-1";
+        public const string VERSION = "0.2.73-2";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;

package/package.json

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