vite-uni-dev-tool 0.0.48 → 1.0.0

package/dist/v3/hooks/useNFC/useNFCAndroid.ts

@@ -16,48 +16,36 @@ import {
   generateWSCBytesForAndroid,
 } from './utils';
 
-const NfcAdapter: any = plus.android.importClass('android.nfc.NfcAdapter');
-const Context = plus.android.importClass('android.content.Context');
-const Tag = plus.android.importClass('android.nfc.Tag');
-const Ndef: any = plus.android.importClass('android.nfc.tech.Ndef');
-const NfcA: any = plus.android.importClass('android.nfc.tech.NfcA');
-const NfcB: any = plus.android.importClass('android.nfc.tech.NfcB');
-const NfcF: any = plus.android.importClass('android.nfc.tech.NfcF');
-const NfcV: any = plus.android.importClass('android.nfc.tech.NfcV');
-const NdefFormat = plus.android.importClass('android.nfc.tech.NdefFormat');
-const NdefFormatable: any = plus.android.importClass(
-  'android.nfc.tech.NdefFormatable',
-);
-const MifareClassic: any = plus.android.importClass(
-  'android.nfc.tech.MifareClassic',
-);
-const MifareUltralight: any = plus.android.importClass(
-  'android.nfc.tech.MifareUltralight',
-);
-const IsoDep: any = plus.android.importClass('android.nfc.tech.IsoDep');
-const Intent: any = plus.android.importClass('android.content.Intent');
-const PendingIntent: any = plus.android.importClass(
-  'android.app.PendingIntent',
-);
-const IntentFilter: any = plus.android.importClass(
-  'android.content.IntentFilter',
-);
-const Settings: any = plus.android.importClass('android.provider.Settings');
-/**
- * https://developer.android.google.cn/reference/kotlin/android/nfc/NdefRecord?hl=en
- */
-const NdefRecord: any = plus.android.importClass('android.nfc.NdefRecord');
-const NdefMessage: any = plus.android.importClass('android.nfc.NdefMessage');
-
-const INTENT_FLAGS_SINGLE_TOP = Intent.FLAG_ACTIVITY_SINGLE_TOP;
-const PENDING_INTENT_FLAGS = PendingIntent.FLAG_MUTABLE;
-
-const EXTRA_NDEF_MESSAGES = NfcAdapter.EXTRA_NDEF_MESSAGES;
-const EXTRA_ID = NfcAdapter.EXTRA_ID;
-const EXTRA_TAG = NfcAdapter.EXTRA_TAG;
-
-const TNF_MIME_MEDIA = NdefRecord.TNF_MIME_MEDIA;
-const ACTION_NFC_SETTINGS = Settings.ACTION_NFC_SETTINGS;
+// 声明变量，但不立即初始化
+let NfcAdapter: any;
+let _Context: any;
+let _Tag: any;
+let Ndef: any;
+let NfcA: any;
+let NfcB: any;
+let NfcF: any;
+let NfcV: any;
+let _NdefFormat: any;
+let NdefFormatable: any;
+let MifareClassic: any;
+let MifareUltralight: any;
+let IsoDep: any;
+let Intent: any;
+let PendingIntent: any;
+let IntentFilter: any;
+let Settings: any;
+let NdefRecord: any;
+let NdefMessage: any;
+
+let INTENT_FLAGS_SINGLE_TOP: any;
+let PENDING_INTENT_FLAGS: any;
+let EXTRA_NDEF_MESSAGES: any;
+let EXTRA_ID: any;
+let EXTRA_TAG: any;
+let _TNF_MIME_MEDIA: any;
+let _ACTION_NFC_SETTINGS: any;
+
+let NFC_INTENT_FILTERS: any[] = [];
 
 const NFC_TECH_LISTS = [
   ['android.nfc.tech.Ndef'],
@@ -71,11 +59,54 @@ const NFC_TECH_LISTS = [
   ['android.nfc.tech.MifareUltralight'],
 ];
 
-const NFC_INTENT_FILTERS = [
-  NfcAdapter.ACTION_NDEF_DISCOVERED,
-  NfcAdapter.ACTION_TECH_DISCOVERED,
-  NfcAdapter.ACTION_TAG_DISCOVERED,
-];
+// 初始化 Android 类
+function initAndroidClasses() {
+  try {
+    if (NfcAdapter) return; // 避免重复初始化
+
+    NfcAdapter = plus.android.importClass('android.nfc.NfcAdapter');
+    _Context = plus.android.importClass('android.content.Context');
+    _Tag = plus.android.importClass('android.nfc.Tag');
+    Ndef = plus.android.importClass('android.nfc.tech.Ndef');
+    NfcA = plus.android.importClass('android.nfc.tech.NfcA');
+    NfcB = plus.android.importClass('android.nfc.tech.NfcB');
+    NfcF = plus.android.importClass('android.nfc.tech.NfcF');
+    NfcV = plus.android.importClass('android.nfc.tech.NfcV');
+    _NdefFormat = plus.android.importClass('android.nfc.tech.NdefFormat');
+    NdefFormatable = plus.android.importClass(
+      'android.nfc.tech.NdefFormatable',
+    );
+    MifareClassic = plus.android.importClass('android.nfc.tech.MifareClassic');
+    MifareUltralight = plus.android.importClass(
+      'android.nfc.tech.MifareUltralight',
+    );
+    IsoDep = plus.android.importClass('android.nfc.tech.IsoDep');
+    Intent = plus.android.importClass('android.content.Intent');
+    PendingIntent = plus.android.importClass('android.app.PendingIntent');
+    IntentFilter = plus.android.importClass('android.content.IntentFilter');
+    Settings = plus.android.importClass('android.provider.Settings');
+    NdefRecord = plus.android.importClass('android.nfc.NdefRecord');
+    NdefMessage = plus.android.importClass('android.nfc.NdefMessage');
+
+    INTENT_FLAGS_SINGLE_TOP = Intent.FLAG_ACTIVITY_SINGLE_TOP;
+    PENDING_INTENT_FLAGS = PendingIntent.FLAG_MUTABLE;
+
+    EXTRA_NDEF_MESSAGES = NfcAdapter.EXTRA_NDEF_MESSAGES;
+    EXTRA_ID = NfcAdapter.EXTRA_ID;
+    EXTRA_TAG = NfcAdapter.EXTRA_TAG;
+
+    _TNF_MIME_MEDIA = NdefRecord.TNF_MIME_MEDIA;
+    _ACTION_NFC_SETTINGS = Settings.ACTION_NFC_SETTINGS;
+
+    NFC_INTENT_FILTERS = [
+      NfcAdapter.ACTION_NDEF_DISCOVERED,
+      NfcAdapter.ACTION_TECH_DISCOVERED,
+      NfcAdapter.ACTION_TAG_DISCOVERED,
+    ];
+  } catch (e) {
+    console.error('Core: initAndroidClasses error', e);
+  }
+}
 
 export default function useNFCAndroid(
   listener: NFC.Listener,
@@ -98,9 +129,20 @@ export default function useNFCAndroid(
   });
 
   /** ndef 写入方式比较特殊，需要特殊处理 */
-  let isNdef = ref(false);
+  const isNdef = ref(false);
+
+  // 延迟获取 mainActivity，确保 plus 已就绪
+  let mainActivity: any = null;
 
-  const mainActivity: any = plus.android.runtimeMainActivity();
+  onMounted(() => {
+    initAndroidClasses();
+    try {
+      mainActivity = plus.android.runtimeMainActivity();
+      initNfcAdapter();
+    } catch (e) {
+      console.error('Core: failed to init NFC adapter', e);
+    }
+  });
 
   let checkInterval: any = null;
 
@@ -333,8 +375,8 @@ export default function useNFCAndroid(
 
       // 可将改行去除
       uni?.__dev_tool_nfc_collection__?.(data.value);
-    } catch (error) {
-      console.log('error: ', error);
+    } catch (_error) {
+      console.log('error: ', _error);
     }
   }
 
