fix: repair iOS ad SDK framework search paths

Assets/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [1.0.3]
+
+### 修复
+
+* iOS 导出后自动修复 `UnityFramework` target 的广告 SDK `FRAMEWORK_SEARCH_PATHS` / `HEADER_SEARCH_PATHS`，覆盖 Dirichlet、CSJ、GDT、DRA、GDTMobSDK、Tquic、BUAdSDK 的真实 xcframework slice。
+* iOS 导出后清理 CocoaPods `Pods-UnityFramework*.xcconfig` 中的 `XCFrameworkIntermediates` 搜索路径，避免 Xcode 真机 Play 时出现 framework not found 或 search path not found。
+* 保持签名配置由业务工程负责，广告模块不写入 Team、provisioning profile 或 code signing 设置。
+
+# [1.0.1]
+
+### 调整
+
+* 包声明升级到 Unity `2022.3`，项目版本固定为 `2022.3.62f2c1`。
+* 依赖的 `CC-Framework.Commercialization` 升级到 `1.0.15`，对齐源头商业化框架发布包。
+
 # [1.0.0]
 
 ### 新增

Assets/DirichletMediation/Editor/Dirichlet.Mediation.Editor.asmdef

@@ -0,0 +1,15 @@
+{
+  "name": "Dirichlet.Mediation.Editor",
+  "references": [],
+  "includePlatforms": [
+    "Editor"
+  ],
+  "excludePlatforms": [],
+  "allowUnsafeCode": false,
+  "overrideReferences": false,
+  "precompiledReferences": [],
+  "autoReferenced": true,
+  "defineConstraints": [],
+  "versionDefines": [],
+  "noEngineReferences": false
+}

Assets/DirichletMediation/Editor/Dirichlet.Mediation.Editor.asmdef.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ffd2503194414b5e8b8e687a6a70a19f
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/DirichletMediation/Editor/DirichletGradlePostProcessor.cs

@@ -149,28 +149,10 @@ namespace Dirichlet.Mediation.Editor
             var depsBlock = new StringBuilder();
             depsBlock.AppendLine(DIRICHLET_DEPS_START);
             
-            // Core Mediation AAR
-            depsBlock.AppendLine("    implementation(name: 'DirichletAD_Mediation_4.2.5.0', ext: 'aar')");
-
-            // CSJ (穿山甲) Adapter and SDK
-            if (enableCsj)
-            {
-                depsBlock.AppendLine("    implementation(name: 'DirichletAD_CSJ_Adapter_4.2.5.0', ext: 'aar')");
-                depsBlock.AppendLine("    implementation(name: 'open_ad_sdk_7.4.2.2', ext: 'aar')");
-            }
-
-            // GDT (广点通) Adapter and SDK
-            if (enableGdt)
-            {
-                depsBlock.AppendLine("    implementation(name: 'DirichletAD_GDT_Adapter_4.2.5.0', ext: 'aar')");
-                depsBlock.AppendLine("    implementation(name: 'GDTSDK.unionNormal.4.671.1541', ext: 'aar')");
-            }
-
-            // IQY (爱奇艺) Adapter and SDK
+            // Local AAR files are imported by Unity's PluginImporter from Assets/Plugins/Android.
+            // Do not declare them here again, otherwise exported Gradle projects can get duplicate classes.
             if (enableIqy)
             {
-                depsBlock.AppendLine("    implementation(name: 'DirichletAD_IQY_Adapter_4.2.5.0', ext: 'aar')");
-                depsBlock.AppendLine("    implementation(name: 'iadsdk-release-2.3.102.110', ext: 'aar')");
                 depsBlock.AppendLine("    implementation 'com.android.support.constraint:constraint-layout:1.1.3'");
             }
             

Assets/DirichletMediation/Editor/DirichletMediationIOSPostProcessor.cs

@@ -36,6 +36,9 @@ namespace Dirichlet.Mediation.Editor
         private const string ENV_ATT_DESCRIPTION = "DIRICHLET_IOS_ATT_DESCRIPTION";
         private const string PrefKeyIOSSDKVersion = "Dirichlet.iOS.SDKVersion";
         private const string PrefKeyATTDescription = "Dirichlet.iOS.TrackingUsageDescription";
+        private const string IOSDeviceSlice = "ios-arm64";
+        private const string TquicIOSDeviceSlice = "ios-arm64_armv7";
+        private static readonly string[] GDTDynamicFrameworkNames = { "GDTMobSDK.framework", "Tquic.framework" };
 
         /// <summary>
         /// 解析出的 target 信息
