@rk911/tracker-sdk 1.7.10 → 1.7.13

package/core/session.js

@@ -61,10 +61,6 @@ export class SessionManager {
   }
 
   setUser(userId, isNative = false) {
-    if (!userId && this.userId && !isNative) {
-      // 防误置空：外部未准备好用户身份传空时，若内存中已有合法 userId，绝不置空；清空需调用 resetSession
-      return
-    }
     this.userId = userId || null
     this.isNativeUserId = !!isNative
     if (userId) {
@@ -72,7 +68,7 @@ export class SessionManager {
       if (!isNative) {
         this.adapter.setStorage('userId', userId)
       }
-    } else if (!userId && !isNative) {
+    } else if (!userId) {
       this.adapter.removeStorage('userId')
       this.adapter.removeStorage('_tracker_user_id')
     }
@@ -169,6 +165,7 @@ export class SessionManager {
   resetSession() {
     this.adapter.removeSessionStorage(this._storageKey)
     this.adapter.removeStorage('_tracker_user_id')
+    this.adapter.removeStorage('userId')
     this.userId = null
     this.isNativeUserId = false
     this.isNativeSessionId = false

package/native/android/AndroidTracker.java

@@ -245,6 +245,18 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         return deviceId;
     }
 
+    public String getUserId() {
+        return userId != null ? userId : "";
+    }
+
+    public String getPhone() {
+        return phone != null ? phone : "";
+    }
+
+    public String getStoreName() {
+        return storeName != null ? storeName : "";
+    }
+
     public void setUserId(String userId) {
         updateUser(userId, null, null);
     }
@@ -365,6 +377,27 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         });
     }
 
+    public void trackCustom(final String eventName, final String elementText, final JSONObject customProperties) {
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    JSONObject event = createBaseEvent("custom", eventName);
+                    if (!TextUtils.isEmpty(elementText)) {
+                        event.put("elementText", elementText);
+                    }
+                    if (customProperties != null) {
+                        event.put("extraData", customProperties.toString());
+                    }
+                    enqueueEvent(event);
+                    flushAsync();
+                } catch (Exception e) {
+                    Log.e(TAG, "===> [Native Tracker trackCustom Failed]", e);
+                }
+            }
+        });
+    }
+
     public void track(final String eventName, final JSONObject customProperties) {
         postBgTask(new Runnable() {
             @Override
@@ -520,6 +553,10 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         event.put("eventName", eventName);
         event.put("timestamp", System.currentTimeMillis());
         event.put("sequence", sequence);
+        event.put("sessionId", sessionId);
+        if (!TextUtils.isEmpty(userId)) {
+            event.put("userId", userId);
+        }
         event.put("pageRoute", currentPageRoute);
         String autoTitle = getFriendlyPageTitle(currentPageRoute);
         if (!TextUtils.isEmpty(autoTitle)) {
@@ -657,9 +694,23 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         try {
             JSONObject body = new JSONObject();
             body.put("appId", Integer.parseInt(appId));
-            body.put("sessionId", sessionId);
-            body.put("deviceId", deviceId);
-            body.put("userId", userId != null ? userId : "");
+
+            // 批次级别会话与用户身份防护：优先取首条事件自身的 sessionId 与 userId，防切换账号后历史批次被新身份篡改
+            String batchSessionId = sessionId;
+            String batchUserId = userId != null ? userId : "";
+            if (!records.isEmpty()) {
+                JSONObject firstEvt = records.get(0).json;
+                if (firstEvt.has("sessionId") && !TextUtils.isEmpty(firstEvt.optString("sessionId"))) {
+                    batchSessionId = firstEvt.optString("sessionId");
+                }
+                if (firstEvt.has("userId") && !TextUtils.isEmpty(firstEvt.optString("userId"))) {
+                    batchUserId = firstEvt.optString("userId");
+                }
+            }
+
+            body.put("sessionId", batchSessionId);
+            body.put("deviceId", deviceId != null ? deviceId : "");
+            body.put("userId", batchUserId);
             body.put("phone", phone != null ? phone : "");
             body.put("storeName", storeName != null ? storeName : "");
             body.put("platform", "android");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rk911/tracker-sdk",
-  "version": "1.7.10",
+  "version": "1.7.13",
   "description": "人康多端埋点 SDK — 跨端自动化采集 + 手动埋点双写兼容",
   "main": "index.js",
   "module": "index.js",

package/platforms/web.js

@@ -26,6 +26,12 @@ export const ROUTE_TITLE_MAP = {
   '/pages/integralMall/integralGoodsInfo': '积分商品详情',
   '/pages/my/setting/setting': '设置',
   '/pages/selfInvoice/index': '自助开票',
+  '/pages/circle/userHome/userHome': '个人主页',
+  '/pages/circle/rank': '圈子排行榜',
+  '/pages/pickup/list': '自提订单',
+  '/pages/mall/order/index': '我的订单',
+  '/pages/my/userInfo': '个人资料',
+  '/live/index/log': '直播记录',
 }
 
 export class WebAdapter {