@rk911/tracker-sdk 1.7.3 → 1.7.4

package/core/session.js

@@ -63,8 +63,11 @@ export class SessionManager {
   setUser(userId, isNative = false) {
     this.userId = userId
     this.isNativeUserId = !!isNative
+    // 纯 H5 登录才写入永久 localStorage；Native 注入仅保存在会话级 sessionStorage，防止 Native 退出登录后 H5 残留旧账号
     if (userId && !isNative) {
       this.adapter.setStorage('userId', userId)
+    } else if (!userId && !isNative) {
+      this.adapter.removeStorage('userId')
     }
     this._save()
   }
@@ -73,10 +76,8 @@ export class SessionManager {
     if (deviceId) {
       this.deviceId = deviceId
       this.isNativeDeviceId = !!isNative
-      if (!isNative) {
-        this.adapter.setStorage(DEVICE_ID_KEY, deviceId)
-        this.adapter.setStorage('deviceId', deviceId)
-      }
+      this.adapter.setStorage(DEVICE_ID_KEY, deviceId)
+      this.adapter.setStorage('deviceId', deviceId)
       this._save()
     }
   }
@@ -90,6 +91,13 @@ export class SessionManager {
     }
   }
 
+  setInitialSequence(seq) {
+    if (typeof seq === 'number' && !isNaN(seq) && seq > this.sequence) {
+      this.sequence = seq
+      this._save()
+    }
+  }
+
   getUserId() {
     return this.userId
   }
