@tmsfe/tms-core 0.0.49 → 0.0.52

package/package.json

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

package/src/report/proxy/clone.ts

@@ -77,7 +77,7 @@ function deepClone(obj: any, depth = 0, maxDepth = 5): any {
  * 获取触发绑定事件的携带数据
  * @param event
  */
-function getEventExtend(event: any): any {
+function getEventExtra(event: any): any {
   if (!event) {
     return '';
   }
@@ -100,5 +100,5 @@ function getEventExtend(event: any): any {
 
 export default {
   deepClone,
-  getEventExtend,
+  getEventExtra,
 };

package/src/report/proxy/component.ts

@@ -17,13 +17,13 @@ function proxyBindEvent(componentName: string, methods: any, methodName: string)
   }
   // eslint-disable-next-line no-param-reassign
   methods[methodName] = function (...args: any[]): any {
-    const extend = clone.getEventExtend(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, extend });
-      helper.reportData(eventName, methodName, data, extend);
+      helper.setLastBindEvent({ eventName, methodName, data, extra });
+      helper.reportData(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,9 +29,9 @@ 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 extend = getPageLifeExtend(this, methodName);
-    helper.reportData(`Page_${methodName}`, options, extend);
+    const options = methodName === pageTouchEvent ? '' : clone.deepClone(args[0], 0, 1);
+    const extra = getPageLifeExtra(this, methodName, args);
+    helper.reportData(`Page_${methodName}`, options, extra);
 
     // 执行原函数
     return helper.executeFunc(this, original, args, helper.emptyFunc);
@@ -37,9 +39,8 @@ function proxyLifeMethod(pageOptions: any, methodName: string): void {
 }
 
 // 获取生命周期函数上报时的附加信息
-function getPageLifeExtend(page: any, methodName: string): IPageLifeExtend {
+function getPageLifeExtra(page: any, methodName: string, args: any[]): IPageLifeExtra | IPageTouchExtra {
   /* eslint-disable */
-  page.tmsPageShowCount = page.tmsPageShowCount || 0;
   // 页面生命周期内第几次曝光
   let showCount: number;
   // 距离onShow的时长，如果是onShow函数则为距离onLoad的时长
@@ -50,16 +51,33 @@ function getPageLifeExtend(page: any, methodName: string): IPageLifeExtend {
     showCount = page.tmsPageShowCount;
     lessShowTime = page.tmsPageShowTime - page.tmsPageLoadTime;
   } else if (methodName === 'onLoad') {
+    page.tmsTouchCount = 0;
+    page.tmsPageShowCount = 0;
+    page.tmsPageLoadTime = Date.now();
     showCount = 1;
     lessShowTime = 0;
-    page.tmsPageLoadTime = Date.now();
   } else {
     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 */
 }
 
 // 劫持绑定事件
@@ -70,13 +88,13 @@ function proxyBindEvent(pageOptions: any, methodName: string): void {
   }
   // eslint-disable-next-line no-param-reassign
   pageOptions[methodName] = function (...args: any[]): any {
-    const extend = clone.getEventExtend(args[0]) ; // 把触发事件附加数据也带上
+    const extra = clone.getEventExtra(args[0]) ; // 把触发事件附加数据也带上
     // 执行原函数之后再发埋点
     return helper.executeFunc(this, original, args, () => {
       const data = clone.deepClone(this.data);
       const eventName = `Page_${methodName}`;
-      helper.setLastBindEvent({ eventName, methodName, data, extend });
-      helper.reportData(eventName, data, extend);
+      helper.setLastBindEvent({ eventName, methodName, data, extra });
+      helper.reportData(eventName, data, extra);
     });
   };
 }

package/src/report/proxy/types.ts

@@ -23,13 +23,13 @@ interface IBindEvent {
   /**
    * 触发事件的携带参数
    */
-  extend: object,
+  extra: object,
 }
 
 /**
  * 页面生命周期函数的埋点附加数据
  */
-interface IPageLifeExtend {
+interface IPageLifeExtra {
   /**
    * 页面生命周期内第几次曝光
    */
@@ -37,9 +37,53 @@ interface IPageLifeExtend {
   /**
    * 距离onShow的时长，如果是onShow函数则为距离onLoad的时长
    */
-  lessShowTime?: number,
+  lessShowTime: number,
   /**
    * 最后一个触发绑定事件埋点
    */
   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,
 }