zcw-shared 1.38.2 → 1.40.1

package/dist/functions/ios/modifyInfoPlistKeyValue.js

@@ -0,0 +1,45 @@
+export function modifyInfoPlistKeyValue(xmlDoc, keyName, value, valueType = 'string') {
+    const dictElement = xmlDoc.getElementsByTagName('dict')[0];
+    if (!dictElement)
+        return false;
+    const childNodes = Array.from(dictElement.childNodes || []).filter((node) => node.nodeType === 1);
+    let found = false;
+    for (let i = 0; i < childNodes.length; i++) {
+        const node = childNodes[i];
+        if (node.nodeName === 'key' && node.textContent === keyName) {
+            if (i + 1 < childNodes.length) {
+                const valueNode = childNodes[i + 1];
+                if (valueType === 'string' && valueNode.nodeName === 'string') {
+                    valueNode.textContent = String(value);
+                    found = true;
+                }
+                else if ((valueType === 'true' || valueType === 'false') && (valueNode.nodeName === 'true' || valueNode.nodeName === 'false')) {
+                    const newElement = xmlDoc.createElement(valueType);
+                    const parentNode = valueNode.parentNode;
+                    if (parentNode && 'replaceChild' in parentNode) {
+                        parentNode.replaceChild(newElement, valueNode);
+                    }
+                    found = true;
+                }
+            }
+            break;
+        }
+    }
+    if (!found) {
+        const keyElement = xmlDoc.createElement('key');
+        keyElement.textContent = keyName;
+        let valueElement;
+        if (valueType === 'string') {
+            valueElement = xmlDoc.createElement('string');
+            valueElement.textContent = String(value);
+        }
+        else {
+            valueElement = xmlDoc.createElement(valueType);
+        }
+        dictElement.appendChild(keyElement);
+        dictElement.appendChild(valueElement);
+        found = true;
+    }
+    return found;
+}
+//# sourceMappingURL=modifyInfoPlistKeyValue.js.map

package/dist/functions/ios/modifyInfoPlistKeyValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modifyInfoPlistKeyValue.js","sourceRoot":"","sources":["../../../src/functions/ios/modifyInfoPlistKeyValue.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,uBAAuB,CACrC,MAAmB,EACnB,OAAe,EACf,KAAuB,EACvB,YAAyC,QAAQ;IAEjD,MAAM,WAAW,GAAG,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAe,CAAA;IACxE,IAAI,CAAC,WAAW;QAAE,OAAO,KAAK,CAAA;IAI9B,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAChE,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,CAAC,CACnB,CAAA;IAEjB,IAAI,KAAK,GAAG,KAAK,CAAA;IAEjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;QAC1B,IAAI,IAAI,CAAC,QAAQ,KAAK,KAAK,IAAI,IAAI,CAAC,WAAW,KAAK,OAAO,EAAE,CAAC;YAE5D,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;gBAC9B,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;gBACnC,IAAI,SAAS,KAAK,QAAQ,IAAI,SAAS,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC9D,SAAS,CAAC,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;oBACrC,KAAK,GAAG,IAAI,CAAA;gBACd,CAAC;qBAAM,IAAI,CAAC,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,KAAK,MAAM,IAAI,SAAS,CAAC,QAAQ,KAAK,OAAO,CAAC,EAAE,CAAC;oBAEhI,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;oBAClD,MAAM,UAAU,GAAG,SAAS,CAAC,UAA+B,CAAA;oBAC5D,IAAI,UAAU,IAAI,cAAc,IAAI,UAAU,EAAE,CAAC;wBAC9C,UAAkB,CAAC,YAAY,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;oBACzD,CAAC;oBACD,KAAK,GAAG,IAAI,CAAA;gBACd,CAAC;YACH,CAAC;YACD,MAAK;QACP,CAAC;IACH,CAAC;IAGD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;QAC9C,UAAU,CAAC,WAAW,GAAG,OAAO,CAAA;QAChC,IAAI,YAAwB,CAAA;QAC5B,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC3B,YAAY,GAAG,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;YAC7C,YAAY,CAAC,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QAC1C,CAAC;aAAM,CAAC;YACN,YAAY,GAAG,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAChD,CAAC;QACD,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;QACnC,WAAW,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;QACrC,KAAK,GAAG,IAAI,CAAA;IACd,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}