@@ -119,24 +127,33 @@ export class SessionManager {
       lastActivityTime: this.lastActivityTime,
       sequence: this.sequence,
       isNativeSessionId: !!this.isNativeSessionId,
+      userId: this.userId,
+      isNativeUserId: !!this.isNativeUserId,
     }
     this.adapter.setSessionStorage(this._storageKey, data)
   }
 
   _restore() {
     var data = this.adapter.getSessionStorage(this._storageKey)
-    if (data && data.sessionId && !data.isNativeSessionId) {
+    if (data && data.sessionId) {
       this.sessionId = data.sessionId
       this.startTime = data.startTime
       this.lastActivityTime = data.lastActivityTime
       this.sequence = data.sequence || 0
-
+      this.isNativeSessionId = !!data.isNativeSessionId
+      this.isNativeUserId = !!data.isNativeUserId
+      if (data.userId) {
+        this.userId = data.userId
+      }
       if (this._isExpired()) {
         this._createNew()
       }
     } else {
       this._createNew()
     }
+    if (!this.userId) {
+      this.userId = this.adapter.getStorage('userId') || null
+    }
   }
 
   resetSession() {

package/core/tracker.js

@@ -40,16 +40,25 @@ export class Tracker {
 
   _getDeviceFields() {
     var info = this.adapter.getDeviceInfo() || {}
+    if (this._overrideDeviceInfo) {
+      info = Object.assign({}, info, this._overrideDeviceInfo)
+    }
     return {
-      deviceBrand: info.brand || null,
-      deviceModel: info.model || null,
+      deviceBrand: info.brand || info.deviceBrand || null,
+      deviceModel: info.model || info.deviceModel || null,
       os: info.platform || info.os || null,
-      osVersion: info.system || null,
+      osVersion: info.system || info.osVersion || null,
       screenWidth: info.screenWidth || null,
       screenHeight: info.screenHeight || null,
     }
   }
 
+  setDeviceInfo(info) {
+    if (info && typeof info === 'object') {
+      this._overrideDeviceInfo = Object.assign(this._overrideDeviceInfo || {}, info)
+    }
+  }
+
   // ---- 插件管理 ----
 
   use(plugin) {
@@ -231,6 +240,12 @@ export class Tracker {
     this.session.setSessionId(sessionId, isNative)
   }
 
+  setInitialSequence(seq) {
+    if (this.session && typeof this.session.setInitialSequence === 'function') {
+      this.session.setInitialSequence(seq)
+    }
+  }
+
   getDeviceId() {
     return this.session.getDeviceId()
   }

package/index.js

@@ -221,8 +221,8 @@ function _ensureUserId(tracker) {
   var currentUid = tracker.getSession().getUserId()
   if (uid && uid !== currentUid) {
     tracker.setUser(uid)
-  } else if (!uid && currentUid) {
-    // 源头已清空（退出登录/清除缓存），同步清除内存中的旧值
+  } else if (!uid && currentUid && !session.isNativeUserId) {
+    // 仅针对纯 H5 登录场景：若源头已清空（退出登录/清除缓存），同步清除内存中的旧值
     tracker.setUser(null)
   }
 }

package/native/android/AndroidTracker.java

@@ -73,7 +73,7 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
     private volatile String userId;
     private volatile String phone;
     private volatile String storeName;
-    private int sequence = 0;
+    private volatile int sequence = 0;
 
     private HandlerThread bgThread;
     private Handler bgHandler;
@@ -232,6 +232,10 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         updateUser(userId, null, null);
     }
 
+    public synchronized int getCurrentSequence() {
+        return sequence;
+    }
+
     /**
      * H5 路由状态同步 (由 CommonWebPresenter 通过 NativeBridge 触发)
      */
@@ -254,6 +258,7 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
     }
 
     public void resetSession() {
+        this.sequence = 0;
         this.sessionId = "android_" + System.currentTimeMillis() + "_" + (int) (Math.random() * 10000);
         Log.i(TAG, "===> [Native Tracker Session Reset] New SessionId: " + this.sessionId);
     }
@@ -745,13 +750,24 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         return "";
     }
 
-    private void handleNativeViewClick(final Activity activity, final View target, final float rawX, final float rawY) {
-        String extracted = extractViewText(target);
-        if (TextUtils.isEmpty(extracted) && target.getParent() instanceof View) {
-            extracted = extractViewText((View) target.getParent());
-        }
-        final String elementText = extracted;
+    private String getPresetTextForElementId(String elementId) {
+        if (TextUtils.isEmpty(elementId)) return "";
+        String lower = elementId.toLowerCase();
+        if (lower.contains("to_top") || lower.contains("scroll_top")) return "置顶";
+        if (!lower.contains("background") && !lower.contains("feedback") && !lower.contains("fallback") && !lower.contains("callback")
+                && (lower.startsWith("back") || lower.endsWith("back") || lower.contains("_back") || lower.contains("back_") || lower.equals("back"))) return "返回";
+        if (lower.contains("close") || lower.contains("cloess") || lower.contains("dismiss")) return "关闭";
+        if (lower.contains("search")) return "搜索";
+        if (lower.contains("refresh")) return "刷新";
+        if (lower.contains("share")) return "分享";
+        if (lower.contains("more")) return "更多";
+        if (lower.contains("award")) return "领奖/关注";
+        if ((lower.contains("_phone") || lower.contains("phone_") || lower.startsWith("phone") || lower.endsWith("phone") || lower.contains("mobile"))
+                && !lower.contains("headphone") && !lower.contains("microphone")) return "手机号";
+        return "";
+    }
 
+    private void handleNativeViewClick(final Activity activity, final View target, final float rawX, final float rawY) {
         final String elementId;
         if (target.getId() != View.NO_ID) {
             String resName = "";
@@ -763,6 +779,22 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             elementId = target.getClass().getSimpleName();
         }
 
+        String extracted = extractViewText(target);
+        if (TextUtils.isEmpty(extracted)) {
+            // 1. 优先使用知名图标 ID 映射（解决置顶、返回、关闭等图标抓取不到或被误抓的问题）
+            String preset = getPresetTextForElementId(elementId);
+            if (!TextUtils.isEmpty(preset)) {
+                extracted = preset;
+            } else if (target.getParent() instanceof ViewGroup) {
+                ViewGroup parentGroup = (ViewGroup) target.getParent();
+                // 2. 严格限制父容器：仅在直接小容器（子 View <= 4 且高度不超过 400px）内检索，禁止向整屏根容器穿透扩散
+                if (parentGroup.getChildCount() <= 4 && parentGroup.getHeight() < 400) {
+                    extracted = extractViewText(parentGroup);
+                }
+            }
+        }
+        final String elementText = extracted;
+
         final String key = elementId + "|" + elementText;
         final long now = System.currentTimeMillis();
         if (key.equals(lastClickKey) && (now - lastClickTime < 800)) {

package/package.json

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

package/platforms/app.js

@@ -25,9 +25,17 @@ export class AppAdapter extends WebAdapter {
     // 尝试从 JSBridge 获取更多原生设备信息
     try {
       if (typeof window !== 'undefined' && window.NativeBridge && window.NativeBridge.getDeviceInfo) {
-        const nativeInfo = window.NativeBridge.getDeviceInfo()
-        if (nativeInfo) {
-          return { ...baseInfo, ...nativeInfo }
+        let nativeInfo = window.NativeBridge.getDeviceInfo()
+        if (typeof nativeInfo === 'string') {
+          try { nativeInfo = JSON.parse(nativeInfo) } catch (e) {}
+        }
+        if (nativeInfo && typeof nativeInfo === 'object') {
+          return {
+            ...baseInfo,
+            ...nativeInfo,
+            brand: nativeInfo.brand || nativeInfo.deviceBrand || baseInfo.brand,
+            model: nativeInfo.model || nativeInfo.deviceModel || baseInfo.model,
+          }
         }
       }
     } catch (e) {}

package/platforms/web.js

@@ -1,3 +1,20 @@
+export const ROUTE_TITLE_MAP = {
+  '/pages/circle/circleOfFriends/details': '圈子动态详情',
+  '/pages/circle/index': '银友圈',
+  '/pages/circle/circleOfFriends/sendFriends/sendFriends': '发布动态',
+  '/pages/circle/circleOfFriends/sendFriends/circleClass/circleClass': '圈子分类',
+  '/healthFu/index/index': '健康福/AI助手',
+  '/pages/mall/goods/goodsList': '商品列表',
+  '/pages/mall/goods/goodsDetail': '商品详情',
+  '/pages/mall/goods/order': '商品下单',
+  '/pages/my/store/index': '我的小店',
+  '/pages/my/store/withdrawalList': '提现记录',
+  '/pages/integralMall/integralMall': '积分商城',
+  '/pages/integralMall/integralGoodsInfo': '积分商品详情',
+  '/pages/my/setting/setting': '设置',
+  '/pages/selfInvoice/index': '自助开票',
+}
+
 export class WebAdapter {
   constructor(config) {
     this.config = config
@@ -149,12 +166,16 @@ export class WebAdapter {
     return path === '/' ? '' : path.replace(/^\//, '')
   }
 
-  getPageTitle() {
+  getPageTitle(route) {
     try {
-      if (typeof document !== 'undefined' && document.title) {
+      if (typeof document !== 'undefined' && document.title && document.title !== 'uni-app') {
         return document.title
       }
     } catch (e) {}
+    var r = route || this.getCurrentPagePath()
+    if (r && ROUTE_TITLE_MAP[r]) {
+      return ROUTE_TITLE_MAP[r]
+    }
     return null
   }
 
@@ -217,8 +238,8 @@ export class WebAdapter {
       return {
         brand: info.brand || this._judgeBrand(ua, info.model),
         model: info.model || '',
-        platform: info.platform || '',
-        system: info.system || '',
+        platform: (info.platform || '').toLowerCase() === 'android' ? 'Android' : (info.platform || ''),
+        system: (info.system || '').toLowerCase().startsWith('android') ? ('Android ' + (info.system.split(' ')[1] || '')) : (info.system || ''),
         screenWidth: info.screenWidth || 0,
         screenHeight: info.screenHeight || 0,
         userAgent:
@@ -365,27 +386,39 @@ export class WebAdapter {
   }
 
   // [PROJECT-ADAPT] 设备品牌/类型识别
-  // 当前偏向中国市场手机品牌，国际化项目需扩展
+  // 全面覆盖中国市场主流手机品牌（OPPO/一加/真我、vivo/iQOO、小米/Redmi、华为/荣耀、三星等）
   // 返回的 deviceType 数值需与后台枚举对齐
   _judgeBrand(ua, model) {
     if (ua.indexOf('iphone') > -1) return 'iPhone'
-    if (ua.indexOf('huawei') > -1 || ua.indexOf('honor') > -1) return 'Huawei'
-    if (ua.indexOf('oppo') > -1 || ua.indexOf('pacm00') > -1) return 'Oppo'
-    if (ua.indexOf('vivo') > -1) return 'vivo'
+    if (ua.indexOf('huawei') > -1 || ua.indexOf('honor') > -1 || ua.indexOf('harmonyos') > -1) return 'Huawei'
+    if (ua.indexOf('oppo') > -1 || ua.indexOf('pacm00') > -1 || ua.indexOf('heytap') > -1 ||
+        ua.indexOf('oplus') > -1 || ua.indexOf('oneplus') > -1 || ua.indexOf('realme') > -1) return 'Oppo'
+    if (ua.indexOf('vivo') > -1 || ua.indexOf('iqoo') > -1) return 'vivo'
     // 精确匹配小米，避免裸子串 'mi' 命中微信/企业微信 UA 里的 "MicroMessenger"
-    // （曾把微信内所有非小米安卓机误判成小米）。/\bmi[\s-]?\d/ 匹配 "Mi 11"/"MI9"，不匹配 "micromessenger"
     if (ua.indexOf('xiaomi') > -1 || ua.indexOf('redmi') > -1 ||
         ua.indexOf('miui') > -1 || /\bmi[\s-]?\d/.test(ua)) return 'mi'
     if (ua.indexOf('sm-') > -1) return 'Samsung'
     if (ua.indexOf('lg-') > -1 || ua.indexOf('lm-') > -1) return 'LG'
 
-    // UA 未命中时按设备型号前缀兜底识别（微信 webview 常拿不到 UA 品牌，但 uni 能给型号）
+    // UA 未命中时按设备型号前缀兜底识别（WebView 常拿不到 UA 品牌，但原生/容器能给型号）
     var m = (model || '').toString().toUpperCase()
     if (m) {
-      if (/^V\d{3,}/.test(m)) return 'vivo'          // vivo: V2283A / V2055A ...
-      if (/^(PA|PB|PC|PD|PE|CPH)/.test(m)) return 'Oppo' // oppo/一加型号前缀
-      if (/^(MI |MI-|M\d{4}|2\d{6})/.test(m) || m.indexOf('REDMI') > -1) return 'mi'
-      if (/^(ELS|NOH|LIO|ANA|TAS|VOG|BRQ)/.test(m)) return 'Huawei'
+      // OPPO / 一加 / Realme:
+      // 国内型号格式多为 P + 字母 + 数字 (如 PKV110, PHY110, PJE110, PGEM10, PFUM10, PBAM00, PACM00 等)
+      // 海外型号多为 CPH + 数字，Realme 多为 RMX + 数字
+      if (/^P[A-Z]{1,2}\d{2,}/.test(m) || /^(CPH|RMX)\d{3,}/.test(m) ||
+          m.indexOf('OPPO') > -1 || m.indexOf('ONEPLUS') > -1 || m.indexOf('REALME') > -1) {
+        return 'Oppo'
+      }
+      // vivo / iQOO:
+      if (/^V\d{3,}/.test(m) || m.indexOf('VIVO') > -1 || m.indexOf('IQOO') > -1) return 'vivo'
+      // 小米 / Redmi:
+      if (/^(MI |MI-|M\d{4}|2\d{4,})/.test(m) || m.indexOf('REDMI') > -1 || m.indexOf('XIAOMI') > -1) return 'mi'
+      // 华为 / 荣耀:
+      if (/^(ELS|NOH|LIO|ANA|TAS|VOG|BRQ|ALN|HBN|PGT|FRI|MAA|ANY|BND)/.test(m) ||
+          m.indexOf('HUAWEI') > -1 || m.indexOf('HONOR') > -1) {
+        return 'Huawei'
+      }
       if (m.indexOf('SM-') === 0) return 'Samsung'
     }
     return '其他型号手机'

package/plugins/click.js

@@ -279,11 +279,26 @@ export class ClickPlugin {
     // [PROJECT-ADAPT] 设计工具命名过滤
     // 当前规则基于 Sketch/Figma 中文命名导出，英文命名项目需调整
     if (/^[\s\S]*(?:编组|矩形|备份|椭圆|路径)[\s\S]*$/.test(text) && text.indexOf('编组') > -1) return ''
+    // 符号转为可读语义
+    var normalized = this._normalizeSymbolText(text)
+    if (normalized !== text) return normalized
     // 文字太长说明是整个区域的内容，不是按钮文字
     if (text.length > 30) return ''
     return text.substring(0, 50)
   }
 
+  _normalizeSymbolText(text) {
+    if (!text) return ''
+    var trimmed = text.trim()
+    if (trimmed === '▼' || trimmed === '▽') return '展开/下拉'
+    if (trimmed === '▲' || trimmed === '△') return '收起'
+    if (trimmed === '›' || trimmed === '>' || trimmed === '»') return '查看/更多'
+    if (trimmed === '‹' || trimmed === '<' || trimmed === '«') return '返回'
+    if (trimmed === '×' || trimmed === '✕') return '关闭'
+    if (trimmed === '+') return '添加/增加'
+    return text
+  }
+
   /**
    * 检查容器内 image/img 标签的 src，提取文件名
    */
@@ -296,7 +311,16 @@ export class ClickPlugin {
     // 提取文件名（去掉路径和后缀）
     var match = src.match(/\/([^/]+)\.\w+$/)
     if (match && match[1]) {
-      return '[img:' + match[1] + ']'
+      var name = match[1]
+      var lower = name.toLowerCase()
+      if (lower.indexOf('back') > -1 || lower === 'label_2') return '返回'
+      if (lower.indexOf('close') > -1 || lower.indexOf('cloess') > -1) return '关闭'
+      if (lower.indexOf('search') > -1) return '搜索'
+      if (lower.indexOf('share') > -1) return '分享'
+      if (lower.indexOf('refresh') > -1) return '刷新'
+      if (lower.indexOf('cart') > -1) return '购物车'
+      if (lower.indexOf('like') > -1 || lower.indexOf('favor') > -1) return '点赞/收藏'
+      return '[img:' + name + ']'
     }
     return ''
   }

package/plugins/page-view.js

@@ -113,6 +113,7 @@ export class PageViewPlugin {
 
     function getBestTitle() {
       var t = typeof document !== 'undefined' ? document.title : ''
+      if (t === 'uni-app') t = ''
       if (!t) {
         try {
           var pages = getCurrentPages()
@@ -123,6 +124,9 @@ export class PageViewPlugin {
           }
         } catch (e) {}
       }
+      if (!t && adapter && typeof adapter.getPageTitle === 'function') {
+        t = adapter.getPageTitle(currentPage) || ''
+      }
       return t
     }