com.taptap.sdk.core 4.6.2 → 4.6.3

package/Mobile/Editor/NativeDependencies.xml

@@ -4,12 +4,12 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.6.2"/>
+    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.6.3"/>
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod name="TapTapCoreSDK" version="~> 4.5.5" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapCoreSDK" version="~> 4.6.3" bitcodeEnabled="false" addToAllTargets="false"/>
   </iosPods>
 </dependencies>

package/Mobile/Runtime/IOSNativeWrapper.cs

@@ -11,69 +11,7 @@ namespace TapSDK.Core.Mobile {
 
 #if UNITY_IOS
     // 导入 C 函数
-        [DllImport("__Internal")]
-        private static extern void _TapTapSDKInitWithCoreAndOtherOptions(
-            string initOptionsJson,
-            string otherOptionsJson
-        );
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapSDKInit(
-            string initOptionsJson
-        );
         
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventSetUserID(string userID);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventSetUserIDWithProperties(string userID, string propertiesJson);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventClearUser();
-
-        [DllImport("__Internal")]
-        private static extern string _TapTapEventGetDeviceId();
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventLogEvent(string name, string propertiesJson);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventLogChargeEvent(string orderID, string productName, long amount, string currencyType, string paymentMethod, string propertiesJson);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventDeviceInitialize(string propertiesJson);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventDeviceUpdate(string propertiesJson);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventDeviceAdd(string propertiesJson);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventUserInitialize(string propertiesJson);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventUserUpdate(string propertiesJson);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventUserAdd(string propertiesJson);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventAddCommonProperty(string key, string value);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventAddCommon(string propertiesJson);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventClearCommonProperty(string key);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventClearCommonProperties(string[] keys, int count);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapEventClearAllCommonProperties();
-
-
         // 定义一个委托类型，匹配 Objective-C 中的 block 参数
         public delegate string DynamicPropertiesCalculatorDelegate();
 
@@ -81,123 +19,9 @@ namespace TapSDK.Core.Mobile {
         [DllImport("__Internal")]
         private static extern void _TapTapEventRegisterDynamicProperties(DynamicPropertiesCalculatorDelegate callback);
 
-
-        // 插入 UA
-        [DllImport("__Internal")]
-        private static extern void _TapTapSDKCoreAppendUA(string platform, string version);
-
-        [DllImport("__Internal")]
-        private static extern void _TapTapSDKCoreSetSDKArtifact(string artifact);
-
         [DllImport("__Internal")]
         private static extern void _TapTapSDKCoreSwitchToRND();
 
-        // 提供给 Unity 调用的 C# 方法
-        public static void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)
-        {
-            // 将其他选项转换为JSON字符串
-            string otherOptionsJson = ConvertOtherOptionsToJson(otherOptions);
-            // 调用C方法
-            _TapTapSDKInitWithCoreAndOtherOptions(
-                JsonUtility.ToJson(coreOption),
-                otherOptionsJson
-            );
-        }
-
-        // 提供给 Unity 调用的 C# 方法
-        public static void Init(TapTapSdkOptions coreOption)
-        {
-            // 调用C方法
-            _TapTapSDKInit(
-                JsonUtility.ToJson(coreOption)
-            );
-        }
-
-        public static void SetUserID(string userID)
-        {
-            _TapTapEventSetUserID(userID);
-        }
-
-        public static void SetUserID(string userID, string properties)
-        {
-            _TapTapEventSetUserIDWithProperties(userID, properties);
-        }
-
-        public static void ClearUser()
-        {
-            _TapTapEventClearUser();
-        }
-
-        public static string GetDeviceId()
-        {
-            return _TapTapEventGetDeviceId();
-        }
-
-        public static void LogEvent(string name, string properties)
-        {
-            _TapTapEventLogEvent(name, properties);
-        }
-
-        public static void LogChargeEvent(string orderID, string productName, long amount, string currencyType, string paymentMethod, string properties)
-        {
-            _TapTapEventLogChargeEvent(orderID, productName, amount, currencyType, paymentMethod, properties);
-        }
-
-        public static void DeviceInitialize(string properties)
-        {
-            _TapTapEventDeviceInitialize(properties);
-        }
-
-        public static void DeviceUpdate(string properties)
-        {
-            _TapTapEventDeviceUpdate(properties);
-        }
-
-        public static void DeviceAdd(string properties)
-        {
-            _TapTapEventDeviceAdd(properties);
-        }
-
-        public static void UserInitialize(string properties)
-        {
-            _TapTapEventUserInitialize(properties);
-        }
-
-        public static void UserUpdate(string properties)
-        {
-            _TapTapEventUserUpdate(properties);
-        }
-
-        public static void UserAdd(string properties)
-        {
-            _TapTapEventUserAdd(properties);
-        }
-
-        public static void AddCommonProperty(string key, string value)
-        {
-            _TapTapEventAddCommonProperty(key, value);
-        }
-
-        public static void AddCommon(string properties)
-        {
-            _TapTapEventAddCommon(properties);
-        }
-
-        public static void ClearCommonProperty(string key)
-        {
-            _TapTapEventClearCommonProperty(key);
-        }
-
-        public static void ClearCommonProperties(string[] keys)
-        {
-            _TapTapEventClearCommonProperties(keys, keys.Length);
-        }
-
-        public static void ClearAllCommonProperties()
-        {
-            _TapTapEventClearAllCommonProperties();
-        }
-
         public static void SetRND(){
             _TapTapSDKCoreSwitchToRND();
         }
@@ -221,53 +45,6 @@ namespace TapSDK.Core.Mobile {
             return null;
         }
 
-        private static string ConvertOtherOptionsToJson(TapTapSdkBaseOptions[] otherOptions)
-        {
-            if (otherOptions == null || otherOptions.Length == 0)
-            {
-                return "[]"; // 如果没有其他选项，则返回空数组的JSON表示
-            }
-
-            // 创建一个数组来存储每个选项的JSON字符串
-            string[] jsonOptions = new string[otherOptions.Length];
-            
-            for (int i = 0; i < otherOptions.Length; i++)
-            {
-                // 获取moduleName
-                string moduleName = otherOptions[i].moduleName;
-                
-                // 使用JsonUtility将每个选项对象转换为JSON字符串
-                string optionJson = JsonUtility.ToJson(otherOptions[i]);
-
-                // 将moduleName添加到JSON字符串中
-                optionJson = AddModuleNameToJson(optionJson, moduleName);
-
-                jsonOptions[i] = optionJson;
-            }
-
-            // 将所有JSON字符串连接成一个JSON数组
-            string jsonArray = "[" + string.Join(",", jsonOptions) + "]";
-            
-            return jsonArray;
-        }
-
-        // 辅助方法，用于将moduleName添加到JSON字符串中
-        private static string AddModuleNameToJson(string json, string moduleName)
-        {
-            // 在JSON字符串的开头添加moduleName字段
-            return "{\"moduleName\":\"" + moduleName + "\"," + json.TrimStart('{');
-        }
-
-        // 调用此方法来设置 xuaMap
-        public static void SetPlatformAndVersion(string platform, string version)
-        {
-            _TapTapSDKCoreAppendUA(platform, version);
-        }
-
-        public static void SetSDKArtifact(string artifact)
-        {
-            _TapTapSDKCoreSetSDKArtifact(artifact);
-        }
 #endif
     }
 }

