com.taptap.sdk.license 4.9.4 → 4.9.5

package/Mobile/Editor/NativeDependencies.xml

@@ -4,7 +4,7 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-license:4.9.4" />
+    <androidPackage spec="com.taptap.sdk:tap-license:4.9.5" />
   </androidPackages>
   <iosPods>
     <sources>

package/Standalone/Runtime/TapLicenseClientBridge.cs

@@ -0,0 +1,199 @@
+using System;
+using System.Runtime.InteropServices;
+using TapSDK.Core.Internal.Log;
+using TapSDK.Core.Standalone;
+using TapSDK.Core.Standalone.Internal;
+
+#if PLATFORM_STANDALONE_WIN
+namespace TapSDK.License.Standalone
+{
+    internal class TapLicenseClientBridge
+    {
+        private static Action<string, bool> currentDlcDelegate;
+        private static Action<bool> currentLicenseDelegate;
+
+        /// 查询是否购买 DLC , 未调用 isLaunchFromPC 会抛异常
+        public static bool QueryDLC(string skuId)
+        {
+            if (!TapClientStandalone.isPassedInLaunchedFromTapTapPCCheck())
+            {
+                throw new Exception(
+                    "queryDLC must be invoked after IsLaunchedFromTapTapPC success"
+                );
+            }
+            bool success = LicenseNativeBridge.TapDLC_IsOwned(skuId);
+            return success;
+        }
+
+        /// 跳转到 TapTap 客户端 DLC 购买页面 , 未调用 isLaunchFromPC 会抛异常
+        public static bool ShowStore(string skuId)
+        {
+            if (!TapClientStandalone.isPassedInLaunchedFromTapTapPCCheck())
+            {
+                throw new Exception(
+                    "purchaseDLC must be invoked after IsLaunchedFromTapTapPC success"
+                );
+            }
+            TapLog.Log("purchaseDLC start = " + skuId);
+            return LicenseNativeBridge.TapDLC_ShowStore(skuId);
+        }
+
+        /// 注册 DLC 购买状态变更回调，包括购买成功和退款
+        public static void RegisterDLCOwnedCallback(Action<string, bool> dlcDelegate)
+        {
+            currentDlcDelegate = dlcDelegate;
+            LicenseNativeBridge.RegisterCallback(
+                LicenseNativeBridge.TapEventID.DLCPlayableStatusChanged,
+                DLCCallbackDelegate
+            );
+        }
+
+        /// DLC 回调
+        [AOT.MonoPInvokeCallback(typeof(TapClientBridge.CallbackDelegate))]
+        static void DLCCallbackDelegate(int id, IntPtr userData)
+        {
+            TapLog.Log("queryDlC recevie callback " + id);
+            if (currentDlcDelegate != null)
+            {
+                LicenseNativeBridge.DLCPlayableStatusChangedResponse response =
+                    Marshal.PtrToStructure<LicenseNativeBridge.DLCPlayableStatusChangedResponse>(
+                        userData
+                    );
+                TapLog.Log(
+                    "queryDlC callback =  " + response.dlc_id + " isOwn = " + response.is_playable
+                );
+                currentDlcDelegate(response.dlc_id, response.is_playable != 0);
+            }
+        }
+
+        /// 注册 License 购买状态变更回调，包括购买成功和退款
+        public static void RegisterLicenseCallback(Action<bool> licensecDelegate)
+        {
+            currentLicenseDelegate = licensecDelegate;
+            LicenseNativeBridge.RegisterCallback(
+                LicenseNativeBridge.TapEventID.GamePlayableStatusChanged,
+                LicenseCallbackDelegate
+            );
+        }
+
+        /// License 回调
+        [AOT.MonoPInvokeCallback(typeof(TapClientBridge.CallbackDelegate))]
+        static void LicenseCallbackDelegate(int id, IntPtr userData)
+        {
+            TapLog.Log("License recevie callback " + id);
+            if (currentLicenseDelegate != null)
+            {
+                LicenseNativeBridge.GamePlayableStatusChangedResponse response =
+                    Marshal.PtrToStructure<LicenseNativeBridge.GamePlayableStatusChangedResponse>(
+                        userData
+                    );
+                TapLog.Log("License callback  isOwn changed " + response.is_playable);
+                currentLicenseDelegate(response.is_playable != 0);
+            }
+        }
+
+        public static bool HasLicense()
+        {
+            if (!TapClientStandalone.isPassedInLaunchedFromTapTapPCCheck())
+            {
+                throw new Exception(
+                    "checkLicense must be invoked after IsLaunchedFromTapTapPC success"
+                );
+            }
+            return LicenseNativeBridge.TapApps_IsOwned();
+        }
+    }
+
+    internal class LicenseNativeBridge
+    {
+        internal enum TapEventID
+        {
+            // [4001, 6000), reserved for TapTap ownership events
+            GamePlayableStatusChanged = 4001,
+            DLCPlayableStatusChanged = 4002,
+        };
+
+        public const string DLL_NAME = "taptap_api";
+
+        // 检查是否拥有当前游戏
+        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern bool TapApps_IsOwned();
+
+        // 游戏本体可玩状态变更事件响应结构体
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+        public struct GamePlayableStatusChangedResponse
+        {
+            public byte is_playable; // 游戏本体是否可玩
+        };
+
+        // 显示指定 DLC 的商店页面
+        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern bool TapDLC_ShowStore([MarshalAs(UnmanagedType.LPStr)] string dlcId);
+
+        // 查询用户是否拥有指定的 DLC
+        [DllImport(DLL_NAME, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern bool TapDLC_IsOwned([MarshalAs(UnmanagedType.LPStr)] string dlcId);
+
+        // DLC 授权完成响应结果
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+        public struct DLCPlayableStatusChangedResponse
+        {
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
+            public string dlc_id; // DLC ID
+
+            public byte is_playable; // 是否可玩，当用户购买 DLC （外置 DLC 为购买且下载完成后），此值返回 true。其他情况返回 false
+        }
+
+        // 预防 GC 回收的静态变量
+        private static TapClientBridge.CallbackDelegate _dlcCallbackInstance;
+
+        private static TapClientBridge.CallbackDelegate _licenseCallbackInstance;
+
+        internal static void RegisterCallback(
+            TapEventID eventID,
+            TapClientBridge.CallbackDelegate callback
+        )
+        {
+            IntPtr funcPtr = Marshal.GetFunctionPointerForDelegate(callback);
+            switch (eventID)
+            {
+                case TapEventID.DLCPlayableStatusChanged:
+                    if (_dlcCallbackInstance != null)
+                    {
+                        UnRegisterCallback(eventID, _dlcCallbackInstance);
+                    }
+                    _dlcCallbackInstance = callback;
+                    break;
+                case TapEventID.GamePlayableStatusChanged:
+                    if (_licenseCallbackInstance != null)
+                    {
+                        UnRegisterCallback(eventID, _licenseCallbackInstance);
+                    }
+                    _licenseCallbackInstance = callback;
+                    break;
+            }
+
+            TapClientBridge.TapSDK_RegisterCallback((int)eventID, funcPtr);
+        }
+
+        // 移除回调
+        internal static void UnRegisterCallback(
+            TapEventID eventID,
+            TapClientBridge.CallbackDelegate callback
+        )
+        {
+            IntPtr funcPtr = Marshal.GetFunctionPointerForDelegate(callback);
+            TapClientBridge.TapSDK_UnregisterCallback((int)eventID, funcPtr);
+            switch (eventID)
+            {
+                case TapEventID.DLCPlayableStatusChanged:
+                    _dlcCallbackInstance = null;
+                    break;
+                case TapEventID.GamePlayableStatusChanged:
+                    _licenseCallbackInstance = null;
+                    break;
+            }
+        }
+    }
+}
+#endif

package/Standalone/Runtime/TapLicenseClientBridge.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0e1e0eae895c24630825011501dc339e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Standalone/Runtime/TapLicenseStandalone.cs

@@ -1,19 +1,14 @@
-using TapSDK.License;
-using TapSDK.License.Internal;
-using TapSDK.Core;
-using TapSDK.Core.Standalone;
+using System;
 using System.Collections.Generic;
-using System;
-using UnityEngine.Animations;
-using System.Linq;
-using TapSDK.Core.Internal.Log;
-
-#if PLATFORM_STANDALONE_WIN 
-namespace TapSDK.License.Standalone {
+using TapSDK.Core.Standalone;
+using TapSDK.License;
+using TapSDK.License.Internal;
 
+#if PLATFORM_STANDALONE_WIN
+namespace TapSDK.License.Standalone
+{
     public class TapLicenseStandalone : ITapLicenseBridge
     {
-
         private List<ITapDlcCallback> currentDLCCallbacks;
 
         private List<ITapLicenseCallback> currentLicenseCallbacks;
@@ -29,6 +24,7 @@ namespace TapSDK.License.Standalone {
         {
             TaplicenseTracker.Instance.TrackInit();
         }
+
         public void CheckLicense()
         {
             if (!CheckInit())
@@ -37,17 +33,26 @@ namespace TapSDK.License.Standalone {
             }
             currentSessionId = Guid.NewGuid().ToString();
             string method = "checkLicense";
-            Dictionary<string, string> props = new Dictionary<string, string> { { "license_type", "tap_license" } };
+            Dictionary<string, string> props = new Dictionary<string, string>
+            {
+                { "license_type", "tap_license" },
+            };
             TaplicenseTracker.Instance.TrackStart(method, currentSessionId, props);
             bool isOwned = false;
             try
             {
-                isOwned = TapClientStandalone.HasLicense();
+                isOwned = TapLicenseClientBridge.HasLicense();
             }
             catch (Exception e)
             {
-                TaplicenseTracker.Instance.TrackFailure(method, currentSessionId, props, -1, e.Message ?? "");
-                throw ;
+                TaplicenseTracker.Instance.TrackFailure(
+                    method,
+                    currentSessionId,
+                    props,
+                    -1,
+                    e.Message ?? ""
+                );
+                throw;
             }
 
             if (isOwned)
@@ -56,7 +61,13 @@ namespace TapSDK.License.Standalone {
             }
             else
             {
-                TaplicenseTracker.Instance.TrackFailure(method, currentSessionId, props, 0, "NOT_PURCHASED");
+                TaplicenseTracker.Instance.TrackFailure(
+                    method,
+                    currentSessionId,
+                    props,
+                    0,
+                    "NOT_PURCHASED"
+                );
             }
 
             if (currentLicenseCallbacks != null)
@@ -72,7 +83,6 @@ namespace TapSDK.License.Standalone {
                         callback?.OnLicenseFailed();
                     }
                 }
-
             }
         }
 
@@ -81,7 +91,6 @@ namespace TapSDK.License.Standalone {
             CheckLicense();
         }
 
-
         public void QueryDLC(string[] skus)
         {
             if (!CheckInit())
@@ -94,21 +103,30 @@ namespace TapSDK.License.Standalone {
             }
             currentSessionId = Guid.NewGuid().ToString();
             string method = "queryDLC";
-            Dictionary<string, string> props = new Dictionary<string, string> { { "sku_ids", string.Join(",", skus) } };
+            Dictionary<string, string> props = new Dictionary<string, string>
+            {
+                { "sku_ids", string.Join(",", skus) },
+            };
             TaplicenseTracker.Instance.TrackStart(method, currentSessionId, props);
             Dictionary<string, object> dlcResult = new Dictionary<string, object>();
             try
             {
                 foreach (string skuId in skus)
                 {
-                    bool isOwned = TapClientStandalone.QueryDLC(skuId);
+                    bool isOwned = TapLicenseClientBridge.QueryDLC(skuId);
                     dlcResult.Add(skuId, isOwned ? 1 : 0);
                 }
             }
             catch (Exception e)
             {
-                TaplicenseTracker.Instance.TrackFailure(method, currentSessionId, props, -1, e.Message ?? "");
-                throw ;
+                TaplicenseTracker.Instance.TrackFailure(
+                    method,
+                    currentSessionId,
+                    props,
+                    -1,
+                    e.Message ?? ""
+                );
+                throw;
             }
             TaplicenseTracker.Instance.TrackSuccess(method, currentSessionId, props);
             if (currentDLCCallbacks != null)
@@ -130,11 +148,10 @@ namespace TapSDK.License.Standalone {
             if (!HasRegisterNativeDLCCallback)
             {
                 HasRegisterNativeDLCCallback = true;
-                TapClientStandalone.RegisterDLCOwnedCallback(DLCCallbackDelegate);
+                TapLicenseClientBridge.RegisterDLCOwnedCallback(DLCCallbackDelegate);
             }
         }
 
-
         public void RegisterLicencesCallback(ITapLicenseCallback callback)
         {
             if (currentLicenseCallbacks == null)
@@ -145,7 +162,7 @@ namespace TapSDK.License.Standalone {
             if (!HasRegisterNativeLicenseCallback)
             {
                 HasRegisterNativeLicenseCallback = true;
-                TapClientStandalone.RegisterLicenseCallback(LicenseCallbackDelegate);
+                TapLicenseClientBridge.RegisterLicenseCallback(LicenseCallbackDelegate);
             }
         }
 
@@ -157,16 +174,25 @@ namespace TapSDK.License.Standalone {
             }
             currentSessionId = Guid.NewGuid().ToString();
             string method = "purchaseDLC";
-            Dictionary<string, string> props = new Dictionary<string, string> { { "sku_id", skuId } };
+            Dictionary<string, string> props = new Dictionary<string, string>
+            {
+                { "sku_id", skuId },
+            };
             TaplicenseTracker.Instance.TrackStart(method, currentSessionId, props);
             bool isSuccess = false;
             try
             {
-                isSuccess = TapClientStandalone.ShowStore(skuId);
+                isSuccess = TapLicenseClientBridge.ShowStore(skuId);
             }
             catch (Exception e)
             {
-                TaplicenseTracker.Instance.TrackFailure(method, currentSessionId, props, -1, e.Message ?? "");
+                TaplicenseTracker.Instance.TrackFailure(
+                    method,
+                    currentSessionId,
+                    props,
+                    -1,
+                    e.Message ?? ""
+                );
                 throw;
             }
             if (isSuccess)
@@ -175,7 +201,13 @@ namespace TapSDK.License.Standalone {
             }
             else
             {
-                TaplicenseTracker.Instance.TrackFailure(method, currentSessionId, props, -1, "ShowStoreFailed");
+                TaplicenseTracker.Instance.TrackFailure(
+                    method,
+                    currentSessionId,
+                    props,
+                    -1,
+                    "ShowStoreFailed"
+                );
             }
         }
 
@@ -185,12 +217,16 @@ namespace TapSDK.License.Standalone {
             {
                 foreach (ITapDlcCallback callback in currentDLCCallbacks)
                 {
-                    callback?.OnOrderCallBack(skuId, isOwned ? TapLicensePurchasedCode.DLC_PURCHASED : TapLicensePurchasedCode.DLC_NOT_PURCHASED);
+                    callback?.OnOrderCallBack(
+                        skuId,
+                        isOwned
+                            ? TapLicensePurchasedCode.DLC_PURCHASED
+                            : TapLicensePurchasedCode.DLC_NOT_PURCHASED
+                    );
                 }
             }
         }
 
-
         private void LicenseCallbackDelegate(bool isOwned)
         {
             if (currentLicenseCallbacks != null)
@@ -206,7 +242,6 @@ namespace TapSDK.License.Standalone {
                         callback?.OnLicenseFailed();
                     }
                 }
-
             }
         }
 
@@ -218,7 +253,6 @@ namespace TapSDK.License.Standalone {
             }
             return true;
         }
-
     }
 }
-#endif
+#endif

package/package.json

@@ -2,10 +2,10 @@
   "name": "com.taptap.sdk.license",
   "displayName": "TapTapSDK License",
   "description": "TapTapSDK License",
-  "version": "4.9.4",
-  "unity": "2020.3.0f1",
+  "version": "4.9.5",
+  "unity": "2019.4",
   "license": "MIT",
   "dependencies": {
-    "com.taptap.sdk.core": "4.9.4"
+    "com.taptap.sdk.core": "4.9.5"
   }
 }