com.xd.sdk.tap 4.8.1-xd.2 → 4.9.0-xd.1

package/Compliance/Mobile/Editor/iOS/BuidPostProcessor.cs

@@ -32,7 +32,7 @@ public class BuildPostProcessor
                 "com.taptap.sdk.compliance",
                 "Compliance",
                 new[] {"TapTapComplianceResource.bundle"},
-                target, projPath, proj, "TapTapComplianceSDK"))
+                target, projPath, proj))
             {
                 Debug.Log("TapCompliance add Bundle Success!");
                 return;

package/Compliance/Mobile/Runtime/ComplianceMobileBridge.cs

@@ -78,9 +78,31 @@ namespace TapSDK.Compliance.Mobile.Runtime
                         ComplianceCallbackData callbackData = new ComplianceCallbackData();
 #if UNITY_IOS
                     result.content = RemoveFontColor(result.content);
+
+                    // 修复：在RemoveFontColor之后再次检查content，防止null导致反序列化失败
+                    if (string.IsNullOrEmpty(result.content))
+                    {
+                        TapLog.Error("[Unity:Compliance] callback content is null or empty after RemoveFontColor");
+                        callbackList.ForEach((item) =>
+                        {
+                            item?.Invoke(-1, "[Unity:Compliance] callback content is empty after processing");
+                        });
+                        return;
+                    }
+
                     var callbackOriginData = JsonConvert.DeserializeObject<ComplianceCallbackOriginData>(result.content);
                     callbackData.code = callbackOriginData.code;
-                    callbackData.extras = JsonConvert.DeserializeObject<MsgExtraParams>(callbackOriginData.extras);
+
+                    // 修复：检查extras是否为null或空，防止反序列化失败
+                    if (!string.IsNullOrEmpty(callbackOriginData.extras))
+                    {
+                        callbackData.extras = JsonConvert.DeserializeObject<MsgExtraParams>(callbackOriginData.extras);
+                    }
+                    else
+                    {
+                        TapLog.Log("[Unity:Compliance] callback extras is null or empty, using default MsgExtraParams");
+                        callbackData.extras = new MsgExtraParams();
+                    }
 #else
                         callbackData = JsonConvert.DeserializeObject<ComplianceCallbackData>(result.content);
 #endif

package/Compliance/Runtime/Public/TapTapCompliance.cs

@@ -10,7 +10,7 @@ namespace TapSDK.Compliance
     public static class TapTapCompliance
     {
 
-        public static readonly string Version = "4.8.1";
+        public static readonly string Version = "4.9.0";
 
         public static void RegisterComplianceCallback(Action<int, string> callback)
         {

package/Compliance/package.json

@@ -0,0 +1,12 @@
+{
+    "name": "com.taptap.sdk.compliance",
+    "displayName": "TapTapSDK Compliance",
+    "description": "TapTapSDK Compliance",
+    "version": "4.9.0",
+    "unity": "2019.4",
+    "license": "MIT",
+    "dependencies": {
+        "com.taptap.sdk.core": "4.9.0",
+        "com.taptap.sdk.login": "4.9.0"
+    }
+}

package/{Core/link.xml.meta → Compliance/package.json.meta}

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

package/Core/Editor/TapSDKCoreCompile.cs

@@ -4,8 +4,14 @@ using System.Linq;
 using UnityEditor;
 using UnityEditor.PackageManager;
 using UnityEngine;
+using System.Diagnostics;
+using System.Text.RegularExpressions;
+
+
+
 #if UNITY_IOS
 using System;
+// using Google;
 using UnityEditor.iOS.Xcode;
 
 #endif
@@ -17,13 +23,13 @@ namespace TapSDK.Core.Editor
 #if UNITY_IOS
         public static string GetProjPath(string path)
         {
-            Debug.Log($"SDX , GetProjPath path:{path}");
+            UnityEngine.Debug.Log($"SDX , GetProjPath path:{path}");
             return PBXProject.GetPBXProjectPath(path);
         }
 
         public static PBXProject ParseProjPath(string path)
         {
-            Debug.Log($"SDX , ParseProjPath path:{path}");
+            UnityEngine.Debug.Log($"SDX , ParseProjPath path:{path}");
             var proj = new PBXProject();
             proj.ReadFromString(File.ReadAllText(path));
             return proj;
@@ -32,11 +38,11 @@ namespace TapSDK.Core.Editor
         public static string GetUnityFrameworkTarget(PBXProject proj)
         {
 #if UNITY_2019_3_OR_NEWER
-            Debug.Log("SDX , GetUnityFrameworkTarget UNITY_2019_3_OR_NEWER");
+            UnityEngine.Debug.Log("SDX , GetUnityFrameworkTarget UNITY_2019_3_OR_NEWER");
             string target = proj.GetUnityFrameworkTargetGuid();
             return target;
 #endif
-            Debug.Log("SDX , GetUnityFrameworkTarget");
+            UnityEngine.Debug.Log("SDX , GetUnityFrameworkTarget");
             var unityPhoneTarget = proj.TargetGuidByName("Unity-iPhone");
             return unityPhoneTarget;
         }
@@ -44,11 +50,11 @@ namespace TapSDK.Core.Editor
         public static string GetUnityTarget(PBXProject proj)
         {
 #if UNITY_2019_3_OR_NEWER
-            Debug.Log("SDX , GetUnityTarget UNITY_2019_3_OR_NEWER");
+            UnityEngine.Debug.Log("SDX , GetUnityTarget UNITY_2019_3_OR_NEWER");
             string target = proj.GetUnityMainTargetGuid();
             return target;
 #endif
-            Debug.Log("SDX , GetUnityTarget");
+            UnityEngine.Debug.Log("SDX , GetUnityTarget");
             var unityPhoneTarget = proj.TargetGuidByName("Unity-iPhone");
             return unityPhoneTarget;
         }
@@ -89,8 +95,8 @@ namespace TapSDK.Core.Editor
 
         public static bool HandlerIOSSetting(string path, string appDataPath, string resourceName,
             string modulePackageName,
-            string moduleName, string[] bundleNames, string target, string projPath, PBXProject proj, string podSpecName = "")
-        {
+            string moduleName, string[] bundleNames, string target, string projPath, PBXProject proj)
+        {          
             // TIPS: bundle 资源会被 XDSDK 脚本处理，这里直接屏蔽相关逻辑
             return true;
 
@@ -98,19 +104,19 @@ namespace TapSDK.Core.Editor
 
             var parentFolder = Directory.GetParent(appDataPath).FullName;
 
-            Debug.Log($"ProjectFolder path:{parentFolder}" + " resourcePath： " + resourcePath + " parentFolder: " + parentFolder);
+            UnityEngine.Debug.Log($"ProjectFolder path:{parentFolder}" + " resourcePath： " + resourcePath + " parentFolder: " + parentFolder);
 
             if (Directory.Exists(resourcePath))
             {
                 Directory.Delete(resourcePath, true);
             }
 
-            var podSpecPath = Path.Combine(path + "/Pods", podSpecName);
+            var podSpecPath = Path.Combine(path + "/Pods", "TapTapSDK");
             //使用 cocospod 远程依赖
-            if (podSpecName != null && podSpecName.Length > 0 && Directory.Exists(podSpecPath))
+            if (Directory.Exists(podSpecPath))
             {
-                resourcePath = Path.Combine(path + "/Pods", podSpecName + "/Frameworks");
-                Debug.Log($"Find {moduleName} use pods resourcePath:{resourcePath}");
+                resourcePath = Path.Combine(path + "/Pods", "TapTapSDK/Frameworks");
+                UnityEngine.Debug.Log($"Find {moduleName} use pods resourcePath:{resourcePath}");
             }
             else
             {
@@ -121,7 +127,7 @@ namespace TapSDK.Core.Editor
 
                 var localPackagePath = TapFileHelper.FilterFileByPrefix(parentFolder, moduleName);
 
-                Debug.Log($"Find {moduleName} path: remote = {remotePackagePath} asset = {assetLocalPackagePath} local = {localPackagePath}");
+                UnityEngine.Debug.Log($"Find {moduleName} path: remote = {remotePackagePath} asset = {assetLocalPackagePath} local = {localPackagePath}");
                 var tdsResourcePath = "";
 
                 if (!string.IsNullOrEmpty(remotePackagePath))
@@ -144,7 +150,7 @@ namespace TapSDK.Core.Editor
 
                 tdsResourcePath = $"{tdsResourcePath}/Plugins/iOS/Resource";
 
-                Debug.Log($"Find {moduleName} path:{tdsResourcePath}");
+                UnityEngine.Debug.Log($"Find {moduleName} path:{tdsResourcePath}");
 
                 if (!Directory.Exists(tdsResourcePath))
                 {
@@ -156,8 +162,11 @@ namespace TapSDK.Core.Editor
             foreach (var name in bundleNames)
             {
                 var relativePath = GetRelativePath(Path.Combine(resourcePath, name), path);
-                var fileGuid = proj.AddFile(relativePath, relativePath, PBXSourceTree.Source);
-                proj.AddFileToBuild(target, fileGuid);
+                if (!proj.ContainsFileByRealPath(relativePath))
+                {
+                    var fileGuid = proj.AddFile(relativePath, relativePath, PBXSourceTree.Source);
+                    proj.AddFileToBuild(target, fileGuid);
+                }
             }
 
             File.WriteAllText(projPath, proj.WriteToString());
@@ -173,7 +182,7 @@ namespace TapSDK.Core.Editor
             Uri aboslutePathUri = new Uri(absolutePath);
             Uri rootPathUri = new Uri(rootPath);
             var relateivePath = rootPathUri.MakeRelativeUri(aboslutePathUri).ToString();
-            Debug.LogFormat($"[TapSDKCoreCompile] GetRelativePath absolutePath:{absolutePath} rootPath:{rootPath} relateivePath:{relateivePath} ");
+            UnityEngine.Debug.LogFormat($"[TapSDKCoreCompile] GetRelativePath absolutePath:{absolutePath} rootPath:{rootPath} relateivePath:{relateivePath} ");
             return relateivePath;
         }
 
@@ -207,7 +216,7 @@ namespace TapSDK.Core.Editor
                     : macosXCodePlistPath;
             }
 
-            Debug.Log($"plist path:{plistPath}");
+            UnityEngine.Debug.Log($"plist path:{plistPath}");
 
             var plist = new PlistDocument();
             plist.ReadFromString(File.ReadAllText(plistPath));
@@ -224,16 +233,19 @@ namespace TapSDK.Core.Editor
             {
                 plistElementList = rootDic.CreateArray("LSApplicationQueriesSchemes");
             }
-            
+
             string listData = "";
-            foreach (var item in plistElementList.values) {
-                if ( item is PlistElementString ){
+            foreach (var item in plistElementList.values)
+            {
+                if (item is PlistElementString)
+                {
                     listData += item.AsString() + ";";
                 }
             }
             foreach (var t in items)
             {
-                if (!listData.Contains(t + ";")) {
+                if (!listData.Contains(t + ";"))
+                {
                     plistElementList.AddString(t);
                 }
             }
@@ -280,7 +292,7 @@ namespace TapSDK.Core.Editor
                 array2.AddString($"open-taptap-{taptapId}");
             }
 
-            Debug.Log("TapSDK change plist Success");
+            UnityEngine.Debug.Log("TapSDK change plist Success");
             File.WriteAllText(plistPath, plist.WriteToString());
             return true;
         }
@@ -295,6 +307,189 @@ namespace TapSDK.Core.Editor
             var dic = (Dictionary<string, object>)Plist.readPlist(infoPlistPath);
             return (from item in dic where item.Key.Equals(key) select (string)item.Value).FirstOrDefault();
         }
+
+        public static void ExecutePodCommand(string command, string workingDirectory)
+        {
+            string podPath = FindPodPath();
+            if (string.IsNullOrEmpty(podPath))
+            {
+                UnityEngine.Debug.LogError("[CocoaPods] search pod install path failed");
+                return;
+            }
+            UnityEngine.Debug.Log("[CocoaPods] search pod install path :" + podPath);
+            command = command.Replace("pod", podPath);
+            command = "export LANG=en_US.UTF-8 && " + command;
+            var process = new Process
+            {
+                StartInfo = new ProcessStartInfo
+                {
+                    FileName = "/bin/bash",
+                    Arguments = $"-c \"{command}\"",
+                    WorkingDirectory = workingDirectory,
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true,
+                    UseShellExecute = false,
+                    CreateNoWindow = true
+                }
+            };
+
+            process.Start();
+            process.WaitForExit();
+
+            string output = process.StandardOutput.ReadToEnd();
+            string error = process.StandardError.ReadToEnd();
+
+            if (!string.IsNullOrEmpty(output))
+                UnityEngine.Debug.Log($"[CocoaPods] Output: {output}");
+
+            if (!string.IsNullOrEmpty(error))
+                UnityEngine.Debug.LogError($"[CocoaPods] Error: {error}");
+
+            if (process.ExitCode == 0)
+                UnityEngine.Debug.Log($"[CocoaPods] Success: {command}");
+            else
+                UnityEngine.Debug.LogError($"[CocoaPods] Failed: {command} (Exit code: {process.ExitCode})");
+        }
+
+        private static string FindPodPath()
+        {
+            string whichResult = RunBashCommand("-l -c \"which pod\"");
+            whichResult = whichResult.Replace("\n", "");
+            if (!string.IsNullOrEmpty(whichResult) && File.Exists(whichResult))
+            {
+                UnityEngine.Debug.Log($"[PodFinder] Found pod at which result: {whichResult}");
+                return whichResult;
+            }
+
+            string[] CommonPaths = new string[]
+            {
+                "/usr/local/bin",
+                "/usr/bin",
+                "/opt/homebrew/bin"
+            };
+            // 1. 先在常见路径查找 pod
+            foreach (var path in CommonPaths)
+            {
+                string podPath = Path.Combine(path, "pod");
+                if (File.Exists(podPath))
+                {
+                    UnityEngine.Debug.Log($"[PodFinder] Found pod at common path: {podPath}");
+                    return podPath;
+                }
+            }
+            // 2. 如果没找到，执行 gem environment 查找
+            string gemEnvOutput = RunBashCommand("-l -c \"gem environment\"");
+
+            if (string.IsNullOrEmpty(gemEnvOutput))
+            {
+                UnityEngine.Debug.LogWarning("[PodFinder] gem environment output is empty.");
+                return null;
+            }
+
+            // 3. 解析 EXECUTABLE DIRECTORY
+            string execDir = ParseGemEnvironment(gemEnvOutput, @"EXECUTABLE DIRECTORY:\s*(.+)");
+            if (!string.IsNullOrEmpty(execDir))
+            {
+                string podPath = Path.Combine(execDir.Trim(), "pod");
+                if (File.Exists(podPath))
+                {
+                    UnityEngine.Debug.Log($"[PodFinder] Found pod via EXECUTABLE DIRECTORY: {podPath}");
+                    return podPath;
+                }
+            }
+
+            // 4. 解析 GEM PATHS，尝试从每个路径下的 bin 文件夹查找 pod
+            var gemPaths = ParseGemEnvironmentMultiple(gemEnvOutput, @"GEM PATHS:\s*((?:- .+\n)+)");
+            if (gemPaths != null)
+            {
+                foreach (var gemPath in gemPaths)
+                {
+                    // 一般 pod 会在 bin 文件夹或同级目录中
+                    string podPath1 = Path.Combine(gemPath.Trim(), "bin", "pod");
+                    string podPath2 = Path.Combine(gemPath.Trim(), "pod"); // 备选路径
+
+                    if (File.Exists(podPath1))
+                    {
+                        UnityEngine.Debug.Log($"[PodFinder] Found pod via GEM PATHS (bin): {podPath1}");
+                        return podPath1;
+                    }
+
+                    if (File.Exists(podPath2))
+                    {
+                        UnityEngine.Debug.Log($"[PodFinder] Found pod via GEM PATHS: {podPath2}");
+                        return podPath2;
+                    }
+                }
+            }
+
+            UnityEngine.Debug.LogWarning("[PodFinder] pod executable not found.");
+            return null;
+        }
+    
+        private static string RunBashCommand(string arguments)
+        {
+            try
+            {
+                using (var process = new Process())
+                {
+                    process.StartInfo.FileName = "/bin/bash";
+                    process.StartInfo.Arguments = arguments;
+                    process.StartInfo.RedirectStandardOutput = true;
+                    process.StartInfo.RedirectStandardError = true;
+                    process.StartInfo.UseShellExecute = false;
+                    process.StartInfo.CreateNoWindow = true;
+
+                    process.Start();
+                    string output = process.StandardOutput.ReadToEnd();
+                    string err = process.StandardError.ReadToEnd();
+                    process.WaitForExit();
+
+                    if (!string.IsNullOrEmpty(err))
+                    {
+                        UnityEngine.Debug.LogWarning($"[PodFinder] bash error: {err}");
+                    }
+
+                    return output;
+                }
+            }
+            catch (Exception e)
+            {
+                UnityEngine.Debug.LogError($"[PodFinder] Exception running bash command: {e}");
+                return null;
+            }
+        }
+
+        private static string ParseGemEnvironment(string input, string pattern)
+        {
+            var match = Regex.Match(input, pattern);
+            if (match.Success && match.Groups.Count > 1)
+            {
+                return match.Groups[1].Value.Trim();
+            }
+            return null;
+        }
+
+        private static string[] ParseGemEnvironmentMultiple(string input, string pattern)
+        {
+            var match = Regex.Match(input, pattern, RegexOptions.Multiline);
+            if (!match.Success || match.Groups.Count < 2) return null;
+
+            string block = match.Groups[1].Value;
+
+            // 每行格式是类似 "- /path/to/gem"
+            var lines = block.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
+            var paths = new System.Collections.Generic.List<string>();
+            foreach (var line in lines)
+            {
+                string trimmed = line.Trim();
+                if (trimmed.StartsWith("- "))
+                {
+                    paths.Add(trimmed.Substring(2).Trim());
+                }
+            }
+
+            return paths.ToArray();
+        }
 #endif
     }
 }

package/Core/Editor/TapSDKCoreIOSProcessor.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using System.Linq;
 using UnityEditor;
 # if UNITY_IOS
 using UnityEditor.Callbacks;
@@ -29,8 +30,8 @@ namespace TapSDK.Core.Editor
                 return;
             }
 
-            proj.AddBuildProperty(target, "OTHER_LDFLAGS", "-ObjC");
-            proj.AddBuildProperty(unityFrameworkTarget, "OTHER_LDFLAGS", "-ObjC");
+            // proj.AddBuildProperty(target, "OTHER_LDFLAGS", "-ObjC");
+            // proj.AddBuildProperty(unityFrameworkTarget, "OTHER_LDFLAGS", "-ObjC");
 
             proj.SetBuildProperty(target, "ENABLE_BITCODE", "NO");
             proj.SetBuildProperty(target, "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES", "YES");
@@ -38,7 +39,9 @@ namespace TapSDK.Core.Editor
             proj.SetBuildProperty(target, "CLANG_ENABLE_MODULES", "YES");
 
             proj.SetBuildProperty(unityFrameworkTarget, "ENABLE_BITCODE", "NO");
-            proj.SetBuildProperty(unityFrameworkTarget, "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES", "NO");
+            proj.SetBuildProperty(unityFrameworkTarget, "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES", "YES");
+            proj.SetBuildProperty(unityFrameworkTarget, "BUILD_LIBRARY_FOR_DISTRIBUTION", "YES");
+
             proj.SetBuildProperty(unityFrameworkTarget, "SWIFT_VERSION", "5.0");
             proj.SetBuildProperty(unityFrameworkTarget, "CLANG_ENABLE_MODULES", "YES");
 
@@ -47,7 +50,6 @@ namespace TapSDK.Core.Editor
             proj.AddFrameworkToProject(unityFrameworkTarget, "Security.framework", false);
             proj.AddFrameworkToProject(unityFrameworkTarget, "SystemConfiguration.framework", false);
             proj.AddFrameworkToProject(unityFrameworkTarget, "CoreTelephony.framework", false);
-            proj.AddFrameworkToProject(unityFrameworkTarget, "SystemConfiguration.framework", false);
 
             proj.AddFileToBuild(unityFrameworkTarget,
                 proj.AddFile("usr/lib/libc++.tbd", "libc++.tbd", PBXSourceTree.Sdk));
@@ -55,20 +57,19 @@ namespace TapSDK.Core.Editor
             proj.AddFileToBuild(unityFrameworkTarget,
                 proj.AddFile("usr/lib/libsqlite3.tbd", "libsqlite3.tbd", PBXSourceTree.Sdk));
 
-            // if (TapSDKCoreCompile.HandlerIOSSetting(path,
-            //     Application.dataPath,
-            //     "TapCommonResource",
-            //     "com.taptap.sdk.core",
-            //     "TapSDKCore",
-            //     new[] {"TapCommonResource.bundle"},
-            //     target, projPath, proj))
-            // {
-            //     Debug.Log("TapCommon add Bundle Success!");
-            //     return;
-            // }
+            proj.WriteToFile(projPath);
+            string podfilePath = Path.Combine(path, "Podfile");
+            if (!File.Exists(podfilePath))
+            {
+                Debug.LogWarning("Podfile not found.");
+                return;
+            }
+
+            string podfileContent = File.ReadAllText(podfilePath);
+            podfileContent += "\ninstall! 'cocoapods', :warn_for_unused_master_specs_repo => false";
 
-            // Debug.LogError("TapCommon add Bundle Failed!");
+            File.WriteAllText(podfilePath, podfileContent);
         }
     }
 #endif