package/Mobile/Runtime/TapEventMobile.cs

@@ -17,6 +17,11 @@ namespace TapSDK.Core.Mobile
             EngineBridgeInitializer.Initialize();
         }
 
+        public void Init(TapTapEventOptions eventOptions)
+        {
+            
+        }
+
         public void SetUserID(string userID)
         {
             Debug.Log("TapEventMobile SetUserID = " + userID);

package/Resources/TapMessage.prefab

@@ -133,7 +133,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0.5, y: 100}
-  m_SizeDelta: {x: 400, y: 102.44681}
+  m_SizeDelta: {x: 400, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6224477040733538127
 GameObject:
@@ -170,10 +170,10 @@ RectTransform:
   m_Father: {fileID: 3020249884784984160}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200, y: -51.223404}
-  m_SizeDelta: {x: 400, y: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -50}
+  m_SizeDelta: {x: 420, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6150942826548885810
 CanvasRenderer:
@@ -202,7 +202,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 9ab00e50019021946837a0c857f4cc5d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4b23b6267c9a94d64b94d18ac0f19754, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -219,7 +219,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6224477040733538127}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
   m_Name: 
@@ -233,8 +233,8 @@ MonoBehaviour:
   m_Spacing: 0
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 1
-  m_ChildControlHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
 --- !u!114 &8025106749851834532
