@uxda/appkit 4.2.20 → 4.2.22

package/dist/index.js

@@ -117,7 +117,7 @@ function requestPayment$2(json) {
 }
 
 function useSafeArea() {
-  const systemInfo = Taro.getSystemInfoSync(), capsule = Taro.getMenuButtonBoundingClientRect();
+  const systemInfo = Taro.getEnv() === "WEAPP" ? Taro.getSystemInfoSync() : { statusBarHeight: 0, safeArea: { bottom: 0 }, screenHeight: 0 }, capsule = Taro.getEnv() === "WEAPP" ? Taro.getMenuButtonBoundingClientRect() : { top: 0, height: 0 };
   const status = systemInfo.statusBarHeight || 0, gap = capsule.top - status, nav = capsule.height + gap * 2, safeAreaBottom = (systemInfo.safeArea || {}).bottom || 0, bottom = systemInfo.screenHeight - safeAreaBottom;
   return {
     status,
@@ -344,6 +344,7 @@ const defaultLogOptions = {
   topic: "appkit",
   enable: true
 };
+console.log(Taro.getEnv(), "Taro.getEnv");
 function generateUniqueId(pre) {
   return `${pre ? pre + "-" : ""}${Date.now().toString(16)}-${Math.random().toString(36).substr(2)}`;
 }
@@ -365,10 +366,10 @@ function useLogger(options) {
   const baseUrl = `https://${projectName}.cn-shenzhen.log.aliyuncs.com/logstores/${logStore}/track?APIVersion=${APIVersion}`;
   const alislsURL = topic ? `${baseUrl}&__topic__=${topic}` : baseUrl;
   const enable = options.enable === void 0 ? true : options.enable;
-  const { miniProgram } = Taro.getAccountInfoSync();
+  const { miniProgram } = Taro.getEnv() === "WEAPP" ? Taro.getAccountInfoSync() : { miniProgram: { version: "" } };
   const systemInfo = JSON.stringify({
-    ...Taro.getSystemInfoSync(),
-    appVersion: miniProgram.version
+    ...Taro.getEnv() === "WEAPP" ? Taro.getSystemInfoSync() : {},
+    appVersion: miniProgram?.version
   }) || "\u672A\u77E5";
   function send(params) {
     if (!enable) return;
@@ -936,7 +937,7 @@ var script$E = /* @__PURE__ */ defineComponent({
     }, 100);
     onMounted(async () => {
       await getPropertieByCode();
-      const systemInfo = Taro.getSystemInfoSync();
+      const systemInfo = Taro.getEnv() === "WEAPP" ? Taro.getSystemInfoSync() : { SDKVersion: "2.24.0" };
       const version = systemInfo.SDKVersion;
       function compareVersion(v1, v2) {
         const v1Arr = v1.split(".").map(Number);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.2.20",
+  "version": "4.2.22",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/shared/components/DeviceVersion.vue

@@ -1,11 +1,6 @@
 <template>
-  <DdNoticeBar
-    v-if="showAlert"
-    showClose
-    :style="topStype"
-    @close="showAlert = !showAlert"
-    text="您当前使用的微信客户端版本较低，可能不支持全部功能或体验效果可能不佳，建议至应用商店或App Store升级至最新版本。"
-  />
+  <DdNoticeBar v-if="showAlert" showClose :style="topStype" @close="showAlert = !showAlert"
+    text="您当前使用的微信客户端版本较低，可能不支持全部功能或体验效果可能不佳，建议至应用商店或App Store升级至最新版本。" />
 </template>
 
 <script setup lang="ts">
@@ -41,7 +36,7 @@ const getPropertieByCode = debounce(async () => {
 onMounted(async () => {
   await getPropertieByCode()
 
-  const systemInfo = Taro.getSystemInfoSync()
+  const systemInfo = Taro.getEnv() === 'WEAPP' ? Taro.getSystemInfoSync() : { SDKVersion: '2.24.0' }
   const version = systemInfo.SDKVersion
 
   // 版本号比较函数

package/src/shared/composables/useLogger.ts

@@ -23,6 +23,8 @@ const defaultLogOptions: LogType = {
   enable: true,
 }
 
+console.log(Taro.getEnv(), 'Taro.getEnv')
+
 // 使用时间戳生成唯一标识
 export function generateUniqueId(pre?: string) {
   return `${pre ? pre + '-' : ''}${Date.now().toString(16)}-${Math.random().toString(36).substr(2)}`
@@ -49,11 +51,12 @@ export function useLogger(options?: LogType) {
   const alislsURL = topic ? `${baseUrl}&__topic__=${topic}` : baseUrl
   const enable = options.enable === undefined ? true : options.enable
 
-  const { miniProgram } = Taro.getAccountInfoSync()
+  const { miniProgram } =
+    Taro.getEnv() === 'WEAPP' ? Taro.getAccountInfoSync() : { miniProgram: { version: '' } }
   const systemInfo =
     JSON.stringify({
-      ...Taro.getSystemInfoSync(),
-      appVersion: miniProgram.version,
+      ...(Taro.getEnv() === 'WEAPP' ? Taro.getSystemInfoSync() : {}),
+      appVersion: miniProgram?.version,
     }) || '未知'
 
   function send(params: Record<string, any>) {

package/src/shared/composables/useSafeArea.ts

@@ -24,8 +24,12 @@ export type SafeArea = {
  * @returns
  */
 export function useSafeArea(): SafeArea {
-  const systemInfo = Taro.getSystemInfoSync(),
-    capsule = Taro.getMenuButtonBoundingClientRect()
+  const systemInfo =
+      Taro.getEnv() === 'WEAPP'
+        ? Taro.getSystemInfoSync()
+        : { statusBarHeight: 0, safeArea: { bottom: 0 }, screenHeight: 0 },
+    capsule =
+      Taro.getEnv() === 'WEAPP' ? Taro.getMenuButtonBoundingClientRect() : { top: 0, height: 0 }
   /**
    * 状态条高度
    */