visual-buried-point-platform-uni 1.0.0-alpha.17 → 1.0.0-alpha.19

package/autoutils.js

@@ -72,7 +72,6 @@ function autoTrackData(type) {
     const puvData = {
       busSegment: atObj.busSegment || "",
       circulation: cirtemp,
-      ctk: "",
       domain: atObj.domain,
       duration: atDuration,
       module: atObj.module || "",

package/eventutils.js

@@ -16,6 +16,7 @@ function getCurPath() {
 
 // 自定义部分 type=>custom event=>到四种具体事件类型 extend_param 扩展字段
 export function eventCommonStore(data) {
+  if (!data) return;
   const _page = data.$page ? data.$page : "";
   const _path = _page.path ? _page.path : getCurPath();
   let reportEventData = {
@@ -25,8 +26,8 @@ export function eventCommonStore(data) {
     eventId: data.$event_id ? data.$event_id : "",
     event: data.$event_code ? data.$event_code : "",
     groupId: "",
-    busSegment: data.$busSegment,
-    module: data.$module,
+    busSegment: data.$busSegment ? data.$busSegment : "",
+    module: data.$module ? data.$module : "",
     page: {
       domain: _page.domain ? _page.domain : "",
       pageId: MD5(_path),
@@ -57,14 +58,11 @@ export function eventCommonStore(data) {
  *  插入Event数据合并
  */
 export function insertEventData(cData) {
-  console.log("写入Event数据 ", cData);
   const cd = uni.getStorageSync(BPNEvent);
   let allEventData = cd ? JSON.parse(cd) : [];
   if (cData && cData.length) {
     // concat方法
     allEventData.concat(cData);
-    // ...方法
-    // allEventData = { ...allEventData, ...cData };
     uni.setStorageSync(BPNEvent, JSON.stringify(allEventData));
   }
 }

package/index.js

@@ -29,7 +29,6 @@ export function init(config) {
     Global.upEventUrl = _cf.reportUrl;
     Global.upTrackUrl = _cf.reportTrackUrl;
     Object.assign(Global, config);
-    console.log("global:: ", Global);
     getBaseicInfo();
     _comInfo.distinctId = uni.getStorageSync("v_userId")
       ? uni.getStorageSync("v_userId")
@@ -43,9 +42,9 @@ export function init(config) {
   } else {
     console.log("init config error, please check config!");
   }
-  // 开启全局定时器
+  // Enabling a global timer
   startGlobalTime();
-  // 监听页面的加载、卸载
+  // Monitor page loading and unloading
   uniInterceptorListener();
 }
 
@@ -69,7 +68,7 @@ export function setUserId(userId) {
   }
 }
 
-//对外开放，获取跟踪Id
+// get trackId
 export function getTrackId() {
   return sdkTrackIdVal();
 }
@@ -89,12 +88,12 @@ export function onDestroyTrack() {
   uStopTrackPVData();
 }
 
-// auto track 预置的属性
+// auto track Preset attribute
 export function setPageExtraObj(tData) {
   uUpdatePageExtraArray(tData);
 }
 
-// 数据上报
+// data upload
 export function reportTrackEventServer(upType, data, sFailKey) {
   if (!upType) {
     console.error("please set upload data upType");
@@ -142,7 +141,7 @@ function commonData(allData) {
   };
 }
 
-//获取基本信息
+// get baseInfo
 function getBaseicInfo() {
   uni.getSystemInfo({
     success: function (res) {
@@ -162,7 +161,7 @@ function getBaseicInfo() {
         Global.platform = "weixin";
         appData = getWXInfo();
       }
-      deviceData = getDeviceInfo(res, Global.platform);
+      deviceData = getDeviceInfo(res);
     },
     fail: function (error) {
       deviceData = getDeviceInfoError();

package/manualutils.js

@@ -1,9 +1,10 @@
 import { AUTOTRACKTYPE, insertPVUVData } from "./autoutils.js";
 import {
   getTrackObj,
-  getUtmObj, randomUUID,
+  getUtmObj,
+  randomUUID,
   sdkTrackIdVal,
-  timeToStr
+  timeToStr,
 } from "./tools.js";
 
 // 流量上报采集

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "visual-buried-point-platform-uni",
-  "version": "1.0.0-alpha.17",
-  "lsi": "2df7d9fee02691e293eb3e32b4593ade#1.0.0-alpha.17",
+  "version": "1.0.0-alpha.19",
+  "lsi": "76e68a623e8df7515867ffd998b9f487#1.0.0-alpha.19",
   "description": "To make it easy for you to get started with GitLab, here's a list of recommended next steps.",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "webpack --mode production && npm run lsi-md5",
+    "build": "rimraf dist && webpack --mode production && npm run lsi-md5",
     "lsi-md5": "node lsi-md5.js"
   },
   "repository": {
@@ -21,6 +21,7 @@
     "md5": "^2.3.0"
   },
   "devDependencies": {
+    "rimraf": "^6.0.1",
     "webpack": "^5.72.1",
     "webpack-cli": "4.9.2"
   }

package/tools.js

@@ -107,7 +107,6 @@ export function getWebH5Info(result) {
     packageName: hostname ? hostname : "",
     version: "",
     carrier: "h5",
-    //ecology: ecology,
     ecology: "h5",
   };
 }
@@ -123,7 +122,6 @@ export function getWXInfo() {
       ? accInfo.miniProgram.envVersion + accInfo.miniProgram.version
       : "",
     carrier: "mini",
-    // ecology: "wechat",
     ecology: "mini",
   };
 }
@@ -159,8 +157,8 @@ export function getAppInfo(result) {
   return app;
 }
 
-function getCurDeviceType(res, platform) {
-  if (platform !== "wx") {
+function getCurDeviceType(res) {
+  if (Global.platform === "web" || platform === "h5") {
     const userAgent = res.ua.toLowerCase();
     if (/(windows|win32|win64|wow64)/.test(userAgent)) {
       return 1;
@@ -181,7 +179,7 @@ function getCurDeviceType(res, platform) {
 }
 
 //获取设备信息
-export function getDeviceInfo(res, platform) {
+export function getDeviceInfo(res) {
   let device = {
     lang: res.osLanguage ? res.osLanguage : res.hostLanguage,
     brand: res.deviceBrand + " " + res.deviceModel,
@@ -192,7 +190,7 @@ export function getDeviceInfo(res, platform) {
     browserVersion: res.browserVersion,
     color: "",
     deviceId: res.deviceId,
-    deviceType: getCurDeviceType(res, platform),
+    deviceType: getCurDeviceType(res),
     network: "",
   };
   return device;
@@ -279,14 +277,14 @@ export function uUpdatePageExtraArray(d) {
 
 // 得到utm
 export function getUtmObj() {
-  let utm = {
-    utmSource: "",
-    utmCampaign: "",
-    utmTerm: "",
-    utmContent: "",
-    ctk: "",
-  };
   if (Global.platform === "web" || Global.platform === "h5") {
+    let utm = {
+      utmSource: "",
+      utmCampaign: "",
+      utmTerm: "",
+      utmContent: "",
+      ctk: "",
+    };
     if (window.location.href) {
       const paramsUrl = window.location.href.split("?")[1] || "";
       if (paramsUrl) {
@@ -303,6 +301,8 @@ export function getUtmObj() {
         utm.ctk = urlParams.get("ctk") || "";
       }
     }
+    return utm;
+  } else {
+    return null;
   }
-  return utm;
 }