@@ -250,7 +250,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
-  m_VerticalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &7966388593320536563
 GameObject:
   m_ObjectHideFlags: 0
@@ -284,10 +284,10 @@ RectTransform:
   m_Father: {fileID: 7445445916596797054}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 210, y: -50}
+  m_SizeDelta: {x: 330, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6511217540227465427
 CanvasRenderer:
@@ -318,7 +318,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 0

package/Runtime/Internal/Platform/ITapEventPlatform.cs

@@ -2,6 +2,9 @@
 
 namespace TapSDK.Core.Internal {
     public interface ITapEventPlatform {
+        
+        void Init(TapTapEventOptions eventOptions);
+
         void SetUserID(string userID);
         
         void SetUserID(string userID, string properties);

package/Runtime/Internal/Utils/TapLoom.cs

@@ -41,7 +41,7 @@ namespace TapSDK.Core.Internal.Utils
                 if (!Application.isPlaying)
                     return;
                 initialized = true;
-                var g = new GameObject("Loom");
+                var g = new GameObject("TapLoom");
                 DontDestroyOnLoad(g);
                 _current = g.AddComponent<TapLoom>();
             }

package/Runtime/Public/TapTapEvent.cs

@@ -18,7 +18,13 @@ namespace TapSDK.Core {
             }
         }
 
-        public static void SetUserID(string userID){
+        internal static void Init(TapTapEventOptions eventOptions)
+        {
+            platformWrapper.Init(eventOptions);
+        }
+
+        public static void SetUserID(string userID)
+        {
             platformWrapper?.SetUserID(userID);
         }
         

package/Runtime/Public/TapTapSDK.cs

@@ -12,11 +12,12 @@ using System.ComponentModel;
 
 namespace TapSDK.Core {
     public class TapTapSDK {
-        public static readonly string Version = "4.6.2";
+        public static readonly string Version = "4.6.3";
         
         public static string SDKPlatform = "TapSDK-Unity";
 
         public static TapTapSdkOptions taptapSdkOptions;
+
         private static ITapCorePlatform platformWrapper;
 
         private static bool disableDurationStatistics;
@@ -33,60 +34,99 @@ namespace TapSDK.Core {
                 "TapSDK.Core") as ITapCorePlatform;
         }
 
-        public static void Init(TapTapSdkOptions coreOption) {
+        public static void Init(TapTapSdkOptions coreOption)
+        {
             if (coreOption == null)
                 throw new ArgumentException("[TapSDK] options is null!");
             TapTapSDK.taptapSdkOptions = coreOption;
             TapLog.Enabled = coreOption.enableLog;
             platformWrapper?.Init(coreOption);
-             // 初始化各个模块
-            
+            // 初始化各个模块
+
             Type[] initTaskTypes = GetInitTypeList();
-            if (initTaskTypes != null) {
+            if (initTaskTypes != null)
+            {
                 List<IInitTask> initTasks = new List<IInitTask>();
-                foreach (Type initTaskType in initTaskTypes) {
+                foreach (Type initTaskType in initTaskTypes)
+                {
                     initTasks.Add(Activator.CreateInstance(initTaskType) as IInitTask);
                 }
                 initTasks = initTasks.OrderBy(task => task.Order).ToList();
-                foreach (IInitTask task in initTasks) {
+                foreach (IInitTask task in initTasks)
+                {
                     TapLogger.Debug($"Init: {task.GetType().Name}");
                     task.Init(coreOption);
                 }
             }
+            TapTapEvent.Init(HandleEventOptions(coreOption));
+            
         }
 
-        public static void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions){
+        public static void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)
+        {
             if (coreOption == null)
                 throw new ArgumentException("[TapSDK] options is null!");
-            long startTime = DateTime.Now.Ticks;
+
             TapTapSDK.taptapSdkOptions = coreOption;
             TapLog.Enabled = coreOption.enableLog;
-            long startCore = DateTime.Now.Ticks;
-            platformWrapper?.Init(coreOption,otherOptions);
-            long costCore = DateTime.Now.Ticks - startCore;
-            // TapLog.Log($"Init core cost time: {costCore / 10000}ms");
+            platformWrapper?.Init(coreOption, otherOptions);
+
 
             Type[] initTaskTypes = GetInitTypeList();
-            if (initTaskTypes != null) {
+            if (initTaskTypes != null)
+            {
                 List<IInitTask> initTasks = new List<IInitTask>();
-                foreach (Type initTaskType in initTaskTypes) {
+                foreach (Type initTaskType in initTaskTypes)
+                {
                     initTasks.Add(Activator.CreateInstance(initTaskType) as IInitTask);
                 }
                 initTasks = initTasks.OrderBy(task => task.Order).ToList();
-                foreach (IInitTask task in initTasks) {
+                foreach (IInitTask task in initTasks)
+                {
                     TapLog.Log($"Init: {task.GetType().Name}");
-                    long startModule = DateTime.Now.Ticks;
-                    task.Init(coreOption,otherOptions);
-                    long costModule = DateTime.Now.Ticks - startModule;
-                    // TapLog.Log($"Init {task.GetType().Name} cost time: {costModule / 10000}ms");
+                    task.Init(coreOption, otherOptions);
                 }
             }
-            long costTime = DateTime.Now.Ticks - startTime;
-            // TapLog.Log($"Init cost time: {costTime / 10000}ms");
+            TapTapEvent.Init(HandleEventOptions(coreOption, otherOptions));
+        }
+
+        /// <summary>
+        /// 通过初始化属性设置 TapEvent 属性，兼容旧版本
+        /// </summary>
+        /// <param name="coreOption"></param>
+        /// <param name="otherOptions"></param>
+        /// <returns>TapEvent 属性</returns>
+        private static TapTapEventOptions HandleEventOptions(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions = null)
+        {
+            TapTapEventOptions tapEventOptions = null;
+            if (otherOptions != null && otherOptions.Length > 0)
+            {
+                foreach (TapTapSdkBaseOptions otherOption in otherOptions)
+                {
+                    if (otherOption is TapTapEventOptions option)
+                    {
+                        tapEventOptions = option;
+                    }
+                }
+            }
+            if (tapEventOptions == null)
+            {
+                tapEventOptions = new TapTapEventOptions();
+                if (coreOption != null)
+                {
+                    tapEventOptions.channel = coreOption.channel;
+                    tapEventOptions.disableAutoLogDeviceLogin = coreOption.disableAutoLogDeviceLogin;
+                    tapEventOptions.enableAutoIAPEvent = coreOption.enableAutoIAPEvent;
+                    tapEventOptions.overrideBuiltInParameters = coreOption.overrideBuiltInParameters;
+                    tapEventOptions.propertiesJson = coreOption.propertiesJson;
+                }
+            }
+            return tapEventOptions;
         }
 
         // UpdateLanguage 方法
-        public static void UpdateLanguage(TapTapLanguageType language){
+        public static void UpdateLanguage(TapTapLanguageType language)
+        {
             platformWrapper?.UpdateLanguage(language);
         }
         

package/Runtime/Public/TapTapSdkOptions.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using Newtonsoft.Json;
+using System;
 
 namespace TapSDK.Core
 {
@@ -59,6 +60,7 @@ namespace TapSDK.Core
         /// <summary>
         /// 渠道，如 AppStore、GooglePlay
         /// </summary>
+        [Obsolete("该属性已废弃，请在 TapTapEventOptions 设置对应属性")]
         public string channel = null;
         /// <summary>
         /// 游戏版本号，如果不传则默认读取应用的版本号
@@ -67,6 +69,7 @@ namespace TapSDK.Core
         /// <summary>
         /// 初始化时传入的自定义参数，会在初始化时上报到 device_login 事件
         /// </summary>
+        [Obsolete("该属性已废弃，请在 TapTapEventOptions 设置对应属性")] 
         public string propertiesJson = null;
         /// <summary>
         /// CAID，仅国内 iOS
@@ -75,6 +78,7 @@ namespace TapSDK.Core
         /// <summary>
         /// 是否能够覆盖内置参数，默认为 false
         /// </summary>
+        [Obsolete("该属性已废弃，请在 TapTapEventOptions 设置对应属性")] 
         public bool overrideBuiltInParameters = false;
         /// <summary>
         /// 是否开启广告商 ID 收集，默认为 false
@@ -83,6 +87,7 @@ namespace TapSDK.Core
         /// <summary>
         /// 是否开启自动上报 IAP 事件
         /// </summary>
+        [Obsolete("该属性已废弃，请在 TapTapEventOptions 设置对应属性")]
         public bool enableAutoIAPEvent = true;
         /// <summary>
         /// OAID证书, 仅 Android，用于上报 OAID 仅 [TapTapRegion.CN] 生效
@@ -101,13 +106,14 @@ namespace TapSDK.Core
         /// <summary>
         /// 是否即用禁用自动上报设备登录事件
         /// </summary>
+        [Obsolete("该属性已废弃，请在 TapTapEventOptions 设置对应属性")]
         public bool disableAutoLogDeviceLogin = false;
 
         /// <summary>
         /// 屏幕方向：0-竖屏 1-横屏
         /// </summary>
         public int screenOrientation = 0;
-  
+
         [JsonProperty("moduleName")]
         private string _moduleName = "TapTapSDKCore";
         [JsonIgnore]
@@ -116,4 +122,46 @@ namespace TapSDK.Core
             get => _moduleName;
         }
     }
+
+    public class TapTapEventOptions : TapTapSdkBaseOptions
+    {
+
+        /// <summary>
+        /// 是否启用 TapTap Event 
+        /// </summary>
+        public bool enableTapTapEvent = true;
+
+        /// <summary>
+        /// 渠道，如 AppStore、GooglePlay
+        /// </summary>
+        public string channel = null;
+
+        /// <summary>
+        /// 初始化时传入的自定义参数，会在初始化时上报到 device_login 事件
+        /// </summary>
+        public string propertiesJson = null;
+
+         /// <summary>
+        /// 是否能够覆盖内置参数，默认为 false
+        /// </summary>
+        public bool overrideBuiltInParameters = false;
+
+        /// <summary>
+        /// 是否开启自动上报 IAP 事件
+        /// </summary>
+        public bool enableAutoIAPEvent = true;
+
+        /// <summary>
+        /// 是否即用禁用自动上报设备登录事件
+        /// </summary>
+        public bool disableAutoLogDeviceLogin = false;
+
+        [JsonProperty("moduleName")]
+        private string _moduleName = "TapTapEvent";
+        [JsonIgnore]
+        public string moduleName
+        {
+            get => _moduleName;
+        }
+    }
 }

package/Standalone/Runtime/Internal/PlayRecorder.cs

@@ -46,7 +46,7 @@ namespace TapSDK.Core.Standalone.Internal {
                 Dictionary<string, object> props = new Dictionary<string, object> {
                     { "duration", duration }
                 };
-                TapCoreStandalone.Tracker.TrackEvent("play_game", props, true);
+                TapEventStandalone.Tracker?.TrackEvent("play_game", props, true);
             }
         }
     }