visual-buried-point-platform-uni 1.0.0-alpha.3 → 1.0.0-alpha.5

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;
@@ -127,18 +129,20 @@ export function setCustomEvent(data) {
   };
   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);
@@ -259,7 +263,7 @@ function commonData(allData) {
   return {
     app: appData,
     data: allData,
-    deviceData: deviceData,
+    device: deviceData,
     lsi: localLsi,
     projectId: _config.token,
     userAgent: uAgent ? uAgent : "",
@@ -288,7 +292,7 @@ function getBaseicInfo() {
         platform = "wx";
         appData = wxInfo();
       }
-      deviceData = getDeviceInfo(res);
+      deviceData = getDeviceInfo(res, platform);
     },
     fail: function (error) {
       deviceData = getDeviceInfoError();
@@ -296,10 +300,7 @@ function getBaseicInfo() {
     complete: function () {
       uni.getNetworkType({
         success(res) {
-          deviceData = {
-            ...deviceData,
-            network: res.networkType,
-          };
+          deviceData.network = res.networkType;
         },
       });
     },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "visual-buried-point-platform-uni",
-  "version": "1.0.0-alpha.03",
-  "lsi": "9b6bb5e44edfe8d4f2b9bfaad5c392fb",
+  "version": "1.0.0-alpha.05",
+  "lsi": "50ba3c2ac38fa587d3ff435ae1a0fb21",
   "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

@@ -65,10 +65,13 @@ export function webH5Info(result) {
 //微信的appInfo
 export function wxInfo() {
   let accInfo = uni.getAccountInfoSync();
+  console.log("baseinfo " + JSON.stringify(uni.getAppBaseInfo()));
   return {
     name: "",
-    packageName: accInfo ? accInfo.appId : "",
-    version: accInfo ? accInfo.envVersion + accInfo.version : "",
+    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,47 +93,44 @@ 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;
 }
 
-function getCurDeviceType(ua) {
-  const userAgent = ua.toLowerCase();
-  if (/(windows|win32|win64|wow64)/.test(userAgent)) {
-    return 1;
-  } else if (/(linux|android)/.test(userAgent)) {
-    return 2;
-  } else if (/(macintosh|mac os x|iphone|ipad|ipod)/.test(userAgent)) {
-    return 2;
+function getCurDeviceType(res, platform) {
+  if (platform !== "wx") {
+    const userAgent = res.ua.toLowerCase();
+    if (/(windows|win32|win64|wow64)/.test(userAgent)) {
+      return 1;
+    } else if (/(linux|android)/.test(userAgent)) {
+      return 2;
+    } else if (/(macintosh|mac os x|iphone|ipad|ipod)/.test(userAgent)) {
+      return 2;
+    } else {
+      return 2;
+    }
   } else {
-    return 2;
+    if (res.deviceType === "pc") {
+      return 2;
+    } else {
+      return 1;
+    }
   }
 }
 
 //获取设备信息
-export function getDeviceInfo(res) {
+export function getDeviceInfo(res, platform) {
   let device = {
     lang: res.osLanguage ? res.osLanguage : res.hostLanguage,
     brand: res.deviceBrand + " " + res.deviceModel,
@@ -139,7 +141,7 @@ export function getDeviceInfo(res) {
     browserVersion: res.browserVersion,
     color: "",
     deviceId: res.deviceId,
-    deviceType: getCurDeviceType(res.ua),
+    deviceType: getCurDeviceType(res, platform),
     network: "",
   };
   return device;
@@ -174,8 +176,8 @@ export function getTrackObj(busObj) {
       url: busObj.url ? busObj.url : "",
       circulation: gcp.length > 1 ? 2 : 1,
       visitPage: gcp.length,
-      sourceDomain: busObj.sourceDomain? busObj.sourceDomain : "",
-      sourceUrl: busObj.sourceUrl? busObj.sourceUrl : "",
+      sourceDomain: busObj.sourceDomain ? busObj.sourceDomain : "",
+      sourceUrl: busObj.sourceUrl ? busObj.sourceUrl : "",
       title: busObj.title ? busObj.title : "",
     };
   }