@@ -361,7 +403,7 @@ export default function useNFCAndroid(
 
       // 3. 初始化成功，注册监听
       isSupportNFC.value = true;
-    } catch (error) {
+    } catch (_error) {
       isSupportNFC.value = false;
     }
   }
@@ -449,7 +491,7 @@ export default function useNFCAndroid(
       return Promise.reject({
         errMsg: '开始监听NFC',
       });
-    } catch (error) {
+    } catch (_error) {
       uni.showToast({ title: 'NFC 监听开启失败', icon: 'none' });
       isListening.value = false;
       return Promise.reject({
@@ -499,11 +541,11 @@ export default function useNFCAndroid(
       return Promise.resolve({
         errMsg: '停止监听NFC',
       });
-    } catch (error) {
+    } catch (_error) {
       uni.showToast({ title: 'NFC 监听停止失败', icon: 'error' });
       return Promise.resolve({
         errMsg: 'NFC 监听停止失败',
-        error,
+        error: _error,
       });
     }
   }
@@ -623,7 +665,7 @@ export default function useNFCAndroid(
       clearInterval(checkInterval);
       uni.showToast({ title: 'NFC 监听已移除', icon: 'none' });
       return true;
-    } catch (error) {
+    } catch (_error) {
       uni.showToast({ title: 'NFC 监听移除失败', icon: 'none' });
 
       return false;
@@ -631,146 +673,54 @@ export default function useNFCAndroid(
   }
 
   /**
-   *
-   * 非 ndef 数据写入
-   *
-   * TODO: 暂时无法提供通用的写入方法
-   *
-   * @param {ArrayBuffer} writeData
-   * @return {*}
+   * 确保 NFC 已连接
+   * @param checkNdef 是否检查 NDEF 支持
    */
-  function write(writeData: ArrayBuffer) {
-    if (isNdef.value) {
-      uni.showToast({
-        title: 'NDEF 请勿使用该方法',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: 'NDEF 请勿使用该方法',
-      });
+  function ensureConnected(checkNdef = false) {
+    if (checkNdef && !isNdef.value) {
+      uni.showToast({ title: 'NFC 标签不支持 NDEF', icon: 'none' });
+      throw { errMsg: 'NFC 标签不支持 NDEF' };
     }
-
     if (!nfcInstance) {
-      uni.showToast({
-        title: '请先建立连接',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: '请先建立连接',
-      });
+      uni.showToast({ title: '请先建立连接', icon: 'none' });
+      throw { errMsg: '请先建立连接' };
     }
-
     if (!isConnected.value) {
-      uni.showToast({
-        title: '请先建立连接',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: '请先建立连接',
-      });
-    }
-
-    uni.showToast({
-      title: '开始写入数据，请勿断开连接',
-      icon: 'none',
-    });
-
-    try {
-      nfcInstance.connect();
-      if (!nfcInstance.isWritable()) {
-        uni.showToast({ title: 'NFC 标签不允许写入', icon: 'none' });
-        nfcInstance.close();
-        return Promise.reject({
-          errMsg: 'NFC 标签不允许写入',
-        });
-      }
-      if (nfcInstance.getMaxTransceiveLength() < writeData.byteLength) {
-        uni.showToast({ title: '写入数据超出标签容量', icon: 'none' });
-        nfcInstance.close();
-        return Promise.reject({
-          errMsg: '写入数据超出标签容量',
-        });
-      }
-      const result = nfcInstance.transceive(writeData);
-      nfcInstance.close();
-      uni.showToast({ title: '数据写入成功', icon: 'none' });
-      return Promise.resolve({
-        errMsg: '数据写入成功',
-        data: result,
-      });
-    } catch (error) {
-      uni.showToast({ title: '数据写入失败', icon: 'none' });
-      return Promise.reject({
-        errMsg: '数据写入失败',
-        error,
-      });
+      uni.showToast({ title: '请先建立连接', icon: 'none' });
+      throw { errMsg: '请先建立连接' };
     }
   }
 
   /**
-   * 通用的 ndef 写入方法
-   *
-   * @param {NFC.NdefData} data
+   * 执行 NDEF 写入操作的通用流程
+   * @param createMessage 创建 NdefMessage 的函数
+   * @returns Promise
    */
-  function writeNdf(data: NFC.NdefRecord[]) {
-    if (!isNdef.value) {
-      uni.showToast({
-        title: 'NFC 标签不支持 NDEF',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: 'NFC 标签不支持 NDEF',
-      });
-    }
-
-    if (!nfcInstance) {
-      uni.showToast({
-        title: '请先建立连接',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: '请先建立连接',
-      });
-    }
+  async function executeNdefWrite(createMessage: () => any) {
+    try {
+      ensureConnected(true);
 
-    if (!isConnected.value) {
       uni.showToast({
-        title: '请先建立连接',
+        title: '开始写入数据，请勿断开连接',
         icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: '请先建立连接',
-      });
-    }
-
-    uni.showToast({
-      title: '开始写入数据，请勿断开连接',
-      icon: 'none',
-      duration: 3000,
-    });
-    try {
-      const records = data?.map((item) => {
-        const tnf = stringToBytes(item.tnf + '');
-        const id = item.id ? stringToBytes(item.id) : null;
-        const type = stringToBytes(item.type);
-
-        return new NdefRecord(tnf, type, id, item.payload);
+        duration: 3000,
       });
 
-      // 1. 构建 NDEF 消息
-      const message = new NdefMessage(records);
+      const message = createMessage();
 
+      // 容量检查
       if (maxTransceiveLength < message.getByteArrayLength()) {
         uni.showToast({
           title: '写入数据超出标签容量',
           icon: 'none',
           duration: 3000,
         });
-        nfcInstance.close();
-
-        return Promise.reject({
-          errMsg: '写入数据超出标签容量',
-        });
+        try {
+          nfcInstance.close();
+        } catch (_e) {
+          // ignore error
+        }
+        return Promise.reject({ errMsg: '写入数据超出标签容量' });
       }
 
       if (nfcInstance.isWritable()) {
@@ -782,50 +732,47 @@ export default function useNFCAndroid(
           icon: 'none',
           duration: 3000,
         });
-        return Promise.resolve({
-          errMsg: '数据写入成功',
-        });
+        return Promise.resolve({ errMsg: '数据写入成功' });
       } else {
         uni.showToast({
           title: 'NFC 标签不允许写入',
           icon: 'none',
           duration: 3000,
         });
-        return Promise.reject({
-          errMsg: 'NFC 标签不允许写入',
-        });
+        nfcInstance.close();
+        return Promise.reject({ errMsg: 'NFC 标签不允许写入' });
       }
-    } catch (error) {
+    } catch (_error) {
       uni.showToast({
         title: '数据写入失败',
         icon: 'none',
         duration: 3000,
       });
-
-      return Promise.reject({
-        errMsg: '数据写入失败',
-        error,
-      });
+      try {
+        nfcInstance?.close();
+      } catch (_e) {
+        // ignore error
+      }
+      return Promise.reject({ errMsg: '数据写入失败', error: _error });
     }
   }
 
   /**
-   * 写入 NDEF 文本数据
+   * 非 ndef 数据写入
    *
-   * https://developer.android.google.cn/reference/kotlin/android/nfc/NdefRecord?hl=en#createtextrecord
+   * TODO: 暂时无法提供通用的写入方法
    *
-   * @param {string} text
-   * @param {string} [language='zh']
+   * @param {ArrayBuffer} writeData
    * @return {*}
    */
-  function writeNdfText(text: string, language: string = 'zh') {
-    if (!isNdef.value) {
+  function write(writeData: ArrayBuffer) {
+    if (isNdef.value) {
       uni.showToast({
-        title: 'NFC 标签不支持 NDEF',
+        title: 'NDEF 请勿使用该方法',
         icon: 'none',
       });
       return Promise.reject({
-        errMsg: 'NFC 标签不支持 NDEF',
+        errMsg: 'NDEF 请勿使用该方法',
       });
     }
 
@@ -852,58 +799,33 @@ export default function useNFCAndroid(
     uni.showToast({
       title: '开始写入数据，请勿断开连接',
       icon: 'none',
-      duration: 3000,
     });
 
     try {
-      // 创建 NDEF 消息
-      const message = new NdefMessage([
-        NdefRecord.createTextRecord(language, text),
-      ]);
-
-      // 检查是否支持写入
-      if (maxTransceiveLength < message.getByteArrayLength()) {
-        uni.showToast({
-          title: '写入数据超出标签容量',
-          icon: 'none',
-          duration: 3000,
-        });
+      nfcInstance.connect();
+      if (!nfcInstance.isWritable()) {
+        uni.showToast({ title: 'NFC 标签不允许写入', icon: 'none' });
         nfcInstance.close();
-
         return Promise.reject({
-          errMsg: '写入数据超出标签容量',
+          errMsg: 'NFC 标签不允许写入',
         });
       }
-
-      if (nfcInstance.isWritable()) {
-        nfcInstance.writeNdefMessage(message);
+      if (nfcInstance.getMaxTransceiveLength() < writeData.byteLength) {
+        uni.showToast({ title: '写入数据超出标签容量', icon: 'none' });
         nfcInstance.close();
-
-        uni.showToast({
-          title: '数据写入成功',
-          icon: 'none',
-          duration: 3000,
-        });
-        return Promise.resolve({
-          errMsg: '数据写入成功',
-        });
-      } else {
-        uni.showToast({
-          title: 'NFC 标签不允许写入',
-          icon: 'none',
-          duration: 3000,
-        });
         return Promise.reject({
-          errMsg: 'NFC 标签不允许写入',
+          errMsg: '写入数据超出标签容量',
         });
       }
-    } catch (error) {
-      uni.showToast({
-        title: '数据写入失败',
-        icon: 'none',
-        duration: 3000,
+      const result = nfcInstance.transceive(writeData);
+      nfcInstance.close();
+      uni.showToast({ title: '数据写入成功', icon: 'none' });
+      return Promise.resolve({
+        errMsg: '数据写入成功',
+        data: result,
       });
-
+    } catch (error) {
+      uni.showToast({ title: '数据写入失败', icon: 'none' });
       return Promise.reject({
         errMsg: '数据写入失败',
         error,
@@ -911,6 +833,39 @@ export default function useNFCAndroid(
     }
   }
 
+  /**
+   * 通用的 ndef 写入方法
+   *
+   * @param {NFC.NdefData} data
+   */
+  function writeNdef(data: NFC.NdefRecord[]) {
+    return executeNdefWrite(() => {
+      const records = data?.map((item) => {
+        const tnf = stringToBytes(item.tnf + '');
+        const id = item.id ? stringToBytes(item.id) : null;
+        const type = stringToBytes(item.type);
+
+        return new NdefRecord(tnf, type, id, item.payload);
+      });
+      return new NdefMessage(records);
+    });
+  }
+
+  /**
+   * 写入 NDEF 文本数据
+   *
+   * https://developer.android.google.cn/reference/kotlin/android/nfc/NdefRecord?hl=en#createtextrecord
+   *
+   * @param {string} text
+   * @param {string} [language='zh']
+   * @return {*}
+   */
+  function writeNdefText(text: string, language: string = 'zh') {
+    return executeNdefWrite(() => {
+      return new NdefMessage([NdefRecord.createTextRecord(language, text)]);
+    });
+  }
+
   /**
    *  写入 NDEF URI 数据
    * https://developer.android.google.cn/reference/kotlin/android/nfc/NdefRecord?hl=en#createuri
@@ -925,207 +880,25 @@ export default function useNFCAndroid(
    * @return {*}
    */
   function writeNdefUri(uri: string) {
-    if (!isNdef.value) {
-      uni.showToast({
-        title: 'NFC 标签不支持 NDEF',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: 'NFC 标签不支持 NDEF',
-      });
-    }
+    return executeNdefWrite(() => {
+      return new NdefMessage([NdefRecord.createUri(uri)]);
+    });
+  }
 
-    if (!nfcInstance) {
-      uni.showToast({
-        title: '请先建立连接',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: '请先建立连接',
-      });
-    }
-
-    if (!isConnected.value) {
-      uni.showToast({
-        title: '请先建立连接',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: '请先建立连接',
-      });
-    }
-
-    uni.showToast({
-      title: '开始写入数据，请勿断开连接',
-      icon: 'none',
-      duration: 3000,
-    });
-
-    try {
-      // 创建 NDEF 消息
-      const message = new NdefMessage([NdefRecord.createUri(uri)]);
-
-      // 检查是否支持写入
-      if (maxTransceiveLength < message.getByteArrayLength()) {
-        uni.showToast({
-          title: '写入数据超出标签容量',
-          icon: 'none',
-          duration: 3000,
-        });
-        nfcInstance.close();
-        return Promise.reject({
-          errMsg: '写入数据超出标签容量',
-        });
-      }
-
-      if (nfcInstance.isWritable()) {
-        const result = nfcInstance.writeNdefMessage(message);
-        nfcInstance.close();
-
-        uni.showToast({
-          title: '数据写入成功',
-          icon: 'none',
-          duration: 3000,
-        });
-        return Promise.resolve({
-          errMsg: '数据写入成功',
-          data: result,
-        });
-      } else {
-        uni.showToast({
-          title: 'NFC 标签不允许写入',
-          icon: 'none',
-          duration: 3000,
-        });
-        return Promise.reject({
-          errMsg: 'NFC 标签不允许写入',
-        });
-      }
-    } catch (error) {
-      uni.showToast({
-        title: '数据写入失败',
-        icon: 'none',
-        duration: 3000,
-      });
-      return Promise.reject({
-        errMsg: '数据写入失败',
-        error,
-      });
-    }
-  }
-
-  /**
-   *  Android 应用包名 写入
-   *
-   * @param {string} packageName - 数据
-   * @param {string} [typeName] - 类型名称，默认为 "a" (Android Application Record)
-   * @return {*}
-   */
-  function writeNdefAndroidApp(packageName: string) {
-    if (!isNdef.value) {
-      uni.showToast({
-        title: 'NFC 标签不支持 NDEF',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: 'NFC 标签不支持 NDEF',
-      });
-    }
-
-    if (!nfcInstance) {
-      uni.showToast({
-        title: '请先建立连接',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: '请先建立连接',
-      });
-    }
-
-    if (!isConnected.value) {
-      uni.showToast({
-        title: '请先建立连接',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: '请先建立连接',
-      });
-    }
-
-    uni.showToast({
-      title: '开始写入数据，请勿断开连接',
-      icon: 'none',
-      duration: 3000,
-    });
-
-    try {
-      // 创建 Android 应用记录 (AAR - Android Application Record)
-      const appRecord = NdefRecord.createApplicationRecord(packageName);
-
-      // 将包名字符串转换为字节数组
-      // const packageBytes = plus.android.invoke(
-      //   packageName,
-      //   'getBytes',
-      //   'UTF-8',
-      // );
-
-      // 或者使用 createExternalTypeRecord 创建自定义外部类型记录
-      // const appRecord = NdefRecord.createExternalTypeRecord(
-      //   'android.com:pkg', // 域名:类型
-      //   packageBytes       // 负载数据
-      // );
-
-      // 创建 NDEF 消息
-      const message = new NdefMessage([appRecord]);
-
-      // 检查是否支持写入
-      if (maxTransceiveLength < message.getByteArrayLength()) {
-        uni.showToast({
-          title: '写入数据超出标签容量',
-          icon: 'none',
-          duration: 3000,
-        });
-        nfcInstance.close();
-        return Promise.reject({
-          errMsg: '写入数据超出标签容量',
-        });
-      }
-
-      if (nfcInstance.isWritable()) {
-        nfcInstance.writeNdefMessage(message);
-        nfcInstance.close();
-
-        uni.showToast({
-          title: '数据写入成功',
-          icon: 'none',
-          duration: 3000,
-        });
-        return Promise.resolve({
-          errMsg: '数据写入成功',
-        });
-      } else {
-        uni.showToast({
-          title: 'NFC 标签不允许写入',
-          icon: 'none',
-          duration: 3000,
-        });
-        return Promise.reject({
-          errMsg: 'NFC 标签不允许写入',
-        });
-      }
-    } catch (error) {
-      uni.showToast({
-        title: '数据写入失败',
-        icon: 'none',
-        duration: 3000,
-      });
-      console.error('数据写入失败:', error);
-      return Promise.reject({
-        errMsg: '数据写入失败',
-        error,
-      });
-    }
-  }
+  /**
+   *  Android 应用包名 写入
+   *
+   * @param {string} packageName - 数据
+   * @param {string} [typeName] - 类型名称，默认为 "a" (Android Application Record)
+   * @return {*}
+   */
+  function writeNdefAndroidApp(packageName: string) {
+    return executeNdefWrite(() => {
+      // 创建 Android 应用记录 (AAR - Android Application Record)
+      const appRecord = NdefRecord.createApplicationRecord(packageName);
+      return new NdefMessage([appRecord]);
+    });
+  }
 
   /**
    * 写入 WiFi 配置到 NFC 标签
@@ -1134,112 +907,16 @@ export default function useNFCAndroid(
    * @return {*}
    */
   function writeNdefWifi({ ssid, password, authType }: NFC.WSCConfig) {
-    if (!isNdef.value) {
-      uni.showToast({
-        title: 'NFC 标签不支持 NDEF',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: 'NFC 标签不支持 NDEF',
-      });
-    }
-
-    if (!nfcInstance) {
-      uni.showToast({
-        title: '请先建立连接',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: '请先建立连接',
-      });
-    }
-
-    if (!isConnected.value) {
-      uni.showToast({
-        title: '请先建立连接',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: '请先建立连接',
-      });
-    }
-
-    uni.showToast({
-      title: '开始写入数据，请勿断开连接',
-      icon: 'none',
-      duration: 3000,
-    });
-
-    try {
+    return executeNdefWrite(() => {
       const mimeType = 'application/vnd.wfa.wsc';
-
-      // const wifiData = convertWifiInfoToTLVBytes({
-      //   ssid,
-      //   password,
-      //   authType,
-      // });
-
       const wifiData = generateWSCBytesForAndroid({
         ssid,
         password,
         authType,
       });
-
       const wifiRecord = NdefRecord.createMime(mimeType, wifiData);
-
-      // 创建 WiFi 配置的 TLV 数据
-      // const wifiRecord = createWifiRecord(ssid, password, authType);
-
-      // 创建 NDEF 消息
-      const message = new NdefMessage([wifiRecord]);
-
-      // 检查是否支持写入
-      if (maxTransceiveLength < message.getByteArrayLength()) {
-        uni.showToast({
-          title: '写入数据超出标签容量',
-          icon: 'none',
-          duration: 3000,
-        });
-        nfcInstance.close();
-        return Promise.reject({
-          errMsg: '写入数据超出标签容量',
-        });
-      }
-
-      if (nfcInstance.isWritable()) {
-        nfcInstance.writeNdefMessage(message);
-        nfcInstance.close();
-
-        uni.showToast({
-          title: '数据写入成功',
-          icon: 'none',
-          duration: 3000,
-        });
-        return Promise.resolve({
-          errMsg: '数据写入成功',
-        });
-      } else {
-        uni.showToast({
-          title: 'NFC 标签不允许写入',
-          icon: 'none',
-          duration: 3000,
-        });
-        return Promise.reject({
-          errMsg: 'NFC 标签不允许写入',
-        });
-      }
-    } catch (error) {
-      uni.showToast({
-        title: '数据写入失败',
-        icon: 'none',
-        duration: 3000,
-      });
-      console.error('数据写入失败:', error);
-      return Promise.reject({
-        errMsg: '数据写入失败',
-        error,
-      });
-    }
+      return new NdefMessage([wifiRecord]);
+    });
   }
 
   /**
@@ -1249,101 +926,13 @@ export default function useNFCAndroid(
    * @return {*}
    */
   function writeNdefVcard(cardInfo: NFC.VCardContactInfo) {
-    if (!isNdef.value) {
-      uni.showToast({
-        title: 'NFC 标签不支持 NDEF',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: 'NFC 标签不支持 NDEF',
-      });
-    }
-
-    if (!nfcInstance) {
-      uni.showToast({
-        title: '请先建立连接',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: '请先建立连接',
-      });
-    }
-
-    if (!isConnected.value) {
-      uni.showToast({
-        title: '请先建立连接',
-        icon: 'none',
-      });
-      return Promise.reject({
-        errMsg: '请先建立连接',
-      });
-    }
-
-    uni.showToast({
-      title: '开始写入数据，请勿断开连接',
-      icon: 'none',
-      duration: 3000,
-    });
-
-    try {
+    return executeNdefWrite(() => {
       const mimeType = 'text/vcard';
-
       const cardString = formatCardInfo(cardInfo);
-
       const cardData = stringToBytes(cardString);
-
       const cardRecord = NdefRecord.createMime(mimeType, cardData);
-
-      // 创建 NDEF 消息
-      const message = new NdefMessage([cardRecord]);
-
-      // 检查是否支持写入
-      if (maxTransceiveLength < message.getByteArrayLength()) {
-        uni.showToast({
-          title: '写入数据超出标签容量',
-          icon: 'none',
-          duration: 3000,
-        });
-        nfcInstance.close();
-        return Promise.reject({
-          errMsg: '写入数据超出标签容量',
-        });
-      }
-
-      if (nfcInstance.isWritable()) {
-        nfcInstance.writeNdefMessage(message);
-        nfcInstance.close();
-
-        uni.showToast({
-          title: '数据写入成功',
-          icon: 'none',
-          duration: 3000,
-        });
-        return Promise.resolve({
-          errMsg: '数据写入成功',
-        });
-      } else {
-        uni.showToast({
-          title: 'NFC 标签不允许写入',
-          icon: 'none',
-          duration: 3000,
-        });
-        return Promise.reject({
-          errMsg: 'NFC 标签不允许写入',
-        });
-      }
-    } catch (error) {
-      uni.showToast({
-        title: '数据写入失败',
-        icon: 'none',
-        duration: 3000,
-      });
-      console.error('数据写入失败:', error);
-      return Promise.reject({
-        errMsg: '数据写入失败',
-        error,
-      });
-    }
+      return new NdefMessage([cardRecord]);
+    });
   }
 
   onMounted(() => {
@@ -1367,8 +956,8 @@ export default function useNFCAndroid(
     connect,
     close,
     write,
-    writeNdf,
-    writeNdfText,
+    writeNdef,
+    writeNdefText,
     writeNdefUri,
     writeNdefAndroidApp,
     writeNdefWifi,