@@ -78,8 +81,8 @@ namespace Dirichlet.Mediation.Editor
                 // 4. Run pod install
                 RunPodInstall(pathToBuiltProject);
 
-                // 5. Embed GDT dynamic frameworks into app target (must run after pod install)
-                EmbedGDTDynamicFrameworks(pathToBuiltProject, targetInfo);
+                // 5. Fix ad SDK framework/header search paths and embed GDT dynamic frameworks (must run after pod install)
+                FixAdSDKIOSFrameworkConfiguration(pathToBuiltProject, targetInfo);
 
                 Debug.Log("[DirichletMediation] iOS post-process completed successfully.");
             }
@@ -517,20 +520,16 @@ namespace Dirichlet.Mediation.Editor
         }
 
         /// <summary>
-        /// GDTMobSDK 提供的是预编译动态库（GDTMobSDK.framework, Tquic.framework），
-        /// 必须 embed 到 app bundle 中才能在运行时加载。
-        /// 由于所有 pods 都在 Framework target 上，CocoaPods 不会自动 embed 到 app target，
-        /// 需要在 pod install 之后手动处理。
+        /// UnityFramework 链接阶段需要显式搜索广告 SDK xcframework 内部的真机 slice，
+        /// 否则 Xcode 可能报 ld: framework 'GDTMobSDK' not found 或 XCFrameworkIntermediates 搜索路径缺失。
+        /// 同时 GDTMobSDK 提供的是预编译动态库（GDTMobSDK.framework, Tquic.framework），
+        /// 必须 embed 到 app bundle 中才能在运行时加载。由于所有 pods 都在 Framework target 上，
+        /// CocoaPods 不会自动 embed 到 app target，需要在 pod install 之后手动处理。
         /// 依赖 UnityEditor.iOS.Xcode.Extensions 中的 AddFileToEmbedFrameworks 扩展方法。
         /// </summary>
-        private static void EmbedGDTDynamicFrameworks(string projectPath, TargetInfo targetInfo)
+        private static void FixAdSDKIOSFrameworkConfiguration(string projectPath, TargetInfo targetInfo)
         {
             var enableGdt = EditorPrefs.GetBool("Dirichlet.iOS.EnableGDT", true);
-            if (!enableGdt)
-            {
-                Debug.Log("[DirichletMediation] GDT adapter disabled, skipping dynamic framework embedding");
-                return;
-            }
 
             var xcodeProjectName = DetectXcodeProjectName(projectPath);
             var projectFilePath = Path.Combine(projectPath, $"{xcodeProjectName}.xcodeproj/project.pbxproj");
@@ -543,12 +542,19 @@ namespace Dirichlet.Mediation.Editor
                 mainTargetGuid = pbxProject.TargetGuidByName(targetInfo.AppTargetName);
             }
 
-            // GDTMobSDK 的动态框架列表
-            var dynamicFrameworkNames = new[] { "GDTMobSDK.framework", "Tquic.framework" };
+            var targetGuid = ResolveUnityFrameworkTargetGuid(pbxProject, targetInfo);
+            var frameworkSearchPaths = GetAdSDKFrameworkSearchPaths();
+            var headerSearchPaths = GetAdSDKHeaderSearchPaths(frameworkSearchPaths);
+
+            var searchPathsAdded = AddAdSDKSearchPaths(pbxProject, targetGuid, frameworkSearchPaths, headerSearchPaths);
+            PatchPodsXCConfigSearchPaths(projectPath, targetInfo, frameworkSearchPaths, headerSearchPaths);
+
             var podsDir = Path.Combine(projectPath, "Pods");
             var embedded = 0;
 
-            foreach (var frameworkName in dynamicFrameworkNames)
+            if (enableGdt)
+            {
+                foreach (var frameworkName in GDTDynamicFrameworkNames)
                 {
                     var frameworkPath = FindDynamicFramework(podsDir, frameworkName);
                     if (string.IsNullOrEmpty(frameworkPath))
@@ -566,12 +572,251 @@ namespace Dirichlet.Mediation.Editor
                     embedded++;
                     Debug.Log($"[DirichletMediation] Embedded dynamic framework: {frameworkName}");
                 }
-
-            if (embedded > 0)
+            }
+            else
             {
+                Debug.Log("[DirichletMediation] GDT adapter disabled, skipping dynamic framework embedding");
+            }
+
             pbxProject.WriteToFile(projectFilePath);