package/dist/functions/ios/safelyModifyProjectPbxproj.d.ts

@@ -0,0 +1,16 @@
+import type { FileSystem } from '../../../references/node.d';
+export declare function safelyModifyProjectPbxproj(projectPbxprojPath: string, options: {
+    bundleId?: string;
+    version?: string;
+    buildNumber?: string;
+    teamId?: string;
+    codeSignIdentity?: string;
+    clearProvisioningProfile?: boolean;
+}, deps: {
+    existsSync: FileSystem['existsSync'];
+    readFileSync: FileSystem['readFileSync'];
+    writeFileSync: FileSystem['writeFileSync'];
+}): {
+    success: boolean;
+    error?: string;
+};

package/dist/functions/ios/safelyModifyProjectPbxproj.js

@@ -0,0 +1,87 @@
+export function safelyModifyProjectPbxproj(projectPbxprojPath, options, deps) {
+    try {
+        if (!deps.existsSync(projectPbxprojPath)) {
+            return { success: false, error: `project.pbxproj 文件不存在: ${projectPbxprojPath}` };
+        }
+        let content = deps.readFileSync(projectPbxprojPath, 'utf8');
+        let modified = false;
+        const checkAndReplace = (regex, newValue) => {
+            const match = content.match(regex);
+            if (match) {
+                const currentValue = match[0].replace(/^\s*\w+\s*=\s*/, '').replace(/;\s*$/, '').replace(/^["']|["']$/g, '');
+                if (currentValue !== newValue) {
+                    content = content.replace(regex, newValue);
+                    return true;
+                }
+            }
+            return false;
+        };
+        if (options.bundleId) {
+            const bundleIdRegex = /PRODUCT_BUNDLE_IDENTIFIER\s*=\s*[^;]+;/g;
+            if (checkAndReplace(bundleIdRegex, `PRODUCT_BUNDLE_IDENTIFIER = ${options.bundleId};`)) {
+                modified = true;
+            }
+        }
+        if (options.version) {
+            const marketingVersionRegex = /MARKETING_VERSION\s*=\s*[^;]+;/g;
+            if (checkAndReplace(marketingVersionRegex, `MARKETING_VERSION = ${options.version};`)) {
+                modified = true;
+            }
+        }
+        if (options.buildNumber) {
+            const currentProjectVersionRegex = /CURRENT_PROJECT_VERSION\s*=\s*[^;]+;/g;
+            if (checkAndReplace(currentProjectVersionRegex, `CURRENT_PROJECT_VERSION = ${options.buildNumber};`)) {
+                modified = true;
+            }
+        }
+        if (options.teamId) {
+            const devTeamRegex = /DEVELOPMENT_TEAM\s*=\s*[^;]+;/g;
+            if (checkAndReplace(devTeamRegex, `DEVELOPMENT_TEAM = ${options.teamId};`)) {
+                modified = true;
+            }
+            const devTeamSdkRegex = /"DEVELOPMENT_TEAM\[sdk=iphoneos\*\]"\s*=\s*[^;]+;/g;
+            if (checkAndReplace(devTeamSdkRegex, `"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ${options.teamId};`)) {
+                modified = true;
+            }
+        }
+        if (options.codeSignIdentity) {
+            const identity = options.codeSignIdentity;
+            const codeSignIdentityRegex = /CODE_SIGN_IDENTITY\s*=\s*"[^"]*";/g;
+            if (checkAndReplace(codeSignIdentityRegex, `CODE_SIGN_IDENTITY = "${identity}";`)) {
+                modified = true;
+            }
+            const codeSignIdentitySdkRegex = /"CODE_SIGN_IDENTITY\[sdk=iphoneos\*\]"\s*=\s*"[^"]*";/g;
+            if (checkAndReplace(codeSignIdentitySdkRegex, `"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "${identity}";`)) {
+                modified = true;
+            }
+        }
+        if (options.clearProvisioningProfile !== false) {
+            const provProfileRegex = /PROVISIONING_PROFILE\s*=\s*"[^"]*";/g;
+            if (provProfileRegex.test(content)) {
+                content = content.replace(provProfileRegex, `PROVISIONING_PROFILE = "";`);
+                modified = true;
+            }
+            const provProfileSpecifierRegex = /PROVISIONING_PROFILE_SPECIFIER\s*=\s*"[^"]*";/g;
+            if (provProfileSpecifierRegex.test(content)) {
+                content = content.replace(provProfileSpecifierRegex, `PROVISIONING_PROFILE_SPECIFIER = "";`);
+                modified = true;
+            }
+            const provProfileSpecifierSdkRegex = /"PROVISIONING_PROFILE_SPECIFIER\[sdk=iphoneos\*\]"\s*=\s*"[^"]*";/g;
+            if (provProfileSpecifierSdkRegex.test(content)) {
+                content = content.replace(provProfileSpecifierSdkRegex, `"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "";`);
+                modified = true;
+            }
+        }
+        if (modified) {
+            deps.writeFileSync(projectPbxprojPath, content, 'utf8');
+        }
+        return { success: true };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: `修改 project.pbxproj 失败: ${error instanceof Error ? error.message : String(error)}`
+        };
+    }
+}
+//# sourceMappingURL=safelyModifyProjectPbxproj.js.map

