com.taptap.sdk.core 4.8.0-beta.1 → 4.8.1

package/Runtime/Internal/Utils/BridgeUtils.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Collections.Generic;
 using UnityEngine;
+using TapSDK.Core.Internal.Log;
 
 namespace TapSDK.Core.Internal.Utils {
     public static class BridgeUtils {
@@ -13,25 +14,25 @@ namespace TapSDK.Core.Internal.Utils {
             Application.platform == RuntimePlatform.LinuxPlayer;
 
         public static object CreateBridgeImplementation(Type interfaceType, string startWith) {
-            Debug.Log($"[TapTap] 开始查找实现类: interfaceType={interfaceType.FullName}, startWith={startWith}, 当前平台={Application.platform}");
+            TapLog.Log($"[TapTap] 开始查找实现类: interfaceType={interfaceType.FullName}, startWith={startWith}, 当前平台={Application.platform}");
             
             // 跳过初始化直接使用 TapLoom会在子线程被TapSDK.Core.BridgeCallback.Invoke 初始化
             TapLoom.Initialize();
             
             // 获取所有程序集
             var allAssemblies = AppDomain.CurrentDomain.GetAssemblies();
-            Debug.Log($"[TapTap] 已加载的程序集总数: {allAssemblies.Length}");
+            TapLog.Log($"[TapTap] 已加载的程序集总数: {allAssemblies.Length}");
             
             // 查找以 startWith 开头的程序集
             var matchingAssemblies = allAssemblies
                 .Where(assembly => assembly.GetName().FullName.StartsWith(startWith))
                 .ToList();
             
-            Debug.Log($"[TapTap] 找到匹配 '{startWith}' 的程序集数量: {matchingAssemblies.Count}");
+            TapLog.Log($"[TapTap] 找到匹配 '{startWith}' 的程序集数量: {matchingAssemblies.Count}");
             
             // 打印匹配的程序集名称
             foreach (var assembly in matchingAssemblies) {
-                Debug.Log($"[TapTap] 匹配的程序集: {assembly.GetName().FullName}");
+                TapLog.Log($"[TapTap] 匹配的程序集: {assembly.GetName().FullName}");
             }
             
             // 如果没有找到匹配的程序集，打印所有TapSDK相关的程序集
@@ -41,9 +42,9 @@ namespace TapSDK.Core.Internal.Utils {
                                       assembly.GetName().FullName.Contains("TapTap"))
                     .ToList();
                 
-                Debug.Log($"[TapTap] 未找到匹配的程序集，但找到 {tapAssemblies.Count} 个相关程序集:");
+                TapLog.Log($"[TapTap] 未找到匹配的程序集，但找到 {tapAssemblies.Count} 个相关程序集:");
                 foreach (var assembly in tapAssemblies) {
-                    Debug.Log($"[TapTap]  - {assembly.GetName().FullName}");
+                    TapLog.Log($"[TapTap]  - {assembly.GetName().FullName}");
                 }
             }
             
@@ -55,15 +56,15 @@ namespace TapSDK.Core.Internal.Utils {
                         .Where(type => type.IsClass && interfaceType.IsAssignableFrom(type))
                         .ToList();
                     
-                    Debug.Log($"[TapTap] 在程序集 {assembly.GetName().Name} 中找到 {types.Count} 个实现 {interfaceType.Name} 的类");
+                    TapLog.Log($"[TapTap] 在程序集 {assembly.GetName().Name} 中找到 {types.Count} 个实现 {interfaceType.Name} 的类");
                     
                     foreach (var type in types) {
-                        Debug.Log($"[TapTap]  - {type.FullName} (IsPublic: {type.IsPublic}, IsAbstract: {type.IsAbstract})");
+                        TapLog.Log($"[TapTap]  - {type.FullName} (IsPublic: {type.IsPublic}, IsAbstract: {type.IsAbstract})");
                         allCandidateTypes.Add(type);
                     }
                 }
                 catch (Exception ex) {
-                    Debug.LogError($"[TapTap] 获取程序集 {assembly.GetName().Name} 中的类型时出错: {ex.Message}");
+                    TapLog.Error($"[TapTap] 获取程序集 {assembly.GetName().Name} 中的类型时出错: {ex.Message}");
                 }
             }
             
@@ -80,33 +81,33 @@ namespace TapSDK.Core.Internal.Utils {
                     })
                     .SingleOrDefault(clazz => interfaceType.IsAssignableFrom(clazz) && clazz.IsClass);
                 
-                Debug.Log($"[TapTap] SingleOrDefault 查找结果: {(bridgeImplementationType != null ? bridgeImplementationType.FullName : "null")}");
+                TapLog.Log($"[TapTap] SingleOrDefault 查找结果: {(bridgeImplementationType != null ? bridgeImplementationType.FullName : "null")}");
                 
                 // 如果使用 SingleOrDefault 没找到，尝试使用 FirstOrDefault
                 if (bridgeImplementationType == null && allCandidateTypes.Count > 0) {
-                    Debug.Log($"[TapTap] SingleOrDefault 未找到实现，但有 {allCandidateTypes.Count} 个候选类型，尝试使用 FirstOrDefault");
+                    TapLog.Log($"[TapTap] SingleOrDefault 未找到实现，但有 {allCandidateTypes.Count} 个候选类型，尝试使用 FirstOrDefault");
                     bridgeImplementationType = allCandidateTypes.FirstOrDefault();
-                    Debug.Log($"[TapTap] FirstOrDefault 查找结果: {(bridgeImplementationType != null ? bridgeImplementationType.FullName : "null")}");
+                    TapLog.Log($"[TapTap] FirstOrDefault 查找结果: {(bridgeImplementationType != null ? bridgeImplementationType.FullName : "null")}");
                 }
                 
                 // 如果找到多个实现，可能是 SingleOrDefault 失败的原因
                 if (allCandidateTypes.Count > 1) {
-                    Debug.LogWarning($"[TapTap] 找到多个实现 {interfaceType.Name} 的类，这可能导致 SingleOrDefault 返回 null");
+                    TapLog.Warning($"[TapTap] 找到多个实现 {interfaceType.Name} 的类，这可能导致 SingleOrDefault 返回 null");
                     foreach (var type in allCandidateTypes) {
-                        Debug.LogWarning($"[TapTap]  - {type.FullName}");
+                        TapLog.Warning($"[TapTap]  - {type.FullName}");
                     }
                 }
             }
             catch (Exception ex) {
-                Debug.LogError($"[TapTap] 在查找实现类时发生异常: {ex.Message}\n{ex.StackTrace}");
+                TapLog.Error($"[TapTap] 在查找实现类时发生异常: {ex.Message}\n{ex.StackTrace}");
             }
             
             if (bridgeImplementationType == null) {
-                Debug.LogWarning($"[TapTap] TapSDK 无法为 {interfaceType} 找到平台 {Application.platform} 上的实现类。");
+                TapLog.Warning($"[TapTap] TapSDK 无法为 {interfaceType} 找到平台 {Application.platform} 上的实现类。");
                 
                 // 尝试在所有程序集中查找实现（不限制命名空间前缀）
                 if (matchingAssemblies.Count == 0) {
-                    Debug.Log("[TapTap] 尝试在所有程序集中查找实现...");
+                    TapLog.Log("[TapTap] 尝试在所有程序集中查找实现...");
                     List<Type> implementationsInAllAssemblies = new List<Type>();
                     
                     foreach (var assembly in allAssemblies) {
@@ -116,7 +117,7 @@ namespace TapSDK.Core.Internal.Utils {
                                 .ToList();
                             
                             if (types.Count > 0) {
-                                Debug.Log($"[TapTap] 在程序集 {assembly.GetName().Name} 中找到 {types.Count} 个实现");
+                                TapLog.Log($"[TapTap] 在程序集 {assembly.GetName().Name} 中找到 {types.Count} 个实现");
                                 implementationsInAllAssemblies.AddRange(types);
                             }
                         }
@@ -124,9 +125,9 @@ namespace TapSDK.Core.Internal.Utils {
                     }
                     
                     if (implementationsInAllAssemblies.Count > 0) {
-                        Debug.Log($"[TapTap] 在所有程序集中找到 {implementationsInAllAssemblies.Count} 个实现:");
+                        TapLog.Log($"[TapTap] 在所有程序集中找到 {implementationsInAllAssemblies.Count} 个实现:");
                         foreach (var type in implementationsInAllAssemblies) {
-                            Debug.Log($"[TapTap]  - {type.FullName} (在程序集 {type.Assembly.GetName().Name} 中)");
+                            TapLog.Log($"[TapTap]  - {type.FullName} (在程序集 {type.Assembly.GetName().Name} 中)");
                         }
                     }
                 }
@@ -135,11 +136,11 @@ namespace TapSDK.Core.Internal.Utils {
             }
             
             try {
-                Debug.Log($"[TapTap] 创建 {bridgeImplementationType.FullName} 的实例");
+                TapLog.Log($"[TapTap] 创建 {bridgeImplementationType.FullName} 的实例");
                 return Activator.CreateInstance(bridgeImplementationType);
             }
             catch (Exception ex) {
-                Debug.LogError($"[TapTap] 创建实例时出错: {ex.Message}");
+                TapLog.Error($"[TapTap] 创建实例时出错: {ex.Message}");
                 return null;
             }
         }

package/Runtime/Internal/Utils/EventManager.cs

@@ -10,7 +10,7 @@ namespace TapSDK.Core.Internal.Utils
         public const string OnApplicationQuit = "OnApplicationQuit";
 
         public const string OnComplianceUserChanged = "OnComplianceUserChanged";
-
+        public const string OnTapUserChanged = "OnTapUserChanged";
         public const string IsLaunchedFromTapTapPCFinished = "IsLaunchedFromTapTapPCFinished";
         private Dictionary<string, Action<object>> eventRegistries = new Dictionary<string, Action<object>>();
         

package/Runtime/Internal/Utils/ImageUtils.cs

@@ -6,6 +6,7 @@ using System.Text;
 using System.IO;
 using UnityEngine;
 using UnityEngine.Networking;
+using TapSDK.Core.Internal.Log;
 
 namespace TapSDK.Core.Internal.Utils {
     public class ImageUtils {
@@ -16,7 +17,7 @@ namespace TapSDK.Core.Internal.Utils {
 
         public static async Task<Texture> LoadImage(string url, int timeout = 30, bool useMemoryCache = true) {
             if (string.IsNullOrEmpty(url)) {
-                TapLogger.Warn(string.Format($"ImageUtils Fetch image is null! url is null or empty!"));
+                TapLog.Warning(string.Format($"ImageUtils Fetch image is null! url is null or empty!"));
                 return null;
             }
 
@@ -35,7 +36,7 @@ namespace TapSDK.Core.Internal.Utils {
 
                     return cachedImage;
                 } catch (Exception e) {
-                    TapLogger.Warn(e.Message);
+                    TapLog.Warning(e.Message);
                     try {
                         // 从网络加载
                         Texture2D newTex = await FetchImage(url, timeout);
@@ -49,7 +50,7 @@ namespace TapSDK.Core.Internal.Utils {
 
                         return newTex;
                     } catch (Exception ex) {
-                        TapLogger.Warn(ex.Message);
+                        TapLog.Warning(ex.Message);
                         return null;
                     }
                 }
@@ -69,7 +70,7 @@ namespace TapSDK.Core.Internal.Utils {
                 } else {
                     Texture2D texture = ((DownloadHandlerTexture)request.downloadHandler)?.texture;
                     if (texture == null) {
-                        TapLogger.Warn($"ImageUtils Fetch image is null! url: {url}");
+                        TapLog.Warning($"ImageUtils Fetch image is null! url: {url}");
                     }
                     return texture;
                 }

package/Runtime/Public/DataStorage.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Net.NetworkInformation;
 using System.Security.Cryptography;
 using System.Text;
+using TapSDK.Core.Internal.Log;
 using UnityEngine;
 
 namespace TapSDK.Core
@@ -16,7 +17,8 @@ namespace TapSDK.Core
         {
             string storageKey = GenerateStorageKey(key);
             SaveStringToCache(storageKey, value);
-            PlayerPrefs.SetString(storageKey, EncodeString(value));
+            string encodeValue = EncodeString(value);
+            PlayerPrefs.SetString(storageKey, encodeValue);
         }
 
         public static string LoadString(string key)
@@ -29,10 +31,12 @@ namespace TapSDK.Core
             }
             value = PlayerPrefs.HasKey(storageKey) ? DecodeString(PlayerPrefs.GetString(storageKey)) : null;
             // 尝试从本地获取旧版本数据
-            if (value == null){
+            if (value == null)
+            {
                 value = PlayerPrefs.HasKey(key) ? DecodeString(PlayerPrefs.GetString(key)) : null;
                 // 旧版本存在有效数据时，转储为新的 storageKey
-                if (value != null) {
+                if (value != null)
+                {
                     PlayerPrefs.SetString(storageKey, EncodeString(value));
                     PlayerPrefs.DeleteKey(key);
                 }
@@ -44,6 +48,15 @@ namespace TapSDK.Core
             return value;
         }
 
+        public static void RemoveCacheKey(string key)
+        {
+            if (!string.IsNullOrEmpty(key))
+            {
+                PlayerPrefs.DeleteKey(key);
+                PlayerPrefs.DeleteKey(GenerateStorageKey(key));
+            }
+        }
+
         private static void SaveStringToCache(string key, string value)
         {
             if (dataCache == null)
@@ -115,7 +128,7 @@ namespace TapSDK.Core
             }
             catch (Exception e)
             {
-                Debug.Log(e.Message);
+                TapLog.Log(e.Message);
                 return decryptString;
             }
         }

package/Runtime/Public/Log/TapLogger.cs

@@ -8,7 +8,7 @@ namespace TapSDK.Core {
         /// </summary>
         /// <value>The log delegate.</value>
         public static Action<TapLogLevel, string> LogDelegate {
-            get; set;
+            internal get; set;
         }
 
         public static void Debug(string log) {

package/Runtime/Public/TapTapEvent.cs

@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using TapSDK.Core.Internal;
 using UnityEngine;
 using System.Reflection;
+using TapSDK.Core.Internal.Log;
 
 namespace TapSDK.Core {
     public class TapTapEvent {
@@ -14,7 +15,7 @@ namespace TapSDK.Core {
             platformWrapper = PlatformTypeUtils.CreatePlatformImplementationObject(typeof(ITapEventPlatform),
                 "TapSDK.Core") as ITapEventPlatform;
             if(platformWrapper == null) {
-                Debug.LogError("PlatformWrapper is null");
+                TapLog.Error("PlatformWrapper is null");
             }
         }
 

package/Runtime/Public/TapTapSDK.cs

@@ -12,7 +12,7 @@ using System.ComponentModel;
 
 namespace TapSDK.Core {
     public class TapTapSDK {
-        public static readonly string Version = "4.8.0-beta.1";
+        public static readonly string Version = "4.8.1";
         
         public static string SDKPlatform = "TapSDK-Unity";
 

package/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/Standalone/Plugins/x86_64/taptap_api.dll.meta

@@ -11,34 +11,53 @@ PluginImporter:
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 0
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 1
+        Exclude Win: 0
+        Exclude Win64: 0
+        Exclude iOS: 1
+  - first:
+      Android: Android
+    second:
+      enabled: 0
+      settings:
+        CPU: ARMv7
   - first:
       Any: 
     second:
-      enabled: 1
+      enabled: 0
       settings: {}
   - first:
       Editor: Editor
     second:
-      enabled: 0
+      enabled: 1
       settings:
         CPU: x86_64
         DefaultValueInitialized: true
+        OS: Windows
   - first:
       Standalone: Linux64
     second:
-      enabled: 1
+      enabled: 0
       settings:
-        CPU: x86_64
+        CPU: None
   - first:
       Standalone: OSXUniversal
     second:
       enabled: 0
       settings:
-        CPU: x86_64
+        CPU: None
   - first:
       Standalone: Win
     second:
-      enabled: 0
+      enabled: 1
       settings:
         CPU: None
   - first:
@@ -46,7 +65,16 @@ PluginImporter:
     second:
       enabled: 1
       settings:
+        CPU: x86_64
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 0
+      settings:
+        AddToEmbeddedBinaries: false
         CPU: AnyCPU
+        CompileFlags: 
+        FrameworkDependencies: 
   userData: 
   assetBundleName: 
   assetBundleVariant: 

package/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/Standalone/Runtime/Internal/DeviceInfo.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Net.NetworkInformation;
 using UnityEngine;
 using System.Diagnostics;
+using TapSDK.Core.Internal.Log;
 
 namespace TapSDK.Core.Standalone.Internal
 {
@@ -87,7 +88,7 @@ namespace TapSDK.Core.Standalone.Internal
       }
       catch (Exception e)
       {
-        UnityEngine.Debug.Log("GetMacAddress Exception " + e.Message);
+        TapLog.Log("GetMacAddress Exception " + e.Message);
       }
       macAddressList = $"[{string.Join(",", mac_addrs)}]";
       firstMacAddress = mac_addrs.Count > 0 ? mac_addrs[0].Replace("\"", "") : string.Empty;

package/Standalone/Runtime/Internal/EventSender.cs

@@ -183,7 +183,7 @@ namespace TapSDK.Core.Standalone.Internal
 
                 if (string.IsNullOrEmpty(GetEventCacheFileName()))
                 {
-                    Debug.LogError("EventFilePath is null or empty");
+                    TapLog.Error("EventFilePath is null or empty");
                     return;
                 }
 
@@ -198,7 +198,7 @@ namespace TapSDK.Core.Standalone.Internal
             }
             catch (Exception ex)
             {
-                Debug.LogError("SaveEvents Exception - " + ex.Message);
+                TapLog.Error("SaveEvents Exception - " + ex.Message);
             }
         }
 

package/Standalone/Runtime/Internal/Http/TapHttpUtils.cs

@@ -126,10 +126,6 @@ namespace TapSDK.Core.Standalone.Internal.Http
 
         public static void PrintRequest(HttpClient client, HttpRequestMessage request)
         {
-            if (TapLogger.LogDelegate == null)
-            {
-                return;
-            }
             if (client == null)
             {
                 return;
@@ -176,10 +172,6 @@ namespace TapSDK.Core.Standalone.Internal.Http
 
         public static void PrintResponse(HttpResponseMessage response)
         {
-            if (TapLogger.LogDelegate == null)
-            {
-                return;
-            }
             StringBuilder sb = new StringBuilder();
             sb.AppendLine("=== HTTP Response Start ===");
             sb.AppendLine($"URL: {response.RequestMessage.RequestUri}");

package/Standalone/Runtime/Internal/Openlog/TapOpenlogWrapper.cs

@@ -25,8 +25,8 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             "env": "local",
             "platform": "abc",
             "ua": "TapSDK-Android/3.28.0",
-            "client_id": "uZ8Yy6cSXVOR6AMRPj",
-            "client_token": "AVhR1Bu9qfLR1cGbZMAdZ5rzJSxfoEiQaFf1T2P7",
+            "client_id": "***",
+            "client_token": "***",
             "modules": [
                 "app_duration"
             ],

package/Standalone/Runtime/Internal/Prefs.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.IO;
 using UnityEngine;
 using TapSDK.Core;
+using TapSDK.Core.Internal.Log;
 
 namespace TapSDK.Core.Standalone.Internal {
     public class Prefs {
@@ -38,7 +39,7 @@ namespace TapSDK.Core.Standalone.Internal {
                     Dictionary<string, object> jsonData = Json.Deserialize(json) as Dictionary<string, object>;
                     data = new ConcurrentDictionary<string, object>(jsonData);
                 } catch (Exception e) {
-                    TapLogger.Error(e.Message);
+                    TapLog.Error(e.Message);
                     File.Delete(persistentFilePath);
                 }
             }
@@ -88,7 +89,7 @@ namespace TapSDK.Core.Standalone.Internal {
                     string json = Json.Serialize(dict);
                     File.WriteAllText(persistentFilePath, json);
                 } catch (Exception e) {
-                    TapLogger.Error(e.Message);
+                    TapLog.Error(e.Message);
                 }
             }
         }