vite-uni-dev-tool 1.1.0 → 1.2.1

package/dist/v3/hooks/useContainerStyle.ts

@@ -1,153 +1,95 @@
-import { onMounted, reactive, ref } from 'vue';
-// import { console } from '@/dev/core';
-
-/**
- *  顶部导航栏高度
- */
-const navigateHeight = 44;
-
-/**
- * 底部导航栏高度
- * 默认 50 可进行自定义
- * 微信小程序 默认就不是 50 , 模拟器 48  真机 49 ...
- *
- * 凸(艹皿艹 )
- *
- */
-let tabHeight = 50;
-
-/**
- * 计算因导航栏高度导致的调试器高度异常
- *
- * @param {Record<string, any>} [style]
- * @return {*}
- */
-const useContainerStyle = (style?: Record<string, any>) => {
-  const customStyle = reactive({
-    ...(style || {
-      height: '0px',
-      boxSizing: 'border-box',
-    }),
-  });
-
-  const contentHeight = ref(0);
-
-  const contentType = ref('');
-
-  onMounted(() => {
-    let screenHeight: number = 0;
-    let windowHeight: number = 0;
-    let height: number = 0;
-    let statusBarHeight: number = 0;
-
-    if (uni.getWindowInfo) {
-      const winInfo = uni.getWindowInfo();
-      screenHeight = winInfo.screenHeight;
-      windowHeight = winInfo.windowHeight;
-      height = winInfo.safeArea.height;
-      statusBarHeight = winInfo.statusBarHeight;
-    } else {
-      const sysInfo = uni.getSystemInfoSync();
-      screenHeight = sysInfo.screenHeight;
-      windowHeight = sysInfo.windowHeight;
-      height = sysInfo.safeArea?.height ?? 0;
-      statusBarHeight = sysInfo.statusBarHeight ?? 0;
-    }
-
-    const diff = screenHeight - windowHeight;
-    const diffStatus = screenHeight - windowHeight - statusBarHeight;
-
-    // console.log('diff: ', diff);
-    // console.log('diffStatus: ', diffStatus);
-    // console.log('windowHeight: ', windowHeight);
-    // console.log('screenHeight: ', screenHeight);
-    // console.log('statusBarHeight: ', statusBarHeight);
-
-    // #ifdef !H5
-    if (diffStatus === navigateHeight) {
-      // console.log('当前页只存在 navigate: ');
-      Object.assign(customStyle, {
-        paddingTop: '0px',
-        paddingBottom: tabHeight + 'px',
-        height: windowHeight + 'px',
-        boxSizing: 'border-box',
-      });
-      contentHeight.value = windowHeight - tabHeight;
-      contentType.value = 'navigate';
-    } else if (
-      diff > navigateHeight &&
-      diff < navigateHeight + statusBarHeight
-    ) {
-      // 当前页只存在 tab
-      // console.log('当前页只存在 tab: ');
-      // 微信模拟器中 navigateHeight 已经被计算到 windowHeight 中 ，导致高度计算异常
-      // 暂时没有办法补偿 凸(艹皿艹 )
-
-      Object.assign(customStyle, {
-        paddingTop: navigateHeight + statusBarHeight + 'px',
-        paddingBottom: 0,
-        height: windowHeight + 'px',
-        boxSizing: 'border-box',
-      });
-
-      // 最终算的结果和原有的 50 存在差距
-      tabHeight = diff;
-      contentHeight.value =
-        screenHeight - navigateHeight - diff - statusBarHeight;
-      contentType.value = 'tab';
-    } else if (diff === 0) {
-      // 当前页不存在 navigate 和 tab
-      // console.log('当前页不存在 navigate 和 tab: ');
-
-      Object.assign(customStyle, {
-        paddingTop: navigateHeight + statusBarHeight + 'px',
-        paddingBottom: tabHeight + 'px',
-        height: windowHeight + 'px',
-        boxSizing: 'border-box',
-      });
-
-      contentHeight.value =
-        screenHeight - navigateHeight - tabHeight - statusBarHeight;
-      contentType.value = '';
-    } else {
-      // 当前页存在 navigate 和 tab
-      // console.log('当前页存在 navigate 和 tab: ');
-
-      // 最终算的结果和原有的 50 存在差距
-      tabHeight = diff - navigateHeight - statusBarHeight;
-
-      Object.assign(customStyle, {
-        paddingTop: '0px',
-        paddingBottom: '0px',
-        height: windowHeight + 'px',
-        boxSizing: 'border-box',
-      });
-      contentHeight.value =
-        screenHeight - tabHeight - navigateHeight - statusBarHeight;
-
-      contentType.value = 'navigateAndTab';
-    }
-
-    // #endif
-
-    // #ifdef H5
-    Object.assign(customStyle, {
-      paddingTop: '44px',
-      paddingBottom: '50px',
-      height: height + 'px',
-      boxSizing: 'border-box',
-    });
-    contentHeight.value = height - 50 - 44;
-    // #endif
-    // console.log('tabHeight: ', tabHeight);
-    // console.log('customStyle: ', customStyle);
-  });
-
-  return {
-    contentType,
-    customStyle,
-    contentHeight,
-  };
-};
-
-export default useContainerStyle;
+import { onMounted, reactive, ref } from 'vue';
+// import { console } from '@/dev/core';
+
+/**
+ *  顶部导航栏高度
+ */
+const navigateHeight = 44;
+
+/**
+ * 底部导航栏高度
+ * 默认 50 可进行自定义
+ * 微信小程序 默认就不是 50 , 模拟器 48  真机 49 ...
+ *
+ * 凸(艹皿艹 )
+ *
+ */
+let tabHeight = 50;
+
+/**
+ * 计算因导航栏高度导致的调试器高度异常
+ *
+ * @param {Record<string, any>} [style]
+ * @return {*}
+ */
+const useContainerStyle = (style?: Record<string, any>) => {
+  const customStyle = reactive<Record<string, any>>({
+    height: '0px',
+    boxSizing: 'border-box' as const,
+    ...style,
+  });
+  const contentHeight = ref(0);
+  const contentType = ref('');
+
+  onMounted(() => {
+    const info = uni.getWindowInfo
+      ? uni.getWindowInfo()
+      : uni.getSystemInfoSync();
+    const { screenHeight, windowHeight, statusBarHeight = 0 } = info;
+    const safeH = ('safeArea' in info ? info.safeArea?.height : 0) || 0;
+
+    const diff = screenHeight - windowHeight;
+    const diffStatus = diff - statusBarHeight;
+
+    // #ifdef !H5
+    Object.assign(customStyle, { height: windowHeight + 'px' });
+    if (diffStatus === navigateHeight) {
+      Object.assign(customStyle, {
+        paddingTop: '0px',
+        paddingBottom: tabHeight + 'px',
+      });
+      contentHeight.value = windowHeight - tabHeight;
+      contentType.value = 'navigate';
+    } else if (
+      diff > navigateHeight &&
+      diff < navigateHeight + statusBarHeight
+    ) {
+      Object.assign(customStyle, {
+        paddingTop: navigateHeight + statusBarHeight + 'px',
+        paddingBottom: 0,
+      });
+      tabHeight = diff;
+      contentHeight.value =
+        screenHeight - navigateHeight - diff - statusBarHeight;
+      contentType.value = 'tab';
+    } else if (diff === 0) {
+      Object.assign(customStyle, {
+        paddingTop: navigateHeight + statusBarHeight + 'px',
+        paddingBottom: tabHeight + 'px',
+      });
+      contentHeight.value =
+        screenHeight - navigateHeight - tabHeight - statusBarHeight;
+      contentType.value = '';
+    } else {
+      tabHeight = diff - navigateHeight - statusBarHeight;
+      Object.assign(customStyle, { paddingTop: '0px', paddingBottom: '0px' });
+      contentHeight.value =
+        screenHeight - tabHeight - navigateHeight - statusBarHeight;
+      contentType.value = 'navigateAndTab';
+    }
+    // #endif
+
+    // #ifdef H5
+    Object.assign(customStyle, {
+      paddingTop: '44px',
+      paddingBottom: '50px',
+      height: safeH + 'px',
+    });
+    contentHeight.value = safeH - 50 - 44;
+    // #endif
+  });
+
+  return { contentType, customStyle, contentHeight };
+};
+
+export default useContainerStyle;

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

