visual-buried-point-platform-uni 1.0.0-alpha.4 → 1.0.0-alpha.6

package/index.js

@@ -29,6 +29,8 @@ let _config = {
   srcDomain: "",
   flushInterval: 15,
 };
+//custom
+let timer = null;
 //track upload interval
 let tInterval = null;
 let busObj = null;
@@ -79,7 +81,7 @@ function startGlobalTime() {
   clearInterval(cInterval);
   cInterval = setInterval(() => {
     let cData = getSData();
-    console.log("storage data " + JSON.stringify(cData));
+    // console.log("storage data " + JSON.stringify(cData));
     if (cData) {
       reportCustom(cData);
       delSData();
@@ -123,22 +125,24 @@ export function setCustomEvent(data) {
     traceId: "",
     trackId: trackId,
     triggerTime: timeToStr(Date.now()),
-    url: "",
+    url: url,
   };
   if (reportData) {
     addCache(reportData);
-    const data = getCache();
-    if (data.length) {
-      console.log("customData: ", JSON.stringify(data));
-      addSData(data);
-      clearCache();
-    }
+    clearTimeout(timer);
+    timer = setTimeout(() => {
+      const data = getCache();
+      if (data.length) {
+        addSData(data);
+        clearCache();
+      }
+    }, 1000);
   }
 }
 
 function reportCustom(data) {
   if (!reportUrl) {
-    //console.error("please set upload data url");
+    console.error("please set upload data reportUrl");
     return;
   }
   const comData = commonData(data);
@@ -243,23 +247,23 @@ function reportTrack(data) {
 }
 
 function getCurPath() {
-  if (platform) {
-    if (platform == "wx") {
-      let gcp = getCurrentPages();
-      return gcp ? gcp[gcp.length - 1].route : "/";
-    } else if (platform == "web") {
-      return window.location.hostname;
-    } else if (platform == "android" || platform === "ios") {
-      return "";
-    }
-  }
+  // if (platform === "android" || platform === "ios") {
+  //   return "";
+  // } else {
+  //   const pages = getCurrentPages();
+  //   const gcp = pages[pages.length - 1];
+  //   return gcp ? gcp.route : "/";
+  // }
+  const pages = getCurrentPages();
+  const gcp = pages[pages.length - 1];
+  return gcp ? gcp.route : "/";
 }
 
 function commonData(allData) {
   return {
     app: appData,
     data: allData,
-    deviceData: deviceData,
+    device: deviceData,
     lsi: localLsi,
     projectId: _config.token,
     userAgent: uAgent ? uAgent : "",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "visual-buried-point-platform-uni",
-  "version": "1.0.0-alpha.04",
-  "lsi": "278a70bc53ca1fad0e680e2aa1fe2855",
+  "version": "1.0.0-alpha.06",
+  "lsi": "dec5c3d85a97a8b63bf1219cbb31be17",
   "description": "To make it easy for you to get started with GitLab, here's a list of recommended next steps.",
   "main": "index.js",
   "scripts": {

package/tools.js

@@ -64,11 +64,14 @@ export function webH5Info(result) {
 
 //微信的appInfo
 export function wxInfo() {
-  let accInfo = uni.getAccountInfoSync();
+  const accInfo = uni.getAccountInfoSync();
+  const bInfo = uni.getAppBaseInfo();
   return {
-    name: "",
-    packageName: accInfo ? accInfo.appId : "",
-    version: accInfo ? accInfo.envVersion + accInfo.version : "",
+    name: bInfo.appName ? bInfo.appName : "",
+    packageName: accInfo ? accInfo.miniProgram.appId : "",
+    version: accInfo
+      ? accInfo.miniProgram.envVersion + accInfo.miniProgram.version
+      : "",
     carrier: "mini",
     ecology: "wechat",
   };
@@ -81,6 +84,8 @@ export function getAppInfo(result) {
     name: result.appName,
     version: version ? version : "",
     carrier: "app",
+    packageName: "",
+    ecology: "",
   };
   if (result.platform === "android") {
     let osName = "android";
@@ -88,28 +93,17 @@ export function getAppInfo(result) {
     if (result.romName.includes("HarmonyOS")) {
       osName = "harmonyOS";
     }
-    app = {
-      ...app,
-      packageName: pkName ? pkName : "",
-      ecology: osName,
-    };
+    app.packageName = pkName ? pkName : "";
+    app.ecology = osName;
   } else if (result.platform === "ios") {
     let pkName = plus.ios
       .importClass("NSBundle")
       .mainBundle()
       .bundleIdentifier();
-    app = {
-      ...app,
-      packageName: pkName ? pkName : "",
-      ecology: "ios",
-    };
+    app.packageName = pkName ? pkName : "";
+    app.ecology = "ios";
   } else {
-    app = {
-      ...app,
-      packageName: "",
-      version: "",
-      ecology: "unknown",
-    };
+    app.ecology = "unknown";
   }
   return app;
 }
@@ -127,7 +121,11 @@ function getCurDeviceType(res, platform) {
       return 2;
     }
   } else {
-    return 1;
+    if (res.deviceType === "pc") {
+      return 2;
+    } else {
+      return 1;
+    }
   }
 }