zcw-shared 1.44.2 → 1.46.0

package/dist/functions/android/integrateUniAppNativePlugin.js

@@ -1,29 +1,29 @@
-import { integrateThirdPartyModule } from './integrateThirdPartyModule';
+import { integrateThirdPartyModule, } from "./integrateThirdPartyModule";
 async function extractPlugin(pluginPath, extractDir, deps) {
     try {
         if (!deps.existsSync(pluginPath)) {
             return {
                 success: false,
-                error: `插件路径不存在: ${pluginPath}`
+                error: `插件路径不存在: ${pluginPath}`,
             };
         }
         const stat = deps.statSync(pluginPath);
         if (stat.isDirectory()) {
             return {
                 success: true,
-                extractedPath: pluginPath
+                extractedPath: pluginPath,
             };
         }
         if (stat.isFile()) {
             const fileName = deps.basename(pluginPath);
-            const ext = fileName.split('.').pop()?.toLowerCase();
-            if (ext !== 'zip') {
+            const ext = fileName.split(".").pop()?.toLowerCase();
+            if (ext !== "zip") {
                 return {
                     success: false,
-                    error: `不支持的插件格式: ${ext}，仅支持 zip 格式`
+                    error: `不支持的插件格式: ${ext}，仅支持 zip 格式`,
                 };
             }
-            const pluginName = fileName.replace(/\.zip$/i, '');
+            const pluginName = fileName.replace(/\.zip$/i, "");
             const targetDir = deps.join(extractDir, pluginName);
             if (!deps.existsSync(targetDir)) {
                 deps.mkdirSync(targetDir, { recursive: true });
@@ -33,7 +33,7 @@ async function extractPlugin(pluginPath, extractDir, deps) {
                     if (error) {
                         resolve({
                             success: false,
-                            error: `解压插件失败: ${error.message}${stderr ? `\n${stderr}` : ''}`
+                            error: `解压插件失败: ${error.message}${stderr ? `\n${stderr}` : ""}`,
                         });
                     }
                     else {
@@ -44,9 +44,10 @@ async function extractPlugin(pluginPath, extractDir, deps) {
                                 const singleEntry = deps.join(targetDir, entries[0]);
                                 const singleStat = deps.statSync(singleEntry);
                                 if (singleStat.isDirectory()) {
-                                    const packageJsonPath = deps.join(singleEntry, 'package.json');
-                                    const androidDir = deps.join(singleEntry, 'android');
-                                    if (deps.existsSync(packageJsonPath) || deps.existsSync(androidDir)) {
+                                    const packageJsonPath = deps.join(singleEntry, "package.json");
+                                    const androidDir = deps.join(singleEntry, "android");
+                                    if (deps.existsSync(packageJsonPath) ||
+                                        deps.existsSync(androidDir)) {
                                         extractedPath = singleEntry;
                                     }
                                 }
@@ -56,7 +57,7 @@ async function extractPlugin(pluginPath, extractDir, deps) {
                         }
                         resolve({
                             success: true,
-                            extractedPath: extractedPath
+                            extractedPath: extractedPath,
                         });
                     }
                 });
@@ -64,36 +65,36 @@ async function extractPlugin(pluginPath, extractDir, deps) {
         }
         return {
             success: false,
-            error: '插件路径既不是文件也不是目录'
+            error: "插件路径既不是文件也不是目录",
         };
     }
     catch (error) {
         return {
             success: false,
-            error: `解压插件失败: ${error instanceof Error ? error.message : String(error)}`
+            error: `解压插件失败: ${error instanceof Error ? error.message : String(error)}`,
         };
     }
 }
 function readPluginPackageJson(pluginDir, deps) {
     try {
-        const packageJsonPath = deps.join(pluginDir, 'package.json');
+        const packageJsonPath = deps.join(pluginDir, "package.json");
         if (!deps.existsSync(packageJsonPath)) {
             return {
                 success: false,
-                error: `插件 package.json 不存在: ${packageJsonPath}`
+                error: `插件 package.json 不存在: ${packageJsonPath}`,
             };
         }
-        const content = deps.readFileSync(packageJsonPath, 'utf8');
+        const content = deps.readFileSync(packageJsonPath, "utf8");
         const packageJson = deps.parse(content);
         return {
             success: true,
-            packageJson
+            packageJson,
         };
     }
     catch (error) {
         return {
             success: false,
-            error: `读取插件 package.json 失败: ${error instanceof Error ? error.message : String(error)}`
+            error: `读取插件 package.json 失败: ${error instanceof Error ? error.message : String(error)}`,
         };
     }
 }
@@ -108,8 +109,8 @@ function findLibFilesRecursive(dir, deps) {
             const entryPath = deps.join(dir, entry);
             const stat = deps.statSync(entryPath);
             if (stat.isFile()) {
-                const ext = entry.split('.').pop()?.toLowerCase();
-                if (ext === 'aar' || ext === 'jar') {
+                const ext = entry.split(".").pop()?.toLowerCase();
+                if (ext === "aar" || ext === "jar") {
                     libFiles.push(entryPath);
                 }
             }
@@ -123,14 +124,14 @@ function findLibFilesRecursive(dir, deps) {
     return libFiles;
 }
 function findAndroidLibFiles(pluginDir, deps) {
-    const androidDir = deps.join(pluginDir, 'android');
+    const androidDir = deps.join(pluginDir, "android");
     return findLibFilesRecursive(androidDir, deps);
 }
 function copyAndroidFilesRecursive(sourceDir, projectPath, moduleDir, packageName, excludeFiles, deps) {
     const logs = [];
     let count = 0;
-    const excludeSet = new Set(excludeFiles.map(f => deps.join(f).replace(/\\/g, '/')));
-    function copyRecursive(currentSource, currentTarget, relativePath = '') {
+    const excludeSet = new Set(excludeFiles.map((f) => deps.join(f).replace(/\\/g, "/")));
+    function copyRecursive(currentSource, currentTarget, relativePath = "") {
         if (!deps.existsSync(currentSource)) {
             return;
         }
@@ -138,33 +139,37 @@ function copyAndroidFilesRecursive(sourceDir, projectPath, moduleDir, packageNam
             const entries = deps.readdirSync(currentSource);
             for (const entry of entries) {
                 const sourcePath = deps.join(currentSource, entry);
-                const normalizedSource = sourcePath.replace(/\\/g, '/');
+                const normalizedSource = sourcePath.replace(/\\/g, "/");
                 if (excludeSet.has(normalizedSource)) {
                     continue;
                 }
                 const stat = deps.statSync(sourcePath);
                 const targetPath = deps.join(currentTarget, entry);
-                const newRelativePath = relativePath ? deps.join(relativePath, entry) : entry;
+                const newRelativePath = relativePath
+                    ? deps.join(relativePath, entry)
+                    : entry;
                 if (stat.isFile()) {
-                    const ext = entry.split('.').pop()?.toLowerCase();
-                    if (ext === 'java' || ext === 'kt') {
-                        const javaTargetDir = deps.join(projectPath, moduleDir, 'src', 'main', 'java', ...packageName.split('.'));
+                    const ext = entry.split(".").pop()?.toLowerCase();
+                    if (ext === "java" || ext === "kt") {
+                        const javaTargetDir = deps.join(projectPath, moduleDir, "src", "main", "java", ...packageName.split("."));
                         const javaTargetPath = deps.join(javaTargetDir, newRelativePath);
                         const targetDir = deps.dirname(javaTargetPath);
                         if (!deps.existsSync(targetDir)) {
                             deps.mkdirSync(targetDir, { recursive: true });
                         }
-                        let content = deps.readFileSync(sourcePath, 'utf8');
-                        deps.writeFileSync(javaTargetPath, content, 'utf8');
+                        let content = deps.readFileSync(sourcePath, "utf8");
+                        deps.writeFileSync(javaTargetPath, content, "utf8");
                         logs.push(`已拷贝 Java 源文件: ${newRelativePath}`);
                         count++;
                     }
-                    else if (ext === 'xml' && (newRelativePath.includes('res/') || newRelativePath.includes('AndroidManifest'))) {
-                        if (entry === 'AndroidManifest.xml') {
+                    else if (ext === "xml" &&
+                        (newRelativePath.includes("res/") ||
+                            newRelativePath.includes("AndroidManifest"))) {
+                        if (entry === "AndroidManifest.xml") {
                             logs.push(`跳过 AndroidManifest.xml（需要手动合并）`);
                         }
                         else {
-                            const resTargetPath = deps.join(projectPath, moduleDir, 'src', 'main', 'res', newRelativePath.replace(/^res\//, ''));
+                            const resTargetPath = deps.join(projectPath, moduleDir, "src", "main", "res", newRelativePath.replace(/^res\//, ""));
                             const targetDir = deps.dirname(resTargetPath);
                             if (!deps.existsSync(targetDir)) {
                                 deps.mkdirSync(targetDir, { recursive: true });
@@ -175,7 +180,7 @@ function copyAndroidFilesRecursive(sourceDir, projectPath, moduleDir, packageNam
                         }
                     }
                     else {
-                        const otherTargetPath = deps.join(projectPath, moduleDir, 'src', 'main', newRelativePath);
+                        const otherTargetPath = deps.join(projectPath, moduleDir, "src", "main", newRelativePath);
                         const targetDir = deps.dirname(otherTargetPath);
                         if (!deps.existsSync(targetDir)) {
                             deps.mkdirSync(targetDir, { recursive: true });
@@ -194,16 +199,18 @@ function copyAndroidFilesRecursive(sourceDir, projectPath, moduleDir, packageNam
             logs.push(`拷贝文件时出错: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
-    const androidTargetBase = deps.join(projectPath, moduleDir, 'src', 'main');
-    copyRecursive(sourceDir, androidTargetBase, '');
+    const androidTargetBase = deps.join(projectPath, moduleDir, "src", "main");
+    copyRecursive(sourceDir, androidTargetBase, "");
     return { count, logs };
 }
 function extractPluginConfig(packageJson) {
     try {
         let plugins = null;
         let androidConfig = null;
-        const nativePlugins = packageJson.nativePlugins || packageJson['uni-app']?.nativePlugins;
-        if (nativePlugins && Array.isArray(nativePlugins) && nativePlugins.length > 0) {
+        const nativePlugins = packageJson.nativePlugins || packageJson["uni-app"]?.nativePlugins;
+        if (nativePlugins &&
+            Array.isArray(nativePlugins) &&
+            nativePlugins.length > 0) {
             for (const pluginGroup of nativePlugins) {
                 if (pluginGroup.plugins && Array.isArray(pluginGroup.plugins)) {
                     plugins = pluginGroup.plugins;
@@ -214,26 +221,31 @@ function extractPluginConfig(packageJson) {
         if (!plugins && packageJson._dp_nativeplugin) {
             androidConfig = packageJson._dp_nativeplugin.android;
             const androidPlugins = androidConfig?.plugins;
-            if (androidPlugins && Array.isArray(androidPlugins) && androidPlugins.length > 0) {
+            if (androidPlugins &&
+                Array.isArray(androidPlugins) &&
+                androidPlugins.length > 0) {
                 plugins = androidPlugins;
             }
         }
         if (!plugins || plugins.length === 0) {
             return {
                 success: false,
-                error: 'package.json 中未找到 nativePlugins 或 _dp_nativeplugin 配置'
+                error: "package.json 中未找到 nativePlugins 或 _dp_nativeplugin 配置",
             };
         }
         for (const plugin of plugins) {
-            if (plugin.type === 'module' && plugin.name && plugin.class) {
+            if (plugin.type === "module" && plugin.name && plugin.class) {
                 let parameters = undefined;
-                if (androidConfig?.parameters && typeof androidConfig.parameters === 'object') {
+                if (androidConfig?.parameters &&
+                    typeof androidConfig.parameters === "object") {
                     parameters = {};
                     for (const [paramName, paramConfig] of Object.entries(androidConfig.parameters)) {
-                        if (paramConfig && typeof paramConfig === 'object' && 'key' in paramConfig) {
+                        if (paramConfig &&
+                            typeof paramConfig === "object" &&
+                            "key" in paramConfig) {
                             parameters[paramName] = {
                                 key: paramConfig.key,
-                                des: paramConfig.des || ''
+                                des: paramConfig.des || "",
                             };
                         }
                     }
@@ -243,35 +255,35 @@ function extractPluginConfig(packageJson) {
                     pluginItem: {
                         type: plugin.type,
                         name: plugin.name,
-                        class: plugin.class
+                        class: plugin.class,
                     },
-                    parameters
+                    parameters,
                 };
             }
         }
         return {
             success: false,
-            error: 'package.json 中未找到有效的 module 类型插件配置'
+            error: "package.json 中未找到有效的 module 类型插件配置",
         };
     }
     catch (error) {
         return {
             success: false,
-            error: `提取插件配置失败: ${error instanceof Error ? error.message : String(error)}`
+            error: `提取插件配置失败: ${error instanceof Error ? error.message : String(error)}`,
         };
     }
 }
 function readOrCreateUniPluginsConfig(assetsDir, deps) {
-    const configPath = deps.join(assetsDir, 'dcloud_uniplugins.json');
+    const configPath = deps.join(assetsDir, "dcloud_uniplugins.json");
     try {
         if (!deps.existsSync(assetsDir)) {
             deps.mkdirSync(assetsDir, { recursive: true });
         }
         let config = {
-            nativePlugins: []
+            nativePlugins: [],
         };
         if (deps.existsSync(configPath)) {
-            const content = deps.readFileSync(configPath, 'utf8');
+            const content = deps.readFileSync(configPath, "utf8");
             try {
                 config = deps.parse(content);
                 if (!config.nativePlugins || !Array.isArray(config.nativePlugins)) {
@@ -283,19 +295,19 @@ function readOrCreateUniPluginsConfig(assetsDir, deps) {
         }
         return {
             success: true,
-            config
+            config,
         };
     }
     catch (error) {
         return {
             success: false,
-            error: `读取或创建 dcloud_uniplugins.json 失败: ${error instanceof Error ? error.message : String(error)}`
+            error: `读取或创建 dcloud_uniplugins.json 失败: ${error instanceof Error ? error.message : String(error)}`,
         };
     }
 }
 function updateUniPluginsConfig(assetsDir, pluginItem, deps) {
     try {
-        const configPath = deps.join(assetsDir, 'dcloud_uniplugins.json');
+        const configPath = deps.join(assetsDir, "dcloud_uniplugins.json");
         const readResult = readOrCreateUniPluginsConfig(assetsDir, deps);
         if (!readResult.success) {
             return readResult;
@@ -316,23 +328,25 @@ function updateUniPluginsConfig(assetsDir, pluginItem, deps) {
             let targetNativePlugin = config.nativePlugins.find((np) => np.plugins && Array.isArray(np.plugins));
             if (!targetNativePlugin) {
                 targetNativePlugin = {
-                    plugins: []
+                    plugins: [],
                 };
                 config.nativePlugins.push(targetNativePlugin);
             }
             targetNativePlugin.plugins.push(pluginItem);
         }
         const configContent = JSON.stringify(config, null, 2);
-        deps.writeFileSync(configPath, configContent, 'utf8');
+        deps.writeFileSync(configPath, configContent, "utf8");
         return {
             success: true,
-            message: found ? `已更新插件配置: ${pluginItem.name}` : `已添加插件配置: ${pluginItem.name}`
+            message: found
+                ? `已更新插件配置: ${pluginItem.name}`
+                : `已添加插件配置: ${pluginItem.name}`,
         };
     }
     catch (error) {
         return {
             success: false,
-            error: `更新 dcloud_uniplugins.json 失败: ${error instanceof Error ? error.message : String(error)}`
+            error: `更新 dcloud_uniplugins.json 失败: ${error instanceof Error ? error.message : String(error)}`,
         };
     }
 }
@@ -340,8 +354,8 @@ export async function integrateUniAppNativePlugin(projectPath, moduleDir, packag
     const logs = [];
     try {
         logs.push(`开始集成 UniApp 原生插件: ${pluginPath}`);
-        logs.push('步骤 1: 解压插件');
-        const tempDir = deps.join(projectPath, '.temp');
+        logs.push("步骤 1: 解压插件");
+        const tempDir = deps.join(projectPath, ".temp");
         if (!deps.existsSync(tempDir)) {
             deps.mkdirSync(tempDir, { recursive: true });
         }
@@ -353,87 +367,91 @@ export async function integrateUniAppNativePlugin(projectPath, moduleDir, packag
             exec: deps.exec,
             basename: deps.basename,
             dirname: deps.dirname,
-            mkdirSync: deps.mkdirSync
+            mkdirSync: deps.mkdirSync,
         });
         if (!extractResult.success) {
             return {
                 success: false,
                 error: extractResult.error,
-                logs
+                logs,
             };
         }
         const pluginDir = extractResult.extractedPath;
         logs.push(`插件已解压到: ${pluginDir}`);
-        logs.push('步骤 2: 读取插件配置');
+        logs.push("步骤 2: 读取插件配置");
         const packageJsonResult = readPluginPackageJson(pluginDir, {
             existsSync: deps.existsSync,
             readFileSync: deps.readFileSync,
             join: deps.join,
-            parse: deps.parse
+            parse: deps.parse,
         });
         if (!packageJsonResult.success) {
             return {
                 success: false,
                 error: packageJsonResult.error,
-                logs
+                logs,
             };
         }
         const packageJson = packageJsonResult.packageJson;
-        const pluginName = packageJson.name || 'UniApp Native Plugin';
+        const pluginName = packageJson.name || "UniApp Native Plugin";
         logs.push(`插件名称: ${pluginName}`);
-        logs.push('步骤 3: 提取插件配置');
+        logs.push("步骤 3: 提取插件配置");
         const pluginConfigResult = extractPluginConfig(packageJson);
         let pluginItem = null;
         let pluginParameters = undefined;
         if (!pluginConfigResult.success) {
             logs.push(`警告: ${pluginConfigResult.error}`);
-            logs.push('将继续处理库文件，但 dcloud_uniplugins.json 可能无法正确配置');
+            logs.push("将继续处理库文件，但 dcloud_uniplugins.json 可能无法正确配置");
         }
         else {
             pluginItem = pluginConfigResult.pluginItem;
             pluginParameters = pluginConfigResult.parameters;
             logs.push(`插件配置: ${pluginItem.name} (${pluginItem.class})`);
             if (pluginParameters) {
-                logs.push(`插件参数: ${Object.keys(pluginParameters).join(', ')}`);
+                logs.push(`插件参数: ${Object.keys(pluginParameters).join(", ")}`);
             }
         }
-        logs.push('步骤 4: 查找 Android 库文件');
+        logs.push("步骤 4: 查找 Android 库文件");
         const androidLibFiles = findAndroidLibFiles(pluginDir, {
             existsSync: deps.existsSync,
             readdirSync: deps.readdirSync,
             statSync: deps.statSync,
-            join: deps.join
+            join: deps.join,
         });
         if (androidLibFiles.length === 0) {
-            logs.push('警告: 未找到 android 目录下的 aar/jar 文件');
+            logs.push("警告: 未找到 android 目录下的 aar/jar 文件");
         }
         else {
-            logs.push(`找到 ${androidLibFiles.length} 个库文件: ${androidLibFiles.map(f => deps.basename(f)).join(', ')}`);
+            logs.push(`找到 ${androidLibFiles.length} 个库文件: ${androidLibFiles
+                .map((f) => deps.basename(f))
+                .join(", ")}`);
         }
         if (androidLibFiles.length > 0) {
-            logs.push('步骤 5: 拷贝库文件到 libs 目录');
-            const libFiles = androidLibFiles.map(filePath => ({
+            logs.push("步骤 5: 拷贝库文件到 libs 目录");
+            const libFiles = androidLibFiles.map((filePath) => ({
                 source: filePath,
-                targetName: deps.basename(filePath)
+                targetName: deps.basename(filePath),
             }));
             const manifestModifications = [];
             if (pluginParameters && parameters) {
-                logs.push('步骤 5.1: 配置插件参数到 AndroidManifest.xml');
+                logs.push("步骤 5.1: 配置插件参数到 AndroidManifest.xml");
                 for (const [paramName, paramDef] of Object.entries(pluginParameters)) {
                     const paramValue = parameters[paramName];
-                    if (paramValue !== undefined && paramValue !== null && paramValue !== '') {
+                    if (paramValue !== undefined &&
+                        paramValue !== null &&
+                        paramValue !== "") {
                         manifestModifications.push({
                             xpath: `//meta-data[@android:name='${paramDef.key}']`,
-                            action: 'removeElement'
+                            action: "removeElement",
                         });
                         manifestModifications.push({
                             xpath: "//application",
-                            action: 'addElement',
-                            elementName: 'meta-data',
+                            action: "addElement",
+                            elementName: "meta-data",
                             attributes: {
-                                'android:name': paramDef.key,
-                                'android:value': paramValue
-                            }
+                                "android:name": paramDef.key,
+                                "android:value": paramValue,
+                            },
                         });
                         logs.push(`已配置参数: ${paramName} (${paramDef.key}) = ${paramValue}`);
                     }
@@ -442,10 +460,27 @@ export async function integrateUniAppNativePlugin(projectPath, moduleDir, packag
                     }
                 }
             }
+            let pluginDependencies = undefined;
+            const androidConfig = packageJson._dp_nativeplugin?.android;
+            if (androidConfig?.dependencies) {
+                if (Array.isArray(androidConfig.dependencies)) {
+                    pluginDependencies = androidConfig.dependencies.filter((dep) => typeof dep === "string");
+                    if (pluginDependencies && pluginDependencies.length > 0) {
+                        logs.push(`找到插件依赖: ${pluginDependencies.join(", ")}`);
+                    }
+                }
+                else {
+                    logs.push(`警告: android.dependencies 不是数组类型`);
+                }
+            }
+            else {
+                logs.push(`调试: androidConfig.dependencies 不存在，androidConfig=${JSON.stringify(androidConfig)}`);
+            }
             const moduleConfig = {
                 name: pluginName,
                 libFiles: libFiles,
-                manifestModifications: manifestModifications.length > 0 ? manifestModifications : undefined
+                gradleDependencies: pluginDependencies,
+                manifestModifications: manifestModifications.length > 0 ? manifestModifications : undefined,
             };
             const thirdPartyResult = await integrateThirdPartyModule(projectPath, moduleDir, packageName, moduleConfig, deps);
             logs.push(...thirdPartyResult.logs);
@@ -453,15 +488,15 @@ export async function integrateUniAppNativePlugin(projectPath, moduleDir, packag
                 return {
                     success: false,
                     error: thirdPartyResult.error,
-                    logs
+                    logs,
                 };
             }
         }
         else {
-            logs.push('步骤 5: 跳过（未找到库文件）');
+            logs.push("步骤 5: 跳过（未找到库文件）");
         }
-        logs.push('步骤 6: 拷贝 android 目录下的其他文件');
-        const androidDir = deps.join(pluginDir, 'android');
+        logs.push("步骤 6: 拷贝 android 目录下的其他文件");
+        const androidDir = deps.join(pluginDir, "android");
         if (deps.existsSync(androidDir)) {
             const copiedFiles = copyAndroidFilesRecursive(androidDir, projectPath, moduleDir, packageName, androidLibFiles, deps);
             logs.push(...copiedFiles.logs);
@@ -470,41 +505,98 @@ export async function integrateUniAppNativePlugin(projectPath, moduleDir, packag
             }
         }
         else {
-            logs.push('android 目录不存在，跳过其他文件拷贝');
+            logs.push("android 目录不存在，跳过其他文件拷贝");
+        }
+        logs.push("步骤 7: 更新 dcloud_uniplugins.json 配置");
+        const assetsDir = deps.join(projectPath, moduleDir, "src", "main", "assets");
+        let plugins = null;
+        const androidConfig = packageJson._dp_nativeplugin?.android;
+        if (androidConfig?.plugins && Array.isArray(androidConfig.plugins)) {
+            plugins = androidConfig.plugins;
+        }
+        if (plugins && plugins.length > 0) {
+            for (const plugin of plugins) {
+                if (plugin.type === "module" && plugin.name && plugin.class) {
+                    const pluginItem = {
+                        type: plugin.type,
+                        name: plugin.name,
+                        class: plugin.class,
+                    };
+                    const updateResult = updateUniPluginsConfig(assetsDir, pluginItem, {
+                        existsSync: deps.existsSync,
+                        readFileSync: deps.readFileSync,
+                        writeFileSync: deps.writeFileSync,
+                        mkdirSync: deps.mkdirSync,
+                        join: deps.join,
+                        parse: deps.parse,
+                    });
+                    if (updateResult.success) {
+                        logs.push(updateResult.message || `已添加插件配置: ${pluginItem.name}`);
+                    }
+                    else {
+                        logs.push(`警告: 添加插件 ${pluginItem.name} 配置失败: ${updateResult.error}`);
+                    }
+                }
+            }
+            logs.push(`dcloud_uniplugins.json 配置完成，共添加 ${plugins.filter((p) => p.type === "module" && p.name && p.class)
+                .length} 个插件`);
         }
-        if (pluginItem) {
-            logs.push('步骤 7: 更新 dcloud_uniplugins.json 配置');
-            const assetsDir = deps.join(projectPath, moduleDir, 'src', 'main', 'assets');
+        else if (pluginItem) {
             const updateResult = updateUniPluginsConfig(assetsDir, pluginItem, {
                 existsSync: deps.existsSync,
                 readFileSync: deps.readFileSync,
                 writeFileSync: deps.writeFileSync,
                 mkdirSync: deps.mkdirSync,
                 join: deps.join,
-                parse: deps.parse
+                parse: deps.parse,
             });
             if (updateResult.success) {
-                logs.push(updateResult.message || 'dcloud_uniplugins.json 配置完成');
+                logs.push(updateResult.message || "dcloud_uniplugins.json 配置完成");
             }
             else {
                 logs.push(`警告: dcloud_uniplugins.json 配置失败: ${updateResult.error}`);
             }
         }
         else {
-            logs.push('步骤 7: 跳过 dcloud_uniplugins.json 配置（插件配置提取失败）');
+            logs.push("步骤 7: 跳过 dcloud_uniplugins.json 配置（插件配置提取失败）");
+        }
+        logs.push("步骤 8: 清理临时文件");
+        try {
+            if (deps.existsSync(tempDir)) {
+                deps.exec(`rm -rf "${tempDir}"`, (error) => {
+                    if (error) {
+                        logs.push(`警告: 清理临时目录失败: ${tempDir}`);
+                    }
+                    else {
+                        logs.push(`已清理临时目录: ${tempDir}`);
+                    }
+                });
+            }
+        }
+        catch (cleanupError) {
+            logs.push(`警告: 清理临时文件时出错: ${cleanupError instanceof Error
+                ? cleanupError.message
+                : String(cleanupError)}`);
         }
         logs.push(`UniApp 原生插件集成完成: ${pluginName}`);
         return {
             success: true,
             message: `成功集成 UniApp 原生插件: ${pluginName}`,
-            logs
+            logs,
         };
     }
     catch (error) {
+        try {
+            const tempDir = deps.join(projectPath, ".temp");
+            if (deps.existsSync(tempDir)) {
+                deps.exec(`rm -rf "${tempDir}"`, () => { });
+            }
+        }
+        catch { }
         return {
             success: false,
             error: `集成 UniApp 原生插件失败: ${error instanceof Error ? error.message : String(error)}`,
-            logs
+            logs,
         };
     }
 }