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

package/index.js

@@ -288,7 +288,7 @@ function getBaseicInfo() {
         platform = "wx";
         appData = wxInfo();
       }
-      deviceData = getDeviceInfo(res);
+      deviceData = getDeviceInfo(res, platform);
     },
     fail: function (error) {
       deviceData = getDeviceInfoError();
@@ -296,10 +296,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.02",
-  "lsi": "f0ca171a9f641657370a83f2f7ed65c7",
+  "version": "1.0.0-alpha.04",
+  "lsi": "278a70bc53ca1fad0e680e2aa1fe2855",
   "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

@@ -114,21 +114,25 @@ export function getAppInfo(result) {
   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;
+    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 +143,7 @@ export function getDeviceInfo(res) {
     browserVersion: res.browserVersion,
     color: "",
     deviceId: res.deviceId,
-    deviceType: getCurDeviceType(res.ua),
+    deviceType: getCurDeviceType(res, platform),
     network: "",
   };
   return device;
@@ -167,21 +171,6 @@ export function getTrackObj(busObj) {
   //uni 通用h5、app、wx拿到当前路由栈
   const pages = getCurrentPages();
   const gcp = pages[pages.length - 1];
-  //h5
-  // let wl = window.location;
-  // let docTitle = document.title;
-  // let refurl = document.referrer;
-  let parsedUrl;
-  if (refurl) {
-    parsedUrl = new URL(refurl);
-  } else {
-    let busRefUrl = busObj.sourceUrl;
-    if (busRefUrl) {
-      parsedUrl = new URL(busRefUrl);
-    } else {
-      parsedUrl = "";
-    }
-  }
   if (gcp) {
     return {
       path: gcp.route,
@@ -189,9 +178,9 @@ export function getTrackObj(busObj) {
       url: busObj.url ? busObj.url : "",
       circulation: gcp.length > 1 ? 2 : 1,
       visitPage: gcp.length,
-      sourceDomain: parsedUrl ? parsedUrl.hostname : "",
-      sourceUrl: parsedUrl,
-      title: docTitle ? docTitle : "",
+      sourceDomain: busObj.sourceDomain ? busObj.sourceDomain : "",
+      sourceUrl: busObj.sourceUrl ? busObj.sourceUrl : "",
+      title: busObj.title ? busObj.title : "",
     };
   }
 }