-}
+}

package/Core/Mobile/Runtime/BridgeIOS.cs

@@ -38,7 +38,8 @@ namespace TapSDK.Core
 
             Action<Result> action = null;
 
-            if (actionDic != null && actionDic.ContainsKey(result.callbackId))
+            // 修复：检查callbackId是否为null或空，防止ArgumentNullException
+            if (actionDic != null && !string.IsNullOrEmpty(result.callbackId) && actionDic.ContainsKey(result.callbackId))
             {
                 action = actionDic[result.callbackId];
             }
@@ -46,12 +47,22 @@ namespace TapSDK.Core
             if (action != null)
             {
                 action(result);
-                if (result.onceTime && BridgeIOS.GetInstance().GetConcurrentDictionary()
+                if (result.onceTime && !string.IsNullOrEmpty(result.callbackId) && BridgeIOS.GetInstance().GetConcurrentDictionary()
                     .TryRemove(result.callbackId, out Action<Result> outAction))
                 {
                     TapLog.Log($"TapSDK resolved current Action:{result.callbackId}");
                 }
             }
+            else if (string.IsNullOrEmpty(result.callbackId))
+            {
+                // 记录调试信息：当callbackId为空时
+                TapLog.Log($"TapSDK received result without callbackId, result: {resultJson}");
+            }
+            else
+            {
+                // 记录调试信息：当找不到对应的action时
+                TapLog.Log($"TapSDK no action found for callbackId: {result.callbackId}");
+            }
         }