+            if (searchPathsAdded)
+            {
+                Debug.Log($"[DirichletMediation] Added ad SDK framework/header search paths to {targetInfo.FrameworkTargetName}");
+            }
             Debug.Log($"[DirichletMediation] Embedded {embedded} GDT dynamic frameworks into {targetInfo.AppTargetName}");
         }
+
+        private static string ResolveUnityFrameworkTargetGuid(PBXProject pbxProject, TargetInfo targetInfo)
+        {
+#if UNITY_2019_3_OR_NEWER
+            var targetGuid = pbxProject.GetUnityFrameworkTargetGuid();
+#else
+            var targetGuid = targetInfo.FrameworkTargetGuid;
+#endif
+            if (string.IsNullOrEmpty(targetGuid))
+            {
+                targetGuid = targetInfo.FrameworkTargetGuid;
+            }
+            if (string.IsNullOrEmpty(targetGuid))
+            {
+                targetGuid = pbxProject.TargetGuidByName(targetInfo.FrameworkTargetName);
+            }
+
+            return targetGuid;
+        }
+
+        private static bool AddAdSDKSearchPaths(PBXProject pbxProject, string targetGuid, string[] frameworkSearchPaths, string[] headerSearchPaths)
+        {
+            if (string.IsNullOrEmpty(targetGuid))
+            {
+                Debug.LogWarning("[DirichletMediation] UnityFramework target GUID is empty, skipping ad SDK search paths");
+                return false;
+            }
+
+            pbxProject.AddBuildProperty(targetGuid, "FRAMEWORK_SEARCH_PATHS", "$(inherited)");
+            foreach (var searchPath in frameworkSearchPaths)
+            {
+                pbxProject.AddBuildProperty(targetGuid, "FRAMEWORK_SEARCH_PATHS", searchPath);
+            }
+
+            pbxProject.AddBuildProperty(targetGuid, "HEADER_SEARCH_PATHS", "$(inherited)");
+            foreach (var searchPath in headerSearchPaths)
+            {
+                pbxProject.AddBuildProperty(targetGuid, "HEADER_SEARCH_PATHS", searchPath);
+            }
+
+            return true;
+        }
+
+        private static void PatchPodsXCConfigSearchPaths(
+            string projectPath,
+            TargetInfo targetInfo,
+            string[] frameworkSearchPaths,
+            string[] headerSearchPaths)
+        {
+            var targetSupportRoot = Path.Combine(projectPath, "Pods", "Target Support Files");
+            if (!Directory.Exists(targetSupportRoot))
+            {
+                Debug.LogWarning("[DirichletMediation] CocoaPods target support files not found, skipping xcconfig search path patch");
+                return;
+            }
+
+            var targetPrefix = "Pods-" + targetInfo.FrameworkTargetName;
+            var xcconfigFiles = Directory.GetFiles(targetSupportRoot, "*.xcconfig", SearchOption.AllDirectories)
+                .Where(path => Path.GetFileNameWithoutExtension(path).StartsWith(targetPrefix, System.StringComparison.OrdinalIgnoreCase))
+                .ToArray();
+
+            if (xcconfigFiles.Length == 0)
+            {
+                Debug.LogWarning($"[DirichletMediation] No CocoaPods xcconfig found for {targetInfo.FrameworkTargetName}, skipping search path patch");
+                return;
+            }
+
+            var patched = 0;
+            foreach (var xcconfigPath in xcconfigFiles)
+            {
+                var lines = File.ReadAllLines(xcconfigPath).ToList();
+                var changed = UpsertXCConfigBuildSetting(lines, "FRAMEWORK_SEARCH_PATHS", frameworkSearchPaths);
+                changed |= UpsertXCConfigBuildSetting(lines, "HEADER_SEARCH_PATHS", headerSearchPaths);
+
+                if (!changed)
+                {
+                    continue;
+                }
+
+                File.WriteAllLines(xcconfigPath, lines);
+                patched++;
+            }
+
+            Debug.Log($"[DirichletMediation] Patched {patched} CocoaPods xcconfig search path file(s) for {targetInfo.FrameworkTargetName}");
+        }
+
+        private static bool UpsertXCConfigBuildSetting(System.Collections.Generic.List<string> lines, string propertyName, string[] searchPaths)
+        {
+            var insertIndex = -1;
+            var originalLines = new System.Collections.Generic.List<string>();
+            var tokens = new System.Collections.Generic.List<string>();
+
+            for (var i = lines.Count - 1; i >= 0; i--)
+            {
+                if (!IsXCConfigBuildSettingLine(lines[i], propertyName))
+                {
+                    continue;
+                }
+
+                insertIndex = i;
+                originalLines.Add(lines[i]);
+                CollectXCConfigBuildSettingTokens(lines[i], tokens);
+                lines.RemoveAt(i);
+            }
+
+            if (!ContainsXCConfigToken(tokens, "$(inherited)"))
+            {
+                tokens.Insert(0, "$(inherited)");
+            }
+
+            foreach (var searchPath in searchPaths)
+            {
+                AddXCConfigTokenIfMissing(tokens, searchPath);
+            }
+
+            var newLine = $"{propertyName} = {string.Join(" ", tokens)}";
+
+            if (insertIndex < 0)
+            {
+                lines.Add(newLine);
+                return true;
+            }
+
+            lines.Insert(insertIndex, newLine);
+            return originalLines.Count != 1 || originalLines[0] != newLine;
+        }
+
+        private static void CollectXCConfigBuildSettingTokens(string line, System.Collections.Generic.List<string> tokens)
+        {
+            var separatorIndex = line.IndexOf('=');
+            if (separatorIndex < 0 || separatorIndex >= line.Length - 1)
+            {
+                return;
+            }
+
+            var value = line.Substring(separatorIndex + 1).Trim();
+            var lineTokens = value.Split(new[] { ' ', '\t' }, System.StringSplitOptions.RemoveEmptyEntries);
+            foreach (var token in lineTokens)
+            {
+                if (token.IndexOf("XCFrameworkIntermediates", System.StringComparison.OrdinalIgnoreCase) >= 0)
+                {
+                    continue;
+                }
+
+                AddXCConfigTokenIfMissing(tokens, token);
+            }
+        }
+
+        private static bool ContainsXCConfigToken(System.Collections.Generic.List<string> tokens, string value)
+        {
+            var normalizedValue = NormalizeXCConfigToken(value);
+            return tokens.Any(token => NormalizeXCConfigToken(token) == normalizedValue);
+        }
+
+        private static void AddXCConfigTokenIfMissing(System.Collections.Generic.List<string> tokens, string value)
+        {
+            if (!ContainsXCConfigToken(tokens, value))
+            {
+                tokens.Add(value);
+            }
+        }
+
+        private static string NormalizeXCConfigToken(string token)
+        {
+            return (token ?? string.Empty).Trim().Trim('"');
+        }
+
+        private static bool IsXCConfigBuildSettingLine(string line, string propertyName)
+        {
+            if (string.IsNullOrWhiteSpace(line))
+            {
+                return false;
+            }
+
+            var trimmed = line.TrimStart();
+            return trimmed.StartsWith(propertyName + " =", System.StringComparison.Ordinal)
+                   || trimmed.StartsWith(propertyName + "=", System.StringComparison.Ordinal);
+        }
+
+        private static string[] GetAdSDKFrameworkSearchPaths()
+        {
+            var sdkVersion = ResolveIOSSDKVersion();
+            var enableCsj = EditorPrefs.GetBool("Dirichlet.iOS.EnableCSJ", true);
+            var enableGdt = EditorPrefs.GetBool("Dirichlet.iOS.EnableGDT", true);
+            var paths = new System.Collections.Generic.List<string>
+            {
+                VersionedDirichletFrameworkSearchPath("DirichletAdSDK", sdkVersion),
+                VersionedDirichletFrameworkSearchPath("DirichletCoreSDK", sdkVersion),
+                VersionedDirichletFrameworkSearchPath("DirichletMediationSDK", sdkVersion),
+                VersionedDirichletFrameworkSearchPath("DirichletMediationAdapterDRA", sdkVersion)
+            };
+
+            if (enableCsj)
+            {
+                paths.Add(VersionedDirichletFrameworkSearchPath("DirichletMediationAdapterCSJ", sdkVersion));
+                paths.Add("$(PODS_ROOT)/Ads-CN/SDK/BUAdSDK.xcframework/" + IOSDeviceSlice);
+            }
+
+            if (enableGdt)
+            {
+                paths.Add(VersionedDirichletFrameworkSearchPath("DirichletMediationAdapterGDT", sdkVersion));
+                paths.Add("$(PODS_ROOT)/GDTMobSDK/GDTFramework/GDTMobSDK.xcframework/" + IOSDeviceSlice);
+                paths.Add("$(PODS_ROOT)/GDTMobSDK/GDTFramework/Tquic.xcframework/" + TquicIOSDeviceSlice);
+            }
+
+            return paths.ToArray();
+        }
+
+        private static string[] GetAdSDKHeaderSearchPaths(string[] frameworkSearchPaths)
+        {
+            return frameworkSearchPaths
+                .Select(ToFrameworkHeaderSearchPath)
+                .Where(path => !string.IsNullOrEmpty(path))
+                .ToArray();
+        }
+
+        private static string VersionedDirichletFrameworkSearchPath(string frameworkName, string sdkVersion)
+        {
+            return $"$(PODS_ROOT)/{frameworkName}/{frameworkName}-{sdkVersion}/{frameworkName}.xcframework/{IOSDeviceSlice}";
+        }
+
+        private static string ToFrameworkHeaderSearchPath(string frameworkSearchPath)
+        {
+            var parts = frameworkSearchPath.Split(new[] { '/' }, System.StringSplitOptions.RemoveEmptyEntries);
+            var xcframeworkPart = parts.LastOrDefault(part => part.EndsWith(".xcframework", System.StringComparison.OrdinalIgnoreCase));
+            if (string.IsNullOrEmpty(xcframeworkPart))
+            {
+                return null;
+            }
+
+            var frameworkName = xcframeworkPart.Substring(0, xcframeworkPart.Length - ".xcframework".Length);
+            return $"{frameworkSearchPath}/{frameworkName}.framework/Headers";
         }
 
         /// <summary>

