@tmsfe/tms-core 0.0.202 → 0.0.204

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.202",
+  "version": "0.0.204",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",

package/src/navbarUtils.js

@@ -2,23 +2,7 @@
  * @desc: 获取导航高度的相关函数
  */
 import { compareVersion } from './compareVersion';
-let systemInfo = null;
-
-/**
- * 获取系统信息，有缓存, 返回数据同wx.getSystemInfoSync  {@link https://developers.weixin.qq.com/miniprogram/dev/api/base/system/wx.getSystemInfoSync.html}
- * @returns {Object} 系统信息
- */
-const getSystemInfoSync = () => {
-  if (systemInfo) return systemInfo;
-  let res;
-  try {
-    systemInfo = wx.getSystemInfoSync();
-    res = systemInfo;
-  } catch (_) {
-    res = {};
-  }
-  return res;
-};
+import { getSystemInfoSync } from './wxApi';
 
 /**
  * 获取系统信息，有缓存, 返回数据同wx.getSystemInfoSync {@link https://developers.weixin.qq.com/miniprogram/dev/api/base/system/wx.getSystemInfoSync.html}

package/src/report/helper.ts

@@ -4,6 +4,7 @@
  */
 
 import clone from './clone';
+import { getSystemInfoSync } from '../wxApi';
 import {
   IPage,
   DataItem,
@@ -42,7 +43,7 @@ let systemInfo: ISystemInfo;
  */
 function getSystemInfo(): ISystemInfo {
   if (!systemInfo) {
-    const currentSystemInfo = wx.getSystemInfoSync() as any;
+    const currentSystemInfo = getSystemInfoSync() as any;
     // eslint-disable-next-line
     const { model = '', version: wxVersion = '', platform = '', SDKVersion = '', host } = currentSystemInfo;
     systemInfo = { model, wxVersion, platform, SDKVersion, host };

package/src/report/proxy/helper.ts

@@ -5,6 +5,7 @@
 
 import clone from '../clone';
 import helper from '../helper';
+import { getSystemInfoSync } from '../../wxApi';
 import { IInitOptions, IBindEvent } from './types';
 
 let initOptions: IInitOptions;
@@ -30,16 +31,11 @@ function fastReportData(...args: any[]): any {
   initOptions.fastReport(...args);
 }
 
-let systemInfo: WechatMiniprogram.SystemInfo;
-
 /**
  * 获取wx.getSystemInfoSync()
  */
 function getSystemInfo(): any {
-  if (!systemInfo) {
-    systemInfo = wx.getSystemInfoSync();
-  }
-  return systemInfo;
+  return getSystemInfoSync();
 }
 
 let lastBindEvent: IBindEvent;

package/src/syncfnmanager.js

@@ -1,3 +1,5 @@
+import { getSystemInfoSync as getSystemInfoSyncFunc } from './wxApi';
+
 /**
  * @desc: 本文件负责对小程序调用wx同步方法的管理
  */
@@ -14,13 +16,8 @@ const getSystemInfoSync = () => {
     return systemInfo;
   }
 
-  try {
-    systemInfo = wx.getSystemInfoSync();
-
-    return systemInfo;
-  } catch (_) {
-    return {};
-  }
+  systemInfo = getSystemInfoSyncFunc();
+  return systemInfo;
 };
 
 /**

package/src/utils/canvas/canvasDrawer.js

@@ -1,3 +1,5 @@
+import { getSystemInfoSync } from '../../wxApi';
+
 class CanvasDrawer {
   constructor(canvasId, container, instance = '', designWindowWidth = 750) {
     this.canvasId = canvasId; // canvasId
@@ -16,7 +18,7 @@ class CanvasDrawer {
           const canvas = res[0].node;
           this.canvas = canvas;
           this.ctx = canvas.getContext('2d');
-          const { pixelRatio: dpr, windowWidth } = wx.getSystemInfoSync();
+          const { pixelRatio: dpr, windowWidth } = getSystemInfoSync();
           canvas.width = res[0].width * dpr;
           canvas.height = res[0].height * dpr;
           this.ratio = windowWidth / this.designWindowWidth;

package/src/wxApi.ts

@@ -35,4 +35,38 @@ async function getWxSetting(forceRefresh = false): Promise<{
   });
 }
 
-export { getWxSetting };
+/**
+ * 获取系统信息
+ * 文档：https://developers.weixin.qq.com/miniprogram/dev/api/base/system/wx.getSystemInfoSync.html
+ * !!! 注意事项 !!!
+ * 1. 小程序常规打开和被半屏时屏幕尺寸不一样，获取屏幕高度、顶部栏胶囊位置的不要使用该缓存，会导致样式异常，如：navBar组件
+ * 2. 获取系统授权信息的不要使用该缓存，会导致授权信息更新不及时，如：系统位置定位开关打开 ｜ 允许微信使用位置定位能力开关打开
+ */
+function getSystemInfoSync(): WechatMiniprogram.SystemInfo {
+  if (wx.tmsSystemInfo) {
+    return wx.tmsSystemInfo;
+  }
+
+  try {
+    // 可以安全缓存的key，其它key缓存可能会因为更新不及时出现异常
+    const canCacheKeys = [
+      'brand', 'model', 'pixelRatio', 'screenWidth', 'windowWidth', 'language',
+      'version', 'system', 'platform', 'SDKVersion', 'benchmarkLevel', 'host',
+    ];
+    const systemInfo = wx.getSystemInfoSync();
+    const safeSystemInfo = {};
+    canCacheKeys.forEach((key) => {
+      safeSystemInfo[key] = systemInfo[key];
+    });
+
+    wx.tmsSystemInfo = safeSystemInfo;
+    return wx.tmsSystemInfo;
+  } catch (_) {
+    return {};
+  }
+}
+
+export {
+  getWxSetting,
+  getSystemInfoSync,
+};