release: 1.4.12

CHANGELOG.md

@@ -1,3 +1,9 @@
+# [1.4.12]
+
+### 修复
+
+* Android 构建后处理在 launcher `application` 已存在 `android:appComponentFactory` 时，同步合并 `tools:replace="android:appComponentFactory"`，避免 TapTap AndroidX manifest merger 冲突。
+
 # [1.4.11]
 
 ### 修复

Topon_Adapter/Editor/AD_BuildAndroidProcess.cs

@@ -121,7 +121,7 @@ namespace Topon_Adapter.Editor
 
             elementlauncherApplication.Add (CreateCSJGromore ());
             SetOrAddAttribute (elementlauncherApplication, AndroidNamespace + "allowBackup", "false");
-            MergeToolsReplaceAttribute (elementlauncherApplication, "android:allowBackup");
+            MergeToolsReplaceAttribute (elementlauncherApplication, GetLauncherApplicationReplaceValues (elementlauncherApplication));
             
             var elementMainManifest    = manifest.Element ("manifest");
             var elementMainApplication = elementMainManifest.Element ("application");
@@ -263,6 +263,17 @@ namespace Topon_Adapter.Editor
             attribute.SetValue (value);
         }
 
+        private static string[] GetLauncherApplicationReplaceValues (XElement element)
+        {
+            List<string> replaceValues = new List<string> { "android:allowBackup" };
+            if (element.Attribute (AndroidNamespace + "appComponentFactory") != null)
+            {
+                replaceValues.Add ("android:appComponentFactory");
+            }
+
+            return replaceValues.ToArray ();
+        }
+
         private static void MergeToolsReplaceAttribute (XElement element, params string[] replaceValues)
         {
             XName replaceAttributeName = ToolsNamespace + "replace";

package.json

@@ -2,7 +2,7 @@
   "name": "com.commercialization.topon",
   "displayName": "Commercialization.topon",
   "description": "基于topon的广告sdk封装，依赖基础商业化模块",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "unity": "2021.1",
   "license": "MIT",
   "repository": {