[feat] 属性根据当前网络环境实时更新

analysys · Oct 21, 2022 · ddd1781 · ddd1781
1 parent 46e56d8
commit ddd1781
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 28 deletions.
diff --git a/demo/demo/app.js b/demo/demo/app.js
@@ -26,7 +26,8 @@ AnalysysAgent.init({
   $appname: 'test_appname',
   $appid: 'test_app_id',
   autoPageViewDuration: true,
-  autoShare: false
+  autoShare: false,
+  autoTrack: true
 })
 
 AnalysysAgent.registerSuperProperty('sfsf', 1)

diff --git a/demo/demo/sdk/AnalysysAgent_WX_SDK.es6.min.js b/demo/demo/sdk/AnalysysAgent_WX_SDK.es6.min.js
diff --git a/demo/demo/sdk/AnalysysAgent_WX_SDK.min.js b/demo/demo/sdk/AnalysysAgent_WX_SDK.min.js
diff --git a/demo/demoPlugin/sdk/AnalysysAgent_WX_SDK.plugin.es6.min.js b/demo/demoPlugin/sdk/AnalysysAgent_WX_SDK.plugin.es6.min.js
diff --git a/demo/demoPlugin/sdk/AnalysysAgent_WX_SDK.plugin.min.js b/demo/demoPlugin/sdk/AnalysysAgent_WX_SDK.plugin.min.js
diff --git a/demo/demoTaro/sdk/AnalysysAgent_WX_SDK.custom.es6.min.js b/demo/demoTaro/sdk/AnalysysAgent_WX_SDK.custom.es6.min.js
diff --git a/demo/demoTaro/sdk/AnalysysAgent_WX_SDK.custom.min.js b/demo/demoTaro/sdk/AnalysysAgent_WX_SDK.custom.min.js
diff --git a/dist/AnalysysAgent_WX_SDK.custom.es6.min.js b/dist/AnalysysAgent_WX_SDK.custom.es6.min.js
diff --git a/dist/AnalysysAgent_WX_SDK.custom.min.js b/dist/AnalysysAgent_WX_SDK.custom.min.js
diff --git a/dist/AnalysysAgent_WX_SDK.es6.min.js b/dist/AnalysysAgent_WX_SDK.es6.min.js
diff --git a/dist/AnalysysAgent_WX_SDK.min.js b/dist/AnalysysAgent_WX_SDK.min.js
diff --git a/dist/AnalysysAgent_WX_SDK.plugin.es6.min.js b/dist/AnalysysAgent_WX_SDK.plugin.es6.min.js
diff --git a/dist/AnalysysAgent_WX_SDK.plugin.min.js b/dist/AnalysysAgent_WX_SDK.plugin.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "asd-wechat-sdk",
-	"version": "5.0.1",
+	"version": "5.0.2",
 	"description": "This is the offical wechat SDK for Analysys.",
 	"main": "dist/AnalysysAgent_WX_SDK.min.js",
 	"module": "dist/AnalysysAgent_WX_SDK.es6.min.js",

diff --git a/src/module/fillData/index.ts b/src/module/fillData/index.ts
@@ -15,21 +15,26 @@ export default function (eventName: string) : buriedPointData {
 
   const event = events[eventName]
 
+  // 设置事件属性
+  function setEventAttr(attrName) {
+    let getAttrFn = getAttr[attrName]
+    if (getAttrFn) {
+      const value = getAttrFn()
+      if (value !== '' && value !== null && value !== undefined) {
+        obj.xcontext[attrName] = value
+      }
+    }
+  }
+
   // 填充公共属性
   publicAttrs.forEach(o => {
-    const value = getAttr[o]()
-    if (value) {
-      obj.xcontext[o] = value
-    }
+    setEventAttr(o)
   })
 
   // 填充事件私有属性
   if (event) {
     event.forEach(o => {
-      const value = getAttr[o] && getAttr[o]()
-      if (value) {
-        obj.xcontext[o] = value
-      }
+      setEventAttr(o)
     })
   }
 

diff --git a/src/module/methods/userClick.ts b/src/module/methods/userClick.ts
@@ -3,6 +3,7 @@ import sendData from '../sendData'
 import fillData from '../fillData'
 import { isObject } from '../../utils/type'
 import { getSuperProperty } from '../../store/core'
+import { getPageProperty } from '../../store/pageProperty'
 import { setUserClickAttrs } from '../../store/clickElement'
 
 function userClick(...args: any[]) {
@@ -28,7 +29,7 @@ function userClick(...args: any[]) {
     const res = fillData('$user_click')
 
     // 合并通用属性
-    res.xcontext = Object.assign({}, res.xcontext, getSuperProperty())
+    res.xcontext = Object.assign({}, res.xcontext, getSuperProperty(), getPageProperty())
 
     sendData(res)
   }
@@ -50,7 +51,7 @@ export function userClickTab(tabItem) {
   const res = fillData('$user_click')
 
   // 合并通用属性
-  res.xcontext = Object.assign({}, res.xcontext, getSuperProperty())
+  res.xcontext = Object.assign({}, res.xcontext, getSuperProperty(), getPageProperty())
 
   sendData(res)
 }
diff --git a/src/store/network.ts b/src/store/network.ts
@@ -56,4 +56,8 @@ function hasNetwork () : boolean {
   return !network.networkType ? false : true
 }
 
+globalWindow.onNetworkStatusChange((res: {networkType: string}) => {
+  network.networkType = res.networkType
+})
+
 export { network, getNetwork, setNetwork, hasNetwork, isGetNetWork }