@tmsfe/tms-core 0.0.50 → 0.0.53

package/package.json

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

package/src/report/formatV2.ts

@@ -56,7 +56,9 @@ function getBaseData(deviceData: IDeviceData): { arr: DataItem[], nextIndex: num
   arr[24] = JSON.stringify(page?.options);
   // 25: f25，当前页面深度
   arr[25] = pageDepth.toString();
-  // 26 ~ 30: 预留字段给后续扩展使用
+  // 26: f26，一次小程序生命周期中的埋点统一标记
+  arr[26] = helper.getLifeReportKey();
+  // 27 ~ 30: 预留字段给后续扩展使用
   // 31 ~ 40: 提供给开发自定义
   // --------------------------字段列表--------------------------
   return { arr, nextIndex: 31 };

package/src/report/helper.ts

@@ -102,6 +102,18 @@ function getNowString(): string {
   return `${year}${month}${day}${hours}${minutes}${seconds}${ms}`;
 }
 
+let lifeReportKey = '';
+
+/**
+ * 一次小程序生命周期中的埋点统一标记
+ */
+function getLifeReportKey(): string {
+  if (lifeReportKey === '') {
+    lifeReportKey = getNowString();
+  }
+  return lifeReportKey;
+}
+
 /**
  * 获取当前页面信息
  */
@@ -228,6 +240,7 @@ export default {
   getSystemInfoString,
   convert2String,
   getNowString,
+  getLifeReportKey,
   getPageInfo,
   getLaunchOptionsString,
   getLaunchFrom,

package/src/report/proxy/component.ts

@@ -17,9 +17,9 @@ function proxyBindEvent(componentName: string, methods: any, methodName: string)
   }
   // eslint-disable-next-line no-param-reassign
   methods[methodName] = function (...args: any[]): any {
-    const extra = clone.getEventExtra(args[0]) ; // 把触发事件附加数据也带上
     // 执行原函数之后再发埋点
     return helper.executeFunc(this, original, args, () => {
+      const extra = clone.getEventExtra(args[0]) ; // 把触发事件附加数据也带上
       const data = clone.deepClone(this.data);
       const eventName = `Component_${componentName}`;
       helper.setLastBindEvent({ eventName, methodName, data, extra });

package/src/report/proxy/helper.ts

@@ -17,6 +17,18 @@ function reportData(...args: any[]): any {
   reporter.report2(...args);
 }
 
+let systemInfo: any = null;
+
+/**
+ * 获取wx.getSystemInfoSync()
+ */
+function getSystemInfo(): any {
+  if (systemInfo === null) {
+    systemInfo = wx.getSystemInfoSync();
+  }
+  return systemInfo;
+}
+
 let lastBindEvent: IBindEvent;
 
 /**
@@ -70,9 +82,10 @@ function executeFunc(context: any, func: Function, args: any[], callback: Functi
 }
 
 export default {
-  reportData,
   emptyFunc,
+  reportData,
   executeFunc,
+  getSystemInfo,
   getLastBindEvent,
   setLastBindEvent,
 };

package/src/report/proxy/page.ts

@@ -7,12 +7,14 @@
 import helper from './helper';
 import clone from './clone';
 
+// 工具为页面根节点插入的触摸事件
+const pageTouchEvent = 'onReportPageTouch';
 // 必须上报的生命周期函数
-const mustLifeMethods = ['onLoad', 'onShow', 'onReady', 'onHide', 'onUnload'];
+const mustLifeMethods = ['onLoad', 'onShow', 'onReady', 'onHide', 'onUnload', pageTouchEvent];
 // 可能会有的生命周期函数
 const maybeLifeMethods = [
   'onPullDownRefresh', 'onReachBottom', 'onShareAppMessage',
-  'onShareTimeline', 'onAddToFavorites', 'onPageScroll',
+  'onShareTimeline', 'onAddToFavorites',
 ];
 const lifeMethods = mustLifeMethods.concat(maybeLifeMethods);
 
@@ -27,8 +29,8 @@ function proxyLifeMethod(pageOptions: any, methodName: string): void {
   // eslint-disable-next-line no-param-reassign
   pageOptions[methodName] = function (...args: any[]): any {
     // 生命周期函数先发埋点，避免次过程用户退出而丢失埋点
-    const options = clone.deepClone(args[0], 0, 1);
-    const extra = getPageLifeExtra(this, methodName);
+    const options = methodName === pageTouchEvent ? '' : clone.deepClone(args[0], 0, 1);
+    const extra = getPageLifeExtra(this, methodName, args);
     helper.reportData(`Page_${methodName}`, options, extra);
 
     // 执行原函数
@@ -37,7 +39,7 @@ function proxyLifeMethod(pageOptions: any, methodName: string): void {
 }
 
 // 获取生命周期函数上报时的附加信息
-function getPageLifeExtra(page: any, methodName: string): IPageLifeExtra {
+function getPageLifeExtra(page: any, methodName: string, args: any[]): IPageLifeExtra | IPageTouchExtra {
   /* eslint-disable */
   // 页面生命周期内第几次曝光
   let showCount: number;
@@ -49,6 +51,7 @@ function getPageLifeExtra(page: any, methodName: string): IPageLifeExtra {
     showCount = page.tmsPageShowCount;
     lessShowTime = page.tmsPageShowTime - page.tmsPageLoadTime;
   } else if (methodName === 'onLoad') {
+    page.tmsTouchCount = 0;
     page.tmsPageShowCount = 0;
     page.tmsPageLoadTime = Date.now();
     showCount = 1;
@@ -57,9 +60,24 @@ function getPageLifeExtra(page: any, methodName: string): IPageLifeExtra {
     showCount = page.tmsPageShowCount;
     lessShowTime = Date.now() - page.tmsPageShowTime;
   }
-  /* eslint-enable */
+
+  let touchCount = page.tmsTouchCount;
+
+  // 如果是页面触摸事件
+  if (methodName === pageTouchEvent) {
+    page.tmsTouchCount += 1;
+    touchCount += 1;
+    const { clientX, clientY, pageX, pageY } = args[0].touches[0];
+    const { windowWidth, windowHeight } = helper.getSystemInfo();
+    return {
+      showCount, lessShowTime, touchCount,
+      windowWidth, windowHeight, clientX, clientY, pageX, pageY,
+    };
+  }
+
   const lastBindEvent = helper.getLastBindEvent();
-  return { showCount, lessShowTime, lastBindEvent };
+  return { showCount, lessShowTime, lastBindEvent, touchCount };
+  /* eslint-enable */
 }
 
 // 劫持绑定事件

package/src/report/proxy/types.ts

@@ -42,4 +42,48 @@ interface IPageLifeExtra {
    * 最后一个触发绑定事件埋点
    */
   lastBindEvent: IBindEvent | null,
+  /**
+   * 页面触摸次数
+   */
+  touchCount: number,
+}
+
+interface IPageTouchExtra {
+  /**
+   * 页面生命周期内第几次曝光
+   */
+  showCount: number,
+  /**
+   * 距离onShow的时长
+   */
+  lessShowTime: number,
+  /**
+   * 页面触摸次数
+   */
+  touchCount: number,
+
+  /**
+   * 可使用窗口宽度
+   */
+  windowWidth: number,
+  /**
+   * 可使用窗口高度
+   */
+  windowHeight: number,
+  /**
+   * 触摸目标在视口中的x坐标
+   */
+  clientX: number,
+  /**
+   * 触摸目标在视口中的y坐标
+   */
+  clientY: number,
+  /**
+   * 触摸目标在页面中的x坐标
+   */
+  pageX: number,
+  /**
+   * 触摸目标在页面中的y坐标
+   */
+  pageY: number,
 }