@@ -1,107 +1,107 @@
-// #ifdef MP-WEIXIN
-import useNFCMpWeiXin from './useNFCMpWeiXin';
-// #endif
-
-// #ifdef APP-PLUS
-import useNFCAndroid from './useNFCAndroid';
-
-// #endif
-
-import { ref } from 'vue';
-
-export default function useNFC(
-  listener: (data: NFC.Result) => void,
-  options?: {
-    timeout?: number;
-    checkConnectedDelay?: number;
-  },
-): NFC.NfcResult {
-  // #ifdef APP-PLUS
-  return useNFCAndroid(listener, options);
-  // #endif
-
-  // #ifdef MP-WEIXIN
-  return useNFCMpWeiXin(listener, options);
-  // #endif
-
-  /** 是否支持 nfc */
-  const isSupportNFC = ref<boolean | undefined>(false);
-  /** 是否监听中 */
-  const isListening = ref<boolean>(false);
-  /**
-   * 是否已连接
-   * 需要手动维护，调用connect()后连接 调用close()后断开 ,实际nfc 断开之后是无法监听到的， isConnected 已经被废弃掉了
-   */
-  const isConnected = ref<boolean>(false);
-  /** nfc 数据 */
-  const data = ref<NFC.Result>({
-    id: new ArrayBuffer(0),
-    techs: [],
-    byteArray: [],
-    hexArray: [],
-    hexNumberArray: [],
-    hexString: '',
-  });
-
-  /** nfc 适配器 */
-  let _nfcAdapter: NFC.Adapter;
-
-  /** nfc 实例 */
-  let _nfcInstance: NFC.Instance | undefined;
-
-  /** ndef 写入方式比较特殊，需要特殊处理 */
-  const isNdef = ref(false);
-
-  return {
-    data,
-    isNdef,
-    isSupportNFC,
-    isListening,
-    isConnected,
-    nfcInstance: undefined,
-    startHCE: () => {
-      uni.showToast({ title: '暂不支持', icon: 'none' });
-      return Promise.resolve({ errMsg: '暂不支持' });
-    },
-    stopHCE: () => {
-      uni.showToast({ title: '暂不支持', icon: 'none' });
-      return Promise.resolve({ errMsg: '暂不支持' });
-    },
-    connect: () => {
-      uni.showToast({ title: '暂不支持', icon: 'none' });
-      return Promise.resolve({ errMsg: '暂不支持' });
-    },
-    close: () => {
-      uni.showToast({ title: '暂不支持', icon: 'none' });
-      return Promise.resolve({ errMsg: '暂不支持' });
-    },
-    write: () => {
-      uni.showToast({ title: '暂不支持', icon: 'none' });
-      return Promise.resolve({ errMsg: '暂不支持' });
-    },
-    writeNdef: () => {
-      uni.showToast({ title: '暂不支持', icon: 'none' });
-      return Promise.resolve({ errMsg: '暂不支持' });
-    },
-    writeNdefText: () => {
-      uni.showToast({ title: '暂不支持', icon: 'none' });
-      return Promise.resolve({ errMsg: '暂不支持' });
-    },
-    writeNdefUri: () => {
-      uni.showToast({ title: '暂不支持', icon: 'none' });
-      return Promise.resolve({ errMsg: '暂不支持' });
-    },
-    writeNdefAndroidApp: () => {
-      uni.showToast({ title: '暂不支持', icon: 'none' });
-      return Promise.resolve({ errMsg: '暂不支持' });
-    },
-    writeNdefWifi: () => {
-      uni.showToast({ title: '暂不支持', icon: 'none' });
-      return Promise.resolve({ errMsg: '暂不支持' });
-    },
-    writeNdefVcard: () => {
-      uni.showToast({ title: '暂不支持', icon: 'none' });
-      return Promise.resolve({ errMsg: '暂不支持' });
-    },
-  };
-}
+// #ifdef MP-WEIXIN
+import useNFCMpWeiXin from './useNFCMpWeiXin';
+// #endif
+
+// #ifdef APP-PLUS
+import useNFCAndroid from './useNFCAndroid';
+
+// #endif
+
+import { ref } from 'vue';
+
+export default function useNFC(
+  listener: (data: NFC.Result) => void,
+  options?: {
+    timeout?: number;
+    checkConnectedDelay?: number;
+  },
+): NFC.NfcResult {
+  // #ifdef APP-PLUS
+  return useNFCAndroid(listener, options);
+  // #endif
+
+  // #ifdef MP-WEIXIN
+  return useNFCMpWeiXin(listener, options);
+  // #endif
+
+  /** 是否支持 nfc */
+  const isSupportNFC = ref<boolean | undefined>(false);
+  /** 是否监听中 */
+  const isListening = ref<boolean>(false);
+  /**
+   * 是否已连接
+   * 需要手动维护，调用connect()后连接 调用close()后断开 ,实际nfc 断开之后是无法监听到的， isConnected 已经被废弃掉了
+   */
+  const isConnected = ref<boolean>(false);
+  /** nfc 数据 */
+  const data = ref<NFC.Result>({
+    id: new ArrayBuffer(0),
+    techs: [],
+    byteArray: [],
+    hexArray: [],
+    hexNumberArray: [],
+    hexString: '',
+  });
+
+  /** nfc 适配器 */
+  let _nfcAdapter: NFC.Adapter;
+
+  /** nfc 实例 */
+  let _nfcInstance: NFC.Instance | undefined;
+
+  /** ndef 写入方式比较特殊，需要特殊处理 */
+  const isNdef = ref(false);
+
+  return {
+    data,
+    isNdef,
+    isSupportNFC,
+    isListening,
+    isConnected,
+    nfcInstance: undefined,
+    startHCE: () => {
+      uni.showToast({ title: '暂不支持', icon: 'none' });
+      return Promise.resolve({ errMsg: '暂不支持' });
+    },
+    stopHCE: () => {
+      uni.showToast({ title: '暂不支持', icon: 'none' });
+      return Promise.resolve({ errMsg: '暂不支持' });
+    },
+    connect: () => {
+      uni.showToast({ title: '暂不支持', icon: 'none' });
+      return Promise.resolve({ errMsg: '暂不支持' });
+    },
+    close: () => {
+      uni.showToast({ title: '暂不支持', icon: 'none' });
+      return Promise.resolve({ errMsg: '暂不支持' });
+    },
+    write: () => {
+      uni.showToast({ title: '暂不支持', icon: 'none' });
+      return Promise.resolve({ errMsg: '暂不支持' });
+    },
+    writeNdef: () => {
+      uni.showToast({ title: '暂不支持', icon: 'none' });
+      return Promise.resolve({ errMsg: '暂不支持' });
+    },
+    writeNdefText: () => {
+      uni.showToast({ title: '暂不支持', icon: 'none' });
+      return Promise.resolve({ errMsg: '暂不支持' });
+    },
+    writeNdefUri: () => {
+      uni.showToast({ title: '暂不支持', icon: 'none' });
+      return Promise.resolve({ errMsg: '暂不支持' });
+    },
+    writeNdefAndroidApp: () => {
+      uni.showToast({ title: '暂不支持', icon: 'none' });
+      return Promise.resolve({ errMsg: '暂不支持' });
+    },
+    writeNdefWifi: () => {
+      uni.showToast({ title: '暂不支持', icon: 'none' });
+      return Promise.resolve({ errMsg: '暂不支持' });
+    },
+    writeNdefVcard: () => {
+      uni.showToast({ title: '暂不支持', icon: 'none' });
+      return Promise.resolve({ errMsg: '暂不支持' });
+    },
+  };
+}