Assets/Tapadn_Adapter/Editor/WXDependencies.xml

@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <dependencies>
-  <androidPackages>
-    <androidPackage spec="com.tencent.mm.opensdk:wechat-sdk-android:6.8.34">
-      <repositories>
-        <repository>https://maven.aliyun.com/repository/public</repository>
-        <repository>https://repo.maven.apache.org/maven2</repository>
-      </repositories>
-    </androidPackage>
-  </androidPackages>
+  <!-- WeChat OpenSDK is shipped as a local AAR under Assets/Plugins/Android. -->
 </dependencies>

Assets/package.json

@@ -2,12 +2,12 @@
   "name": "com.commercialization.tapadn",
   "displayName": "Commercialization.tapadn",
   "description": "TapADN / Dirichlet mediation implementation for CC-Framework.Commercialization.",
-  "version": "1.0.0",
-  "unity": "2021.1",
+  "version": "1.0.3",
+  "unity": "2022.3",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "http://private.lightyears.ltd:18650/foldcc/Commercialization.tapadn"
+    "url": "http://private.lightyears.ltd:18650/foldcc/Commercialization.tapadn.git"
   },
   "author": {
     "name": "foldcc",
@@ -15,7 +15,7 @@
     "url": "https://gitee.com/foldcc"
   },
   "dependencies": {
-    "com.foldcc.cc-framework.commercialization": "http://private.lightyears.ltd:18650/foldcc/CC-Framework.Commercialization.git#1.0.14"
+    "com.foldcc.cc-framework.commercialization": "http://private.lightyears.ltd:18650/foldcc/CC-Framework.Commercialization.git#1.0.15"
   },
   "samples": [
     {

GLOBAL_DESIGN.md

@@ -110,7 +110,7 @@ iOS runtime 桥接负责：
 发布包入口是 `Assets/package.json`，其中 `com.foldcc.cc-framework.commercialization` 依赖保持为远程 Git URL：
 
 ```json
-"com.foldcc.cc-framework.commercialization": "http://private.lightyears.ltd:18650/foldcc/CC-Framework.Commercialization.git#1.0.14"
+"com.foldcc.cc-framework.commercialization": "http://private.lightyears.ltd:18650/foldcc/CC-Framework.Commercialization.git#1.0.15"
 ```
 
 当前仓库自身作为 Unity 验证工程时，可以在 `Packages/manifest.json` 使用本地 `file:` 引用：

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.62f3c1
-m_EditorVersionWithRevision: 2022.3.62f3c1 (1623fc0bbb97)
+m_EditorVersion: 2022.3.62f2c1
+m_EditorVersionWithRevision: 2022.3.62f2c1 (92e6e6be66dc)

README.md

@@ -8,8 +8,8 @@
 
 ```json
 {
-  "com.foldcc.cc-framework.commercialization": "http://private.lightyears.ltd:18650/foldcc/CC-Framework.Commercialization.git#1.0.14",
-  "com.commercialization.tapadn": "http://private.lightyears.ltd:18650/foldcc/Commercialization.tapadn.git#1.0.0"
+  "com.foldcc.cc-framework.commercialization": "http://private.lightyears.ltd:18650/foldcc/CC-Framework.Commercialization.git#1.0.15",
+  "com.commercialization.tapadn": "http://private.lightyears.ltd:18650/foldcc/Commercialization.tapadn.git#1.0.3"
 }
 ```