package/dist/functions/ios/safelyModifyProjectPbxproj.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"safelyModifyProjectPbxproj.js","sourceRoot":"","sources":["../../../src/functions/ios/safelyModifyProjectPbxproj.ts"],"names":[],"mappings":"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"}

package/dist/functions/uniapp/app-plus/buildAndroidApp.d.ts

@@ -27,3 +27,4 @@ export interface BuildAndroidAppDeps {
     sharp?: Sharp;
 }
 export declare function buildAndroidApp(options: UniAppAndroidBuildOptions, deps: BuildAndroidAppDeps): Promise<UniAppAndroidBuildResult>;
+export { buildAndroidPlugin } from './buildAndroidPlugin';

package/dist/functions/uniapp/app-plus/buildAndroidApp.js

@@ -98,66 +98,47 @@ export async function buildAndroidApp(options, deps) {
             };
         }
         logs.push('配置 AndroidManifest.xml');
-        const manifestModifications = [];
-        const shouldFixAndroidNamespace = options.fixAndroidNamespace !== false;
-        if (shouldFixAndroidNamespace) {
-            manifestModifications.push({
-                xpath: "//manifest",
-                action: 'setAttribute',
-                attributeName: 'xmlns:android',
-                value: 'http://schemas.android.com/apk/res/android'
-            });
-            logs.push('已添加 xmlns:android 命名空间声明');
-        }
-        else {
-            logs.push('跳过 xmlns:android 命名空间修复');
-        }
-        const shouldResolveAllowBackupConflict = options.resolveAllowBackupConflict !== false;
-        if (shouldResolveAllowBackupConflict) {
-            manifestModifications.push({
-                xpath: "//manifest",
-                action: 'setAttribute',
-                attributeName: 'xmlns:tools',
-                value: 'http://schemas.android.com/tools'
-            });
-            manifestModifications.push({
-                xpath: "//application",
-                action: 'setAttribute',
-                attributeName: 'tools:replace',
-                value: 'android:allowBackup'
-            });
-            logs.push('已添加 allowBackup 冲突解决方案');
-        }
-        else {
-            logs.push('跳过 allowBackup 冲突解决方案');
-        }
-        manifestModifications.push({
-            xpath: "//meta-data[@android:name='DCLOUD_STREAMAPP_CHANNEL']",
-            action: 'removeElement'
-        });
-        manifestModifications.push({
-            xpath: "//application",
-            action: 'addElement',
-            elementName: 'meta-data',
-            attributes: {
-                'android:name': 'DCLOUD_STREAMAPP_CHANNEL',
-                'android:value': 'google'
+        const checkElementExists = (manifestPath, xpath) => {
+            if (!deps.existsSync(manifestPath))
+                return false;
+            try {
+                const xmlContent = deps.readFileSync(manifestPath, 'utf8');
+                const parser = new deps.xmlParser();
+                const xmlDoc = parser.parseFromString(xmlContent, 'text/xml');
+                const select = deps.xpath.useNamespaces({
+                    'android': 'http://schemas.android.com/apk/res/android',
+                    'tools': 'http://schemas.android.com/tools'
+                });
+                const result = select(xpath, xmlDoc);
+                return Array.isArray(result) ? result.length > 0 : result !== null && result !== undefined;
             }
-        });
-        if (options.appkey) {
-            manifestModifications.push({
-                xpath: "//meta-data[@android:name='dcloud_appkey']",
-                action: 'removeElement'
-            }, {
-                xpath: "//application",
-                action: 'addElement',
-                elementName: 'meta-data',
-                attributes: {
-                    'android:name': 'dcloud_appkey',
-                    'android:value': options.appkey
+            catch {
+                return false;
+            }
+        };
+        const checkAttributeExists = (manifestPath, xpath, attrName, attrValue) => {
+            if (!deps.existsSync(manifestPath))
+                return false;
+            try {
+                const xmlContent = deps.readFileSync(manifestPath, 'utf8');
+                const parser = new deps.xmlParser();
+                const xmlDoc = parser.parseFromString(xmlContent, 'text/xml');
+                const select = deps.xpath.useNamespaces({
+                    'android': 'http://schemas.android.com/apk/res/android',
+                    'tools': 'http://schemas.android.com/tools'
+                });
+                const elements = select(xpath, xmlDoc);
+                if (Array.isArray(elements) && elements.length > 0) {
+                    const element = elements[0];
+                    const existingValue = element.getAttribute(attrName);
+                    return existingValue === attrValue;
                 }
-            });
-        }
+                return false;
+            }
+            catch {
+                return false;
+            }
+        };
         const allModules = detectAllAndroidModules(options.projectPath, {
             readdirSync: deps.readdirSync,
             statSync: deps.statSync,
@@ -166,43 +147,91 @@ export async function buildAndroidApp(options, deps) {
         });
         logs.push(`检测到 ${allModules.length} 个Android模块: ${allModules.join(', ')}`);
         let manifestConfigured = false;
-        for (const moduleDir of allModules) {
+        const modulesToProcess = allModules.length > 0 ? allModules : [projectStructure.moduleDir];
+        for (const moduleDir of modulesToProcess) {
             const manifestPath = deps.join(options.projectPath, moduleDir, 'src', 'main', 'AndroidManifest.xml');
-            const manifestResult = await modifyManifest(manifestPath, manifestModifications, {
-                existsSync: deps.existsSync,
-                readFileSync: deps.readFileSync,
-                writeFileSync: deps.writeFileSync,
-                xmlParser: deps.xmlParser,
-                xmlSerializer: deps.xmlSerializer,
-                xpath: deps.xpath
-            });
-            if (manifestResult.success) {
-                logs.push(`${moduleDir} 模块的 AndroidManifest.xml 配置完成`);
-                manifestConfigured = true;
+            const moduleModifications = [];
+            const shouldFixAndroidNamespace = options.fixAndroidNamespace !== false;
+            if (shouldFixAndroidNamespace) {
+                if (!checkAttributeExists(manifestPath, "//manifest", 'xmlns:android', 'http://schemas.android.com/apk/res/android')) {
+                    moduleModifications.push({
+                        xpath: "//manifest",
+                        action: 'setAttribute',
+                        attributeName: 'xmlns:android',
+                        value: 'http://schemas.android.com/apk/res/android'
+                    });
+                }
             }
-            else {
-                logs.push(`${moduleDir} 模块的 AndroidManifest.xml 配置失败: ${manifestResult.error}`);
+            const shouldResolveAllowBackupConflict = options.resolveAllowBackupConflict !== false;
+            if (shouldResolveAllowBackupConflict) {
+                if (!checkAttributeExists(manifestPath, "//manifest", 'xmlns:tools', 'http://schemas.android.com/tools')) {
+                    moduleModifications.push({
+                        xpath: "//manifest",
+                        action: 'setAttribute',
+                        attributeName: 'xmlns:tools',
+                        value: 'http://schemas.android.com/tools'
+                    });
+                }
+                if (!checkAttributeExists(manifestPath, "//application", 'tools:replace', 'android:allowBackup')) {
+                    moduleModifications.push({
+                        xpath: "//application",
+                        action: 'setAttribute',
+                        attributeName: 'tools:replace',
+                        value: 'android:allowBackup'
+                    });
+                }
+                if (!checkAttributeExists(manifestPath, "//application", 'android:allowBackup', 'true')) {
+                    moduleModifications.push({
+                        xpath: "//application",
+                        action: 'setAttribute',
+                        attributeName: 'android:allowBackup',
+                        value: 'true'
+                    });
+                }
             }
-        }
-        if (allModules.length === 0) {
-            const manifestPath = deps.join(options.projectPath, projectStructure.moduleDir, 'src', 'main', 'AndroidManifest.xml');
-            const manifestResult = await modifyManifest(manifestPath, manifestModifications, {
-                existsSync: deps.existsSync,
-                readFileSync: deps.readFileSync,
-                writeFileSync: deps.writeFileSync,
-                xmlParser: deps.xmlParser,
-                xmlSerializer: deps.xmlSerializer,
-                xpath: deps.xpath
-            });
-            if (!manifestResult.success) {
-                return {
-                    success: false,
-                    error: `配置 AndroidManifest.xml 失败: ${manifestResult.error}`,
-                    logs
-                };
+            if (!checkElementExists(manifestPath, "//meta-data[@android:name='DCLOUD_STREAMAPP_CHANNEL']")) {
+                moduleModifications.push({
+                    xpath: "//application",
+                    action: 'addElement',
+                    elementName: 'meta-data',
+                    attributes: {
+                        'android:name': 'DCLOUD_STREAMAPP_CHANNEL',
+                        'android:value': 'google'
+                    }
+                });
+            }
+            if (options.appkey && !checkElementExists(manifestPath, "//meta-data[@android:name='dcloud_appkey']")) {
+                moduleModifications.push({
+                    xpath: "//application",
+                    action: 'addElement',
+                    elementName: 'meta-data',
+                    attributes: {
+                        'android:name': 'dcloud_appkey',
+                        'android:value': options.appkey
+                    }
+                });
+            }
+            if (moduleModifications.length > 0) {
+                const manifestResult = await modifyManifest(manifestPath, moduleModifications, {
+                    existsSync: deps.existsSync,
+                    readFileSync: deps.readFileSync,
+                    writeFileSync: deps.writeFileSync,
+                    xmlParser: deps.xmlParser,
+                    xmlSerializer: deps.xmlSerializer,
+                    xpath: deps.xpath
+                });
+                if (manifestResult.success) {
+                    logs.push(`${moduleDir} 模块的 AndroidManifest.xml 配置完成（应用了 ${moduleModifications.length} 个修改）`);
+                    manifestConfigured = true;
+                }
+                else {
+                    logs.push(`${moduleDir} 模块的 AndroidManifest.xml 配置失败: ${manifestResult.error}`);
+                }
+            }
+            else {
+                logs.push(`${moduleDir} 模块的 AndroidManifest.xml 无需修改（所有配置已存在）`);
+                manifestConfigured = true;
             }
-            logs.push('AndroidManifest.xml 配置完成');
-            manifestConfigured = true;
         }
         if (!manifestConfigured) {
             return {
@@ -307,9 +336,21 @@ export async function buildAndroidApp(options, deps) {
                     const hbuilderElements = xmlDoc.getElementsByTagName('hbuilder');
                     if (hbuilderElements.length > 0) {
                         const hbuilderElement = hbuilderElements[0];
-                        hbuilderElement.setAttribute('debug', 'true');
-                        hbuilderElement.setAttribute('syncDebug', 'true');
-                        logs.push('已添加自定义基座配置：debug="true" syncDebug="true"');
+                        let hasChanges = false;
+                        if (hbuilderElement.getAttribute('debug') !== 'true') {
+                            hbuilderElement.setAttribute('debug', 'true');
+                            hasChanges = true;
+                        }
+                        if (hbuilderElement.getAttribute('syncDebug') !== 'true') {
+                            hbuilderElement.setAttribute('syncDebug', 'true');
+                            hasChanges = true;
+                        }
+                        if (hasChanges) {
+                            logs.push('已添加自定义基座配置：debug="true" syncDebug="true"');
+                        }
+                        else {
+                            logs.push('自定义基座配置已存在，无需修改');
+                        }
                     }
                     else {
                         logs.push('警告：未找到 hbuilder 根节点，无法添加自定义基座配置');
@@ -319,23 +360,55 @@ export async function buildAndroidApp(options, deps) {
                 if (appsElements.length > 0) {
                     const appsElement = appsElements[0];
                     const existingAppElements = appsElement.getElementsByTagName('app');
-                    while (existingAppElements.length > 0) {
-                        appsElement.removeChild(existingAppElements[0]);
+                    let appExists = false;
+                    let hasChanges = false;
+                    for (let i = 0; i < existingAppElements.length; i++) {
+                        const appElement = existingAppElements[i];
+                        if (appElement.getAttribute('appid') === manifest.appid) {
+                            appExists = true;
+                            if (appElement.getAttribute('appver') !== '') {
+                                appElement.setAttribute('appver', '');
+                                hasChanges = true;
+                            }
+                            if (options.appkey && appElement.getAttribute('appkey') !== options.appkey) {
+                                appElement.setAttribute('appkey', options.appkey);
+                                hasChanges = true;
+                                logs.push(`更新 appkey: ${options.appkey}`);
+                            }
+                            if (hasChanges) {
+                                logs.push(`更新现有 app 元素，appid: ${manifest.appid}`);
+                            }
+                            else {
+                                logs.push(`app 元素已存在且配置正确，appid: ${manifest.appid}`);
+                            }
+                            break;
+                        }
+                    }
+                    if (!appExists) {
+                        while (existingAppElements.length > 0) {
+                            appsElement.removeChild(existingAppElements[0]);
+                        }
+                        logs.push('已删除所有现有的 app 元素');
+                        const newAppElement = xmlDoc.createElement('app');
+                        newAppElement.setAttribute('appid', manifest.appid);
+                        newAppElement.setAttribute('appver', '');
+                        if (options.appkey) {
+                            newAppElement.setAttribute('appkey', options.appkey);
+                            logs.push(`设置 appkey: ${options.appkey}`);
+                        }
+                        appsElement.appendChild(newAppElement);
+                        logs.push(`添加新的 app 元素，appid: ${manifest.appid}`);
+                        hasChanges = true;
                     }
-                    logs.push('已删除所有现有的 app 元素');
-                    const newAppElement = xmlDoc.createElement('app');
-                    newAppElement.setAttribute('appid', manifest.appid);
-                    newAppElement.setAttribute('appver', '');
-                    if (options.appkey) {
-                        newAppElement.setAttribute('appkey', options.appkey);
-                        logs.push(`设置 appkey: ${options.appkey}`);
+                    if (hasChanges || !appExists) {
+                        const serializer = new deps.xmlSerializer();
+                        const newXmlContent = serializer.serializeToString(xmlDoc);
+                        deps.writeFileSync(dcloudControlXmlPath, newXmlContent, 'utf8');
+                        logs.push('dcloud_control.xml 配置完成');
+                    }
+                    else {
+                        logs.push('dcloud_control.xml 无需修改');
                     }
-                    appsElement.appendChild(newAppElement);
-                    logs.push(`添加新的 app 元素，appid: ${manifest.appid}`);
-                    const serializer = new deps.xmlSerializer();
-                    const newXmlContent = serializer.serializeToString(xmlDoc);
-                    deps.writeFileSync(dcloudControlXmlPath, newXmlContent, 'utf8');
-                    logs.push('dcloud_control.xml 配置完成');
                 }
                 else {
                     logs.push('dcloud_control.xml 中未找到 apps 元素');
@@ -380,8 +453,13 @@ export async function buildAndroidApp(options, deps) {
                         logs.push(`创建 libs 目录: ${libsDir}`);
                     }
                     const targetPath = deps.join(libsDir, 'debug-server-release.aar');
-                    deps.copyFileSync(debugServerAarPath, targetPath);
-                    logs.push(`已复制 debug-server-release.aar: ${debugServerAarPath} -> ${targetPath}`);
+                    if (deps.existsSync(targetPath)) {
+                        logs.push(`debug-server-release.aar 已存在，跳过复制: ${targetPath}`);
+                    }
+                    else {
+                        deps.copyFileSync(debugServerAarPath, targetPath);
+                        logs.push(`已复制 debug-server-release.aar: ${debugServerAarPath} -> ${targetPath}`);
+                    }
                 }
             }
             catch (error) {
@@ -729,4 +807,5 @@ export async function buildAndroidApp(options, deps) {
         };
     }
 }
+export { buildAndroidPlugin } from './buildAndroidPlugin';
 //# sourceMappingURL=buildAndroidApp.js.map