com.xd.sdk.tap 0.0.6-xd.2 → 0.0.6-xd.3

package/Compliance/Runtime/Public/TapTapCompliance.cs

@@ -3,7 +3,6 @@ using TapSDK.Core;
 using TapSDK.Compliance.Model;
 using TapSDK.Compliance.Internal;
 using System.Threading.Tasks;
-using TapSDK.Core.Internal.Log;
 
 namespace TapSDK.Compliance
 {
@@ -11,12 +10,12 @@ namespace TapSDK.Compliance
     public static class TapTapCompliance
     {
 
-        public static readonly string Version = "4.8.1-beta.1";
+        public static readonly string Version = "4.8.1-beta.6";
 
         public static void RegisterComplianceCallback(Action<int, string> callback)
         {
             if (ComplianceJobManager.IsInit() == false) {
-                TapLog.Warning("TapSDK::ComplianceUIKit is not init, please call Init first!");
+                TapLogger.Warn("TapSDK::ComplianceUIKit is not init, please call Init first!");
             }
             ComplianceJobManager.Job?.RegisterComplianceCallback(callback);
         }

package/Compliance/link.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 07c47b078fb194edca068de7ed08ffa1
+guid: 7f6506ee2fb7049df9b6e1bc1c4efad4
 TextScriptImporter:
   externalObjects: {}
   userData: 

package/Core/Editor/TapSDKCoreCompile.cs

@@ -91,6 +91,7 @@ namespace TapSDK.Core.Editor
             string modulePackageName,
             string moduleName, string[] bundleNames, string target, string projPath, PBXProject proj, string podSpecName = "")
         {
+            // TIPS: bundle 资源会被 XDSDK 脚本处理，这里直接屏蔽相关逻辑
             return true;
 
             var resourcePath = Path.Combine(path, resourceName);

package/Core/Runtime/Public/TapTapSDK.cs

@@ -12,7 +12,7 @@ using System.ComponentModel;
 
 namespace TapSDK.Core {
     public class TapTapSDK {
-        public static readonly string Version = "4.8.1-beta.1";
+        public static readonly string Version = "4.8.1-beta.6";
         
         public static string SDKPlatform = "TapSDK-Unity";
 
@@ -54,7 +54,7 @@ namespace TapSDK.Core {
                 initTasks = initTasks.OrderBy(task => task.Order).ToList();
                 foreach (IInitTask task in initTasks)
                 {
-                    TapLog.Log($"Init: {task.GetType().Name}");
+                    TapLogger.Debug($"Init: {task.GetType().Name}");
                     task.Init(coreOption);
                 }
             }

package/Core/Standalone/Plugins/macOS/libtapsdkcorecpp.dylib.meta

@@ -53,7 +53,7 @@ PluginImporter:
     second:
       enabled: 1
       settings:
-        CPU: x86_64
+        CPU: AnyCPU
   - first:
       Standalone: Win
     second:

package/Core/Standalone/Runtime/Internal/Bean/TapGatekeeper.cs

@@ -20,8 +20,6 @@ namespace TapSDK.Core.Standalone.Internal.Bean
     [Serializable]
     internal class TapGatekeeperSwitch
     {
-        [JsonProperty("auto_event")]
-        public bool AutoEvent { get; set; } = true;
 
         [JsonProperty("heartbeat")]
         public bool Heartbeat { get; set; } = true;

package/Core/Standalone/Runtime/Internal/Tracker.cs

@@ -28,10 +28,10 @@ namespace TapSDK.Core.Standalone.Internal {
             sender = new EventSender();
             
             InitBasicProps();
-            if (TapCoreStandalone.enableAutoEvent) {
-                Dictionary<string, object> props = new Dictionary<string, object>(basicProps);
-                TrackEvent(Constants.DEVICE_LOGIN, props, true);
-            }
+            
+            Dictionary<string, object> props = new Dictionary<string, object>(basicProps);
+            TrackEvent(Constants.DEVICE_LOGIN, props, true);
+            
         }
 
         public void AddCommonProperty(string key, object value) {

package/Core/Standalone/Runtime/Internal/User.cs

@@ -30,9 +30,8 @@ namespace TapSDK.Core.Standalone.Internal {
             // 再执行新用户登录逻辑
             Id = userId;
 
-            if (TapCoreStandalone.enableAutoEvent) {
-                TapEventStandalone.Tracker?.TrackEvent(Constants.USER_LOGIN, props, true);
-            }
+            TapEventStandalone.Tracker?.TrackEvent(Constants.USER_LOGIN, props, true);
+            
 
             Dictionary<string, object> updateProps = new Dictionary<string, object> {
                 { "has_user", true },

package/Core/Standalone/Runtime/Public/TapCoreStandalone.cs

@@ -29,7 +29,6 @@ namespace TapSDK.Core.Standalone
 
         // client 信息是否匹配
         internal static bool isClientInfoMatched = true;
-        internal static bool enableAutoEvent = true;
 
         internal static TapGatekeeper gatekeeperData = new TapGatekeeper();
 
@@ -96,7 +95,6 @@ namespace TapSDK.Core.Standalone
                 try
                 {
                     TapGatekeeper tapGatekeeper = JsonConvert.DeserializeObject<TapGatekeeper>(clientSettings);
-                    SetAutoEvent(tapGatekeeper);
                     if (tapGatekeeper.Switch?.Heartbeat == true)
                     {
                         TapAppDurationStandalone.Enable();
@@ -163,7 +161,6 @@ namespace TapSDK.Core.Standalone
                json: body,
                onSuccess: (data) =>
                {
-                   SetAutoEvent(data);
                    if (data.Switch?.Heartbeat == true)
                    {
                        TapAppDurationStandalone.Enable();
@@ -199,17 +196,6 @@ namespace TapSDK.Core.Standalone
             File.WriteAllText(Path.Combine(Application.persistentDataPath, Constants.ClientSettingsFileName + "_" + TapTapSDK.taptapSdkOptions.clientId + ".json"), json);
         }
 
-        private void SetAutoEvent(TapGatekeeper gatekeeper)
-        {
-            if (gatekeeper != null)
-            {
-                var switchData = gatekeeper.Switch;
-                if (switchData != null)
-                {
-                    enableAutoEvent = switchData.AutoEvent;
-                }
-            }
-        }
 
         public static bool CheckInitState()
         {

package/Core/link.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e0d4ea93ec6c34a84a01c4ec717089ef
+guid: cd547e3b8c029465aa1602c53876f69e
 TextScriptImporter:
   externalObjects: {}
   userData: 

package/Editor/Android/TapWrapperAndroidGradleProcessor.cs

@@ -19,19 +19,29 @@ namespace XD.SDK.Tap.Editor
 
         protected override List<AndroidGradleProjectConfig.Dependency> GenerateDependencies()
         {
-            return new List<AndroidGradleProjectConfig.Dependency>()
+            var dependencies = new List<AndroidGradleProjectConfig.Dependency>
             {
-                new AndroidGradleProjectConfig.Dependency(group: "com.taptap.sdk", module: "tap-core-unity",
-                    version: VersionCatalog.TapTapSdk),
-                new AndroidGradleProjectConfig.Dependency(group: "com.taptap.sdk", module: "tap-login-unity",
-                    version: VersionCatalog.TapTapSdk),
-                new AndroidGradleProjectConfig.Dependency(group: "com.taptap.sdk", module: "tap-compliance",
-                    version: VersionCatalog.TapTapSdk),
-                new AndroidGradleProjectConfig.Dependency(group: "com.taptap.sdk", module: "tap-moment-unity",
-                    version: VersionCatalog.TapTapSdk),
-                new AndroidGradleProjectConfig.Dependency(group: "com.taptap.sdk", module: "tap-review-unity",
+                new AndroidGradleProjectConfig.Dependency(group: "com.taptap.sdk", module: "tap-core",
                     version: VersionCatalog.TapTapSdk),
+                new AndroidGradleProjectConfig.Dependency(group: "com.taptap.sdk", module: "tap-login",
+                    version: VersionCatalog.TapTapSdk)
             };
+
+            var regionType = configModel?.region_type ?? string.Empty;
+            if (!"cn".Equals(regionType.ToLower())) return dependencies;
+            
+            dependencies.Add(new AndroidGradleProjectConfig.Dependency(group: "com.taptap.sdk", module: "tap-compliance",
+                version: VersionCatalog.TapTapSdk));
+            dependencies.Add(new AndroidGradleProjectConfig.Dependency(group: "com.taptap.sdk", module: "tap-moment",
+                version: VersionCatalog.TapTapSdk));
+            dependencies.Add(new AndroidGradleProjectConfig.Dependency(group: "com.taptap.sdk", module: "tap-review",
+                version: VersionCatalog.TapTapSdk));
+            dependencies.Add(new AndroidGradleProjectConfig.Dependency(group: "com.taptap.sdk", module: "tap-license",
+                version: VersionCatalog.TapTapSdk));
+            dependencies.Add(new AndroidGradleProjectConfig.Dependency(group: "com.taptap.sdk", module: "tap-update",
+                version: VersionCatalog.TapTapSdk));
+
+            return dependencies;
         }
     }
 }

package/License/Runtime/Public/TapTapLicense.cs

@@ -7,7 +7,7 @@ using TapSDK.Core;
 namespace TapSDK.License {
     public class TapTapLicense {
 
-        public static readonly string Version = "4.8.1-beta.1";
+        public static readonly string Version = "4.8.1-beta.6";
         
         static readonly ITapLicenseBridge license;
 

package/License/link.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 98ba0549bd87e42adb7c14f67d7f93f5
+guid: 7b0d96962d32d4b4387427f48e51f795
 TextScriptImporter:
   externalObjects: {}
   userData: 

package/Login/Runtime/Public/TapTapLogin.cs

@@ -7,7 +7,7 @@ namespace TapSDK.Login
     public class TapTapLogin
     {
 
-        public static readonly string Version = "4.8.1-beta.1";
+        public static readonly string Version = "4.8.1-beta.6";
 
         public const string TAP_LOGIN_SCOPE_BASIC_INFO = "basic_info";
         public const string TAP_LOGIN_SCOPE_PUBLIC_PROFILE = "public_profile";

package/Login/link.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cafa5387310034a04bfd0ae65d3ab889
+guid: 3ef73b7c3a65b498db2a9b989fe5cdbd
 TextScriptImporter:
   externalObjects: {}
   userData: 

package/Moment/Runtime/Public/TapTapMoment.cs

@@ -43,7 +43,7 @@ namespace TapSDK.Moment
     public class TapTapMoment
     {
 
-        public static readonly string Version = "4.8.1-beta.1";
+        public static readonly string Version = "4.8.1-beta.6";
 
         // 显示动态页面
         public static void open()

package/Moment/link.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 245cd7719b5d04f57bc06d51e61ebc4d
+guid: 0bae4058a83c848029166db44f3f92a4
 TextScriptImporter:
   externalObjects: {}
   userData: 

package/Plugins/Android/XDGBridgeTapTapWrapper_v7_7.0.0.aar.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 35d427313718444091a0787a7dbd3b80
+timeCreated: 1755683357

package/Plugins/Android.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2390deb30efe49ff9d11722dc3159bf3
+timeCreated: 1755683347

package/Plugins/iOS/TapTapSDKLoginAppDelegate.mm

@@ -0,0 +1,3 @@
+extern "C" void RegisterTapTapSDKLoginAppDelegateListener() {
+}
+

package/Plugins/iOS.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d14fcae99c07402d83590b8210cdfe87
+timeCreated: 1755771689

package/Plugins.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9845dae199564bed9db8b692223d241e
+timeCreated: 1755683341

package/Review/Runtime/Public/TapTapReview.cs

@@ -5,7 +5,7 @@ namespace TapSDK.Review
     public class TapTapReview
     {
 
-        public static readonly string Version = "4.8.1-beta.1";
+        public static readonly string Version = "4.8.1-beta.6";
 
         public static void OpenReview()
         {

package/Review/link.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0417e4be6612b4b44a96a98bc6d122e3
+guid: 7752cbc35bc514c6caa2f729bb6afd59
 TextScriptImporter:
   externalObjects: {}
   userData: 

package/Runtime/Internal/Mobile/XDGTapBridgeConstants.cs

@@ -0,0 +1,33 @@
+namespace XD.SDK.Tap.Internal.Mobile
+{
+    public class XDGTapBridgeConstants
+    {
+        public static class Moment
+        {
+            public const string BridgeName = "XDGBridgeMoment";
+            public const string ServiceName = "com.xd.sdk.taptap.bridge.moment.BridgeMoment";
+            public const string ServiceImpl = "com.xd.sdk.taptap.bridge.moment.BridgeMomentImpl";
+        }
+
+        public static class Review
+        {
+            public const string BridgeName = "XDGBridgeReview";
+            public const string ServiceName = "com.xd.sdk.taptap.bridge.review.BridgeReview";
+            public const string ServiceImpl = "com.xd.sdk.taptap.bridge.review.BridgeReviewImpl";
+        }
+
+        public static class Update
+        {
+            public const string BridgeName = "XDGBridgeUpdate";
+            public const string ServiceName = "com.xd.sdk.taptap.bridge.update.BridgeUpdate";
+            public const string ServiceImpl = "com.xd.sdk.taptap.bridge.update.BridgeUpdateImpl";
+        }
+        
+        public static class License
+        {
+            public const string BridgeName = "XDGBridgeLicense";
+            public const string ServiceName = "com.xd.sdk.taptap.bridge.license.BridgeLicense";
+            public const string ServiceImpl = "com.xd.sdk.taptap.bridge.license.BridgeLicenseImpl";
+        }
+    }
+}

package/Runtime/Internal/Mobile/XDGTapBridgeConstants.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 54b562e03d1c4271aa967105f5c6b51c
+timeCreated: 1755672710

package/Runtime/Internal/Mobile/XDGTapSDKInternalImpl.cs

@@ -0,0 +1,301 @@
+#if UNITY_IOS || UNITY_ANDROID
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+#if UNITY_ANDROID || UNITY_EDITOR || UNITY_STANDALONE
+using TapSDK.License;
+#endif
+using TapSDK.Moment;
+using UnityEngine;
+using XD.SDK.Common.Internal.Mobile.Bridge;
+using XD.SDK.Tap.Public;
+using XD.SDK.Common;
+using XD.SDK.Common.Internal;
+
+namespace XD.SDK.Tap.Internal.Mobile
+{
+    public class XDGTapSDKInternalImpl : IXDGTapSDK
+    {
+        private static XDGTapSDKInternalImpl _instance;
+
+        private static readonly object LockObj = new object();
+
+        public static XDGTapSDKInternalImpl Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    lock (LockObj)
+                    {
+                        if (_instance == null)
+                        {
+                            _instance = new XDGTapSDKInternalImpl();
+                        }
+                    }
+                }
+
+                return _instance;
+            }
+        }
+
+        private XDGTapSDKInternalImpl()
+        {
+            EngineBridge.GetInstance().Register(XDGTapBridgeConstants.Moment.ServiceName, XDGTapBridgeConstants.Moment.ServiceImpl);
+            EngineBridge.GetInstance().Register(XDGTapBridgeConstants.Review.ServiceName, XDGTapBridgeConstants.Review.ServiceImpl);
+            EngineBridge.GetInstance().Register(XDGTapBridgeConstants.Update.ServiceName, XDGTapBridgeConstants.Update.ServiceImpl);
+            EngineBridge.GetInstance().Register(XDGTapBridgeConstants.License.ServiceName, XDGTapBridgeConstants.License.ServiceImpl);
+        }
+
+        public void SetMomentCallback(Action<int, string> callback)
+        {
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.Moment.BridgeName)
+                .Method("setCallback")
+                .Callback(true)
+                .OnceTime(false)
+                .CommandBuilder();
+
+            EngineBridge.GetInstance().CallHandler(command, result =>
+            {
+                if (!XDGTool.CheckResultSuccess(result))
+                {
+                    return;
+                }
+
+                var dic = XDGJson.Deserialize(result.content) as Dictionary<string, object>;
+                var code = XDDictionary.GetValue<int>(dic, "code");
+                var msg = XDDictionary.GetValue<string>(dic, "msg");
+                callback?.Invoke(code, msg);
+            });
+        }
+
+        public void MomentOpen()
+        {
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.Moment.BridgeName)
+                .Method("open")
+                .Callback(false)
+                .OnceTime(true)
+                .CommandBuilder();
+            EngineBridge.GetInstance().CallHandler(command);
+        }
+
+        public void MomentOpenScene(string sceneId)
+        {
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.Moment.BridgeName)
+                .Method("openScene")
+                .Args("openScene", sceneId)
+                .Callback(false)
+                .OnceTime(true)
+                .CommandBuilder();
+            EngineBridge.GetInstance().CallHandler(command);
+        }
+
+        public void MomentFetchNotification()
+        {
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.Moment.BridgeName)
+                .Method("fetchNotification")
+                .Callback(false)
+                .OnceTime(true)
+                .CommandBuilder();
+            EngineBridge.GetInstance().CallHandler(command);
+        }
+
+        public void MomentClose(string title, string content)
+        {
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.Moment.BridgeName)
+                .Method("closeWithTitle")
+                .Args("closeWithTitle", title)
+                .Args("content", content)
+                .Callback(false)
+                .OnceTime(true)
+                .CommandBuilder();
+            EngineBridge.GetInstance().CallHandler(command);
+        }
+
+        public void MomentClose()
+        {
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.Moment.BridgeName)
+                .Method("close")
+                .Callback(false)
+                .OnceTime(true)
+                .CommandBuilder();
+            EngineBridge.GetInstance().CallHandler(command);
+        }
+
+        public void MomentPublish(PublishMetaData metaData)
+        {
+            var json = JsonConvert.SerializeObject(metaData);
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.Moment.BridgeName)
+                .Method("publish")
+                .Args("publish", json)
+                .Callback(false)
+                .OnceTime(true)
+                .CommandBuilder();
+            EngineBridge.GetInstance().CallHandler(command);
+        }
+
+#if UNITY_ANDROID || UNITY_EDITOR || UNITY_STANDALONE
+        public void RegisterLicenseCallback(ITapLicenseCallback callback)
+        {
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.License.BridgeName)
+                .Method("registerLicenseCallback")
+                .Callback(true)
+                .OnceTime(false)
+                .CommandBuilder();
+            EngineBridge.GetInstance().CallHandler(command, result =>
+            {
+                var xdgError = result.Parse2XDGError();
+                if (xdgError != null)
+                {
+                    callback.OnLicenseFailed();
+                    return;
+                }
+
+                var dic = XDGJson.Deserialize(result.content) as Dictionary<string, object>;
+                if (XDDictionary.GetValue<bool>(dic, "success"))
+                {
+                    callback.OnLicenseSuccess();
+                }
+                else
+                {
+                    callback.OnLicenseFailed();
+                }
+            });
+        }
+
+        public void RegisterDLCCallback(ITapDlcCallback callback)
+        {
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.License.BridgeName)
+                .Method("registerDLCCallback")
+                .Callback(true)
+                .OnceTime(false)
+                .CommandBuilder();
+
+            EngineBridge.GetInstance().CallHandler(command, result =>
+            {
+                var xdgError = result.Parse2XDGError();
+                if (xdgError != null)
+                {
+                    Debug.Log($"[TapLicense] RegisterDLCCallback Error:{xdgError.ToJson()} ");
+                    return;
+                }
+
+                var dic = XDGJson.Deserialize(result.content) as Dictionary<string, object>;
+                if (dic?.ContainsKey("purchaseResult") == true)
+                {
+                    var purchaseResult = XDDictionary.GetValue<Dictionary<string, object>>(dic, "purchaseResult");
+                    var skuId = XDDictionary.GetValue<string>(purchaseResult, "skuId");
+                    var status = XDDictionary.GetValue<int>(purchaseResult, "status");
+                    callback.OnOrderCallBack(skuId, (TapLicensePurchasedCode)status);
+                    return;
+                }
+
+                if (dic?.ContainsKey("queryResult") != true) return;
+
+                var queryResult = XDDictionary.GetValue<Dictionary<string, object>>(dic, "queryResult");
+                var code = XDDictionary.GetValue<int>(queryResult, "resultCode");
+                var list = XDDictionary.GetValue<Dictionary<string, object>>(queryResult, "resultList");
+                callback.OnQueryCallBack((TapLicenseQueryCode)code, list);
+            });
+        }
+
+        public void CheckLicense(bool force = false)
+        {
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.License.BridgeName)
+                .Method("checkLicense")
+                .Args("forceCheck", force)
+                .Callback(true)
+                .OnceTime(true)
+                .CommandBuilder();
+
+            EngineBridge.GetInstance().CallHandler(command);
+        }
+
+
+        public void QueryDLC(string[] dlcList)
+        {
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.License.BridgeName)
+                .Method("queryDLC")
+                .Args("skuList", dlcList.ToList())
+                .Callback(false)
+                .OnceTime(true)
+                .CommandBuilder();
+
+            EngineBridge.GetInstance().CallHandler(command);
+        }
+
+        public void PurchaseDLC(string dlc)
+        {
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.License.BridgeName)
+                .Method("purchaseDLC")
+                .Args("skuId", dlc)
+                .Callback(false)
+                .OnceTime(true)
+                .CommandBuilder();
+
+            EngineBridge.GetInstance().CallHandler(command);
+        }
+#endif
+        public void OpenReview()
+        {
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.Review.BridgeName)
+                .Method("openReview")
+                .Callback(false)
+                .OnceTime(true)
+                .CommandBuilder();
+            EngineBridge.GetInstance().CallHandler(command);
+        }
+
+        public void UpdateGame(Action action)
+        {
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.Update.BridgeName)
+                .Method("updateGame")
+                .Callback(true)
+                .OnceTime(false)
+                .CommandBuilder();
+
+            EngineBridge.GetInstance().CallHandler(command, result =>
+            {
+                if (!XDGTool.CheckResultSuccess(result))
+                {
+                    return;
+                }
+
+                var dic = XDGJson.Deserialize(result.content) as Dictionary<string, object>;
+                var isCancel = XDDictionary.GetValue<bool>(dic, "cancel");
+                if (isCancel)
+                {
+                    action?.Invoke();
+                }
+            });
+        }
+
+        public void CheckForceUpdate()
+        {
+            // 按照本项目桥接规则调用 Android 侧 Update 桥
+            var command = new Command.Builder()
+                .Service(XDGTapBridgeConstants.Update.BridgeName)
+                .Method("checkForceUpdate")
+                .Callback(false)
+                .OnceTime(true)
+                .CommandBuilder();
+            EngineBridge.GetInstance().CallHandler(command);
+        }
+    }
+}
+#endif