@rk911/tracker-sdk 1.7.9 → 1.7.10

package/core/compat.js

@@ -155,6 +155,8 @@ export function createPageStayMixin(tracker) {
     data: function () {
       return {
         _pageStayStartTime: 0,
+        _accumulatedDuration: 0,
+        _isStayPaused: false,
         _pageStayRoute: '',
         _pageStayTitle: '',
       }
@@ -188,6 +190,8 @@ export function createPageStayMixin(tracker) {
         }
       } catch (e) {}
       this._pageStayStartTime = Date.now()
+      this._accumulatedDuration = 0
+      this._isStayPaused = false
       this._pageShowReported = false
     },
 
@@ -201,15 +205,35 @@ export function createPageStayMixin(tracker) {
       }
       window.addEventListener('pageshow', this._pageshowHandler)
 
+      // 监听 tracker 的挂起与恢复事件（如 App 切后台、多 Tab/多 WebView 切换）
+      this._stayPauseHandler = function () {
+        if (!self._pageStayRoute) return
+        if (self._pageStayStartTime > 0) {
+          self._accumulatedDuration += (Date.now() - self._pageStayStartTime)
+          self._pageStayStartTime = 0
+        }
+        self._isStayPaused = true
+      }
+      this._stayResumeHandler = function () {
+        if (!self._pageStayRoute) return
+        if (self._isTopStayPage()) {
+          self._pageStayStartTime = Date.now()
+          self._isStayPaused = false
+        }
+      }
+      tracker.onPauseStay(this._stayPauseHandler)
+      tracker.onResumeStay(this._stayResumeHandler)
+
       // H5 下 app 前后台切换（visibilitychange）不总触发页面 onShow/onHide，
-      // 切回前台后停留起点未重置 → 下次 onHide 因 start=0 早退 → 停留漏测。
-      // 用 visibilitychange 兜底（app-lifecycle 已证明它可靠触发）：
+      // 用 visibilitychange 兜底：
       // 仅栈顶页面响应，与 onShow/onHide 幂等共存（重复触发因 start=0 早退，不会重报）。
       if (typeof document !== 'undefined') {
         this._pageVisHandler = function () {
           if (!self._isTopStayPage()) return
           if (document.visibilityState === 'visible') {
-            self._pageStayStartTime = Date.now()
+            if (!self._isStayPaused) {
+              self._pageStayStartTime = Date.now()
+            }
           } else if (document.visibilityState === 'hidden') {
             self._pageStayReport()
           }
@@ -221,6 +245,7 @@ export function createPageStayMixin(tracker) {
     onShow: function () {
       if (!this._pageStayRoute) return
       this._pageStayStartTime = Date.now()
+      this._isStayPaused = false
       if (!this._pageShowReported) {
         this._pageShowReported = true
         this._pageShowReport('onShow')
@@ -257,15 +282,20 @@ export function createPageStayMixin(tracker) {
       // 仅栈顶页响应，避免后台页面误报停留。
       _isTopStayPage: function () {
         try {
-          var pages = getCurrentPages()
-          if (!pages || !pages.length) return false
-          var top = pages[pages.length - 1]
-          var route = top && top.route
-            ? (top.route.charAt(0) === '/' ? top.route : '/' + top.route)
-            : ''
-          return route === this._pageStayRoute
+          if (typeof getCurrentPages === 'function') {
+            var pages = getCurrentPages()
+            if (pages && pages.length) {
+              var top = pages[pages.length - 1]
+              var route = top && top.route
+                ? (top.route.charAt(0) === '/' ? top.route : '/' + top.route)
+                : ''
+              return route === this._pageStayRoute
+            }
+          }
+          var currentPath = tracker.getAdapter().getCurrentPagePath()
+          return currentPath === this._pageStayRoute
         } catch (e) {
-          return false
+          return true
         }
       },
 
@@ -302,12 +332,18 @@ export function createPageStayMixin(tracker) {
       },
 
       _pageStayReport: function () {
-        if (!this._pageStayStartTime) return
-        var duration = Date.now() - this._pageStayStartTime
+        var duration = this._accumulatedDuration
+        if (this._pageStayStartTime > 0) {
+          duration += (Date.now() - this._pageStayStartTime)
+        }
         this._pageStayStartTime = 0
+        this._accumulatedDuration = 0
+        this._isStayPaused = false
+
+        if (duration <= 0) return
 
         var config = tracker.getConfig()
-        // 最小停留阈值：iOS 前后台抖动会产生大量 1~2s 的碎停留，默认 2000ms 过滤噪音
+        // 最小停留阈值：iOS/切后台抖动会产生大量 1~2s 的碎停留，默认 500ms 过滤噪音
         var minDuration = (config.pageStay || {}).minStayDuration || 500
         if (duration < minDuration) return
 

package/core/session.js

@@ -61,13 +61,20 @@ export class SessionManager {
   }
 
   setUser(userId, isNative = false) {
-    this.userId = userId
+    if (!userId && this.userId && !isNative) {
+      // 防误置空：外部未准备好用户身份传空时，若内存中已有合法 userId，绝不置空；清空需调用 resetSession
+      return
+    }
+    this.userId = userId || null
     this.isNativeUserId = !!isNative
-    // 纯 H5 登录才写入永久 localStorage；Native 注入仅保存在会话级 sessionStorage，防止 Native 退出登录后 H5 残留旧账号
-    if (userId && !isNative) {
-      this.adapter.setStorage('userId', userId)
+    if (userId) {
+      this.adapter.setStorage('_tracker_user_id', userId)
+      if (!isNative) {
+        this.adapter.setStorage('userId', userId)
+      }
     } else if (!userId && !isNative) {
       this.adapter.removeStorage('userId')
+      this.adapter.removeStorage('_tracker_user_id')
     }
     this._save()
   }
@@ -92,7 +99,7 @@ export class SessionManager {
   }
 
   setInitialSequence(seq) {
-    if (typeof seq === 'number' && !isNaN(seq) && seq > this.sequence) {
+    if (typeof seq === 'number' && !isNaN(seq) && seq >= this.sequence) {
       this.sequence = seq
       this._save()
     }
@@ -152,13 +159,20 @@ export class SessionManager {
       this._createNew()
     }
     if (!this.userId) {
-      this.userId = this.adapter.getStorage('userId') || this.adapter.getStorage('unionid') || null
+      this.userId = this.adapter.getStorage('userId')
+        || this.adapter.getStorage('unionid')
+        || this.adapter.getStorage('_tracker_user_id')
+        || null
     }
   }
 
   resetSession() {
     this.adapter.removeSessionStorage(this._storageKey)
+    this.adapter.removeStorage('_tracker_user_id')
     this.userId = null
+    this.isNativeUserId = false
+    this.isNativeSessionId = false
+    this.isNativeDeviceId = false
     this._createNew()
   }
 

package/core/tracker.js

@@ -150,6 +150,7 @@ export class Tracker {
       eventName: eventData.eventName || eventType,
       timestamp: this.adapter.getTimestamp(),
       sequence: seq,
+      userId: 'userId' in eventData ? eventData.userId : (this.session.getUserId() || null),
       pageRoute: 'pageRoute' in eventData ? (eventData.pageRoute || null) : (this._currentPage || this.adapter.getCurrentPagePath()),
       pageTitle: 'pageTitle' in eventData ? (eventData.pageTitle || null) : (this.adapter.getPageTitle ? this.adapter.getPageTitle() : null),
       elementId: eventData.elementId || null,
@@ -162,7 +163,7 @@ export class Tracker {
       extKey: eventData.extKey || null,
       extValue: eventData.extValue || null,
       extIntValue: eventData.extIntValue || null,
-      frontUrl: eventData.frontUrl || null,
+      frontUrl: eventData.frontUrl || (typeof window !== 'undefined' && window.location ? window.location.href : null),
       postParam: eventData.postParam != null && eventData.postParam !== ''
         ? (typeof eventData.postParam === 'string'
           ? eventData.postParam
@@ -293,6 +294,34 @@ export class Tracker {
     return this._referrer
   }
 
+  // ---- 页面停留挂起与恢复控制 ----
+
+  onPauseStay(fn) {
+    if (!this._stayPauseListeners) this._stayPauseListeners = []
+    if (typeof fn === 'function') this._stayPauseListeners.push(fn)
+  }
+
+  onResumeStay(fn) {
+    if (!this._stayResumeListeners) this._stayResumeListeners = []
+    if (typeof fn === 'function') this._stayResumeListeners.push(fn)
+  }
+
+  pausePageStay() {
+    if (this._stayPauseListeners) {
+      this._stayPauseListeners.forEach(function (fn) {
+        try { fn() } catch (e) {}
+      })
+    }
+  }
+
+  resumePageStay() {
+    if (this._stayResumeListeners) {
+      this._stayResumeListeners.forEach(function (fn) {
+        try { fn() } catch (e) {}
+      })
+    }
+  }
+
   // ---- 动态参数解析器 ----
 
   registerParam(name, fn) {

package/index.js

@@ -199,9 +199,33 @@ function registerDeviceIfNeeded(tracker) {
   attempt(0)
 }
 
+function _parseJwtPayload(token) {
+  if (!token || typeof token !== 'string' || token.indexOf('.') === -1) return null
+  try {
+    var tokenParts = token.split('.')
+    if (tokenParts.length >= 2) {
+      var base64Url = tokenParts[1]
+      var base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/')
+      var decodedStr = ''
+      if (typeof atob === 'function') {
+        try {
+          decodedStr = decodeURIComponent(escape(atob(base64)))
+        } catch (e1) {
+          decodedStr = atob(base64)
+        }
+      } else if (typeof Buffer !== 'undefined') {
+        decodedStr = Buffer.from(base64, 'base64').toString('utf-8')
+      }
+      if (decodedStr) {
+        return JSON.parse(decodedStr)
+      }
+    }
+  } catch (e) {}
+  return null
+}
+
 /**
- * 自动检测 userId：每次从 localStorage/cookie 实时读取
- * 不依赖内存缓存，确保清除存储后不会残留旧用户、切换账号后能及时更新
+ * 自动检测 userId：多源交叉读取，并确保不把已有的合法身份置空
  */
 function _ensureUserId(tracker) {
   var session = tracker.getSession()
@@ -211,10 +235,47 @@ function _ensureUserId(tracker) {
   }
 
   var adapter = tracker.getAdapter()
-  // 1. 优先读取单字段 userId 与 unionid
-  var uid = adapter.getStorage('userId') || adapter.getStorage('unionid')
+  var uid = null
+
+  // 1. 跨端 NativeBridge 同步上下文优先（如果运行在 Android/iOS WebView 中）
+  if (typeof window !== 'undefined' && window.NativeBridge && typeof window.NativeBridge.getNativeContextSync === 'function') {
+    try {
+      var nativeRaw = window.NativeBridge.getNativeContextSync()
+      if (nativeRaw) {
+        var nativeCtx = typeof nativeRaw === 'string' ? JSON.parse(nativeRaw) : nativeRaw
+        if (nativeCtx && nativeCtx.userId) {
+          uid = String(nativeCtx.userId)
+        }
+        if (nativeCtx && nativeCtx.currentSequence) {
+          session.setInitialSequence(Number(nativeCtx.currentSequence))
+        }
+      }
+    } catch (e) {}
+  }
+
+  // 2. URL query 跨端注入参数兜底
+  if (!uid && typeof window !== 'undefined' && window.location && window.location.search) {
+    try {
+      var search = window.location.search
+      var matchSeq = search.match(/[?&]_trk_seq=([^&]+)/)
+      if (matchSeq) {
+        session.setInitialSequence(Number(decodeURIComponent(matchSeq[1])))
+      }
+      var matchUid = search.match(/[?&]_trk_userId=([^&]+)/)
+      if (matchUid) {
+        uid = decodeURIComponent(matchUid[1])
+      }
+    } catch (e) {}
+  }
 
-  // 2. 关键兼容：读取 uni-app 登录时持久化的 userInfo 复合对象
+  // 3. 存储单字段：userId / unionid / _tracker_user_id
+  if (!uid) {
+    uid = adapter.getStorage('userId')
+      || adapter.getStorage('unionid')
+      || adapter.getStorage('_tracker_user_id')
+  }
+
+  // 4. 读取 userInfo 复合对象
   if (!uid) {
     try {
       var rawInfo = adapter.getStorage('userInfo')
@@ -227,43 +288,43 @@ function _ensureUserId(tracker) {
     } catch (e) {}
   }
 
-  // 3. 从 cookie 兜底 rkfeb-userId
+  // 5. Cookie 兜底：rkfeb-userId 或 static-c-token (JWT payload)
   if (!uid && typeof document !== 'undefined') {
-    var match = document.cookie.match(/(?:^|;\s*)rkfeb-userId=([^;]+)/)
-    if (match) uid = decodeURIComponent(match[1])
-  }
-
-  // 4. 关键兜底：从 token / appToken (JWT payload) 中解析 unionid 或 userId
-  if (!uid) {
     try {
-      var token = adapter.getStorage('token') || adapter.getStorage('appToken')
-      if (token && typeof token === 'string' && token.indexOf('.') > -1) {
-        var tokenParts = token.split('.')
-        if (tokenParts.length >= 2) {
-          var base64Url = tokenParts[1]
-          var base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/')
-          var decodedStr = ''
-          if (typeof atob === 'function') {
-            try {
-              decodedStr = decodeURIComponent(escape(atob(base64)))
-            } catch (e1) {
-              decodedStr = atob(base64)
-            }
-          } else if (typeof Buffer !== 'undefined') {
-            decodedStr = Buffer.from(base64, 'base64').toString('utf-8')
-          }
-          if (decodedStr) {
-            var payload = JSON.parse(decodedStr)
-            uid = payload.unionid || payload.userId || payload.uid || payload.sub
+      var matchCookieUid = document.cookie.match(/(?:^|;\s*)rkfeb-userId=([^;]+)/)
+      if (matchCookieUid) uid = decodeURIComponent(matchCookieUid[1])
+
+      if (!uid) {
+        var matchCookieToken = document.cookie.match(/(?:^|;\s*)(?:token|static-c-token|appToken)=([^;]+)/)
+        if (matchCookieToken) {
+          var payloadCookie = _parseJwtPayload(decodeURIComponent(matchCookieToken[1]))
+          if (payloadCookie) {
+            uid = payloadCookie.unionid || payloadCookie.userId || payloadCookie.uid || payloadCookie.sub
           }
         }
       }
     } catch (e) {}
   }
 
-  var currentUid = tracker.getSession().getUserId()
-  if (uid && uid !== currentUid) {
-    tracker.setUser(uid)
+  // 6. JWT Token 存储兜底：token / Token / appToken / rsc-token / rsb-token
+  if (!uid) {
+    var tokenKeys = ['token', 'Token', 'appToken', 'rsc-token', 'rsb-token']
+    for (var i = 0; i < tokenKeys.length; i++) {
+      var tokenVal = adapter.getStorage(tokenKeys[i])
+      if (tokenVal) {
+        var payload = _parseJwtPayload(tokenVal)
+        if (payload) {
+          uid = payload.unionid || payload.userId || payload.uid || payload.sub
+          if (uid) break
+        }
+      }
+    }
+  }
+
+  // 7. 防误置空核心保护：只有获取到有效非空 uid 才更新
+  var currentUid = session.getUserId()
+  if (uid && String(uid) !== String(currentUid)) {
+    tracker.setUser(String(uid))
   }
 }
 
@@ -288,9 +349,11 @@ function install(Vue, options) {
 
   var tracker = createTracker(options || {})
 
-  // 0. 暴露 tracker 实例到 window（供验证脚本访问）
+  // 0. 暴露 tracker 实例到 window（供原生容器及验证脚本访问）
   if (typeof window !== 'undefined') {
     window.__tracker = tracker
+    window.__tracker_pauseStay = function () { tracker.pausePageStay() }
+    window.__tracker_resumeStay = function () { tracker.resumePageStay() }
   }
 
   // 0.1 设备注册（无 deviceId 时自动注册）

package/native/android/AndroidTracker.java

@@ -45,6 +45,7 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -85,19 +86,32 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
     private String referrerPageRoute = "";
     private String lastClickKey = "";
     private long lastClickTime = 0;
+    private String lastLegacyClickKey = "";
+    private long lastLegacyClickTime = 0;
 
     private static final Map<String, String> NATIVE_TITLE_MAP = new HashMap<>();
     static {
         NATIVE_TITLE_MAP.put("com.renrui.main.activity.MainActivity", "APP主页");
         NATIVE_TITLE_MAP.put("com.renrui.main.fragment.MainTabFragment", "首页Tab");
-        NATIVE_TITLE_MAP.put("com.renrui.main.fragment.MainRecommentFragment", "推荐精选/视频");
+        NATIVE_TITLE_MAP.put("com.renrui.main.fragment.MainRecommentFragment", "推荐精选/短视频");
         NATIVE_TITLE_MAP.put("com.renrui.main.fragment.MainWebFragment", "首页Web容器");
         NATIVE_TITLE_MAP.put("com.renrui.mine.fragment.MineFragment", "个人中心/我的");
         NATIVE_TITLE_MAP.put("com.renrui.mine.activity.MineWebActivity", "我的Web容器");
         NATIVE_TITLE_MAP.put("com.renrui.mine.fragment.MineWebFragment", "我的Web页面");
+        NATIVE_TITLE_MAP.put("com.renrui.wz.activity.PageActivity", "APP主页");
         NATIVE_TITLE_MAP.put("com.renrui.wz.activity.SplashActivity", "启动闪屏页");
+        NATIVE_TITLE_MAP.put("com.renrui.wz.activity.LoginActivity", "登录页");
+        NATIVE_TITLE_MAP.put("com.renrui.wz.activity.LoginPhoneActivity", "手机号验证码登录");
+        NATIVE_TITLE_MAP.put("com.dongsh.zxinglibrary.android.CaptureActivity", "扫码页");
         NATIVE_TITLE_MAP.put("com.renrui.web.CommonWebActivity", "通用H5容器");
         NATIVE_TITLE_MAP.put("com.renrui.web.CommonWebFragment", "通用H5页面");
+        NATIVE_TITLE_MAP.put("com.renrui.home.fragment.HomeFragment", "首页短视频");
+        NATIVE_TITLE_MAP.put("com.renrui.home.fragment.HomeReCommendFragment", "小视频推荐");
+        NATIVE_TITLE_MAP.put("com.renrui.home.activity.TikTokActivity", "小视频首页");
+        NATIVE_TITLE_MAP.put("com.renrui.home.activity.HomePlayletHistoryActivity", "短剧历史记录");
+        NATIVE_TITLE_MAP.put("com.renrui.home.fragment.HomePlayletHistoryFragment", "短剧历史列表");
+        NATIVE_TITLE_MAP.put("com.renrui.home.activity.HomeVideoPlayActivity", "短视频全屏播放页");
+        NATIVE_TITLE_MAP.put("com.renrui.home.activity.HomePlayletPlayActivity", "短剧播放页");
     }
 
     public static String getFriendlyPageTitle(String className) {
@@ -109,8 +123,11 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         if (lastDot >= 0 && lastDot < className.length() - 1) {
             String simple = className.substring(lastDot + 1);
             if (simple.contains("MainTab")) return "首页/主Tab";
-            if (simple.contains("Recomment")) return "推荐精选";
+            if (simple.contains("Recomment") || simple.contains("ReCommend") || simple.contains("Recommend")) return "小视频推荐";
             if (simple.contains("Mine")) return "个人中心";
+            if (simple.contains("PlayletHistory")) return "短剧历史记录";
+            if (simple.contains("PlayletPlay")) return "短剧播放页";
+            if (simple.contains("VideoPlay")) return "短视频全屏播放页";
             if (simple.contains("Splash")) return "启动闪屏页";
             if (simple.contains("Login")) return "登录页";
             if (simple.contains("Web")) return "Web视图";
@@ -296,6 +313,58 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
     /**
      * 手动自定义埋点 (Custom Tracking)
      */
+    /**
+     * 视频全生命周期行为埋点 (短视频起播、滑走、互动)
+     * @param eventName 动作名: video_play_start, video_play_end, video_like, video_unlike, video_share, video_collect 等
+     * @param videoId 视频ID
+     * @param videoTitle 视频标题 (直接赋予 elementText，保证看板直观可读)
+     * @param customProperties 扩展参数 (分类、作者、播放时长等)
+     */
+    public void trackVideo(final String eventName, final long videoId, final String videoTitle, final JSONObject customProperties) {
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    JSONObject event = createBaseEvent("video", eventName);
+                    event.put("elementId", "video_" + videoId);
+                    if (!TextUtils.isEmpty(videoTitle)) {
+                        event.put("elementText", videoTitle);
+                    } else {
+                        event.put("elementText", "video_" + videoId);
+                    }
+                    event.put("pageTitle", "小视频推荐");
+
+                    JSONObject extra = new JSONObject();
+                    String baseExtraStr = event.optString("extraData");
+                    if (!TextUtils.isEmpty(baseExtraStr)) {
+                        try {
+                            extra = new JSONObject(baseExtraStr);
+                        } catch (Exception ignored) {}
+                    }
+                    extra.put("videoId", videoId);
+                    if (!TextUtils.isEmpty(videoTitle)) {
+                        extra.put("videoTitle", videoTitle);
+                    }
+                    if (customProperties != null) {
+                        Iterator<String> keys = customProperties.keys();
+                        while (keys.hasNext()) {
+                            String k = keys.next();
+                            extra.put(k, customProperties.opt(k));
+                        }
+                    }
+                    if (customProperties != null && customProperties.has("playDurationMs")) {
+                        event.put("duration", customProperties.optLong("playDurationMs"));
+                    }
+                    event.put("extraData", extra.toString());
+                    enqueueEvent(event);
+                    flushAsync();
+                } catch (Exception e) {
+                    Log.e(TAG, "===> [Native trackVideo Failed]", e);
+                }
+            }
+        });
+    }
+
     public void track(final String eventName, final JSONObject customProperties) {
         postBgTask(new Runnable() {
             @Override
@@ -318,6 +387,14 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
      * 旧 $dadian 点位兼容方法 (自动匹配后端双写 point.log)
      */
     public void trackFrontUrl(final String frontUrl, final String elementId, final String postParam) {
+        final String key = (frontUrl != null ? frontUrl : "") + "|" + (elementId != null ? elementId : "");
+        final long now = System.currentTimeMillis();
+        if (key.equals(lastLegacyClickKey) && (now - lastLegacyClickTime < 500)) {
+            return;
+        }
+        lastLegacyClickKey = key;
+        lastLegacyClickTime = now;
+
         postBgTask(new Runnable() {
             @Override
             public void run() {
@@ -409,6 +486,32 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         }
     }
 
+    public String getNetworkType() {
+        try {
+            if (application == null) return "";
+            android.net.ConnectivityManager cm = (android.net.ConnectivityManager) application.getSystemService(Context.CONNECTIVITY_SERVICE);
+            if (cm == null) return "";
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                android.net.Network activeNetwork = cm.getActiveNetwork();
+                if (activeNetwork == null) return "";
+                android.net.NetworkCapabilities caps = cm.getNetworkCapabilities(activeNetwork);
+                if (caps == null) return "";
+                if (caps.hasTransport(android.net.NetworkCapabilities.TRANSPORT_WIFI)) return "wifi";
+                if (caps.hasTransport(android.net.NetworkCapabilities.TRANSPORT_CELLULAR)) return "4g";
+                if (caps.hasTransport(android.net.NetworkCapabilities.TRANSPORT_ETHERNET)) return "ethernet";
+                return "other";
+            } else {
+                android.net.NetworkInfo info = cm.getActiveNetworkInfo();
+                if (info == null || !info.isConnected()) return "";
+                if (info.getType() == android.net.ConnectivityManager.TYPE_WIFI) return "wifi";
+                if (info.getType() == android.net.ConnectivityManager.TYPE_MOBILE) return "4g";
+                return "other";
+            }
+        } catch (Throwable e) {
+            return "";
+        }
+    }
+
     private JSONObject createBaseEvent(String eventType, String eventName) throws Exception {
         sequence++;
         JSONObject event = new JSONObject();
@@ -418,6 +521,10 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         event.put("timestamp", System.currentTimeMillis());
         event.put("sequence", sequence);
         event.put("pageRoute", currentPageRoute);
+        String autoTitle = getFriendlyPageTitle(currentPageRoute);
+        if (!TextUtils.isEmpty(autoTitle)) {
+            event.put("pageTitle", autoTitle);
+        }
         if (!TextUtils.isEmpty(referrerPageRoute)) {
             event.put("referrer", referrerPageRoute);
         }
@@ -425,6 +532,10 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         event.put("deviceBrand", android.os.Build.BRAND != null ? android.os.Build.BRAND : "");
         event.put("deviceModel", android.os.Build.MODEL != null ? android.os.Build.MODEL : "");
         event.put("osVersion", android.os.Build.VERSION.RELEASE != null ? android.os.Build.VERSION.RELEASE : "");
+        String net = getNetworkType();
+        if (!TextUtils.isEmpty(net)) {
+            event.put("networkType", net);
+        }
 
         JSONObject extra = new JSONObject();
         if (!TextUtils.isEmpty(phone)) extra.put("phone", phone);
@@ -642,6 +753,10 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                         @Override
                         public void onFragmentResumed(FragmentManager fm, Fragment f) {
                             super.onFragmentResumed(fm, f);
+                            // 过滤嵌套子 Fragment（如 ViewPager 内的 ChildFragment），由主 Fragment 统一承担页面路由和时长计算，防止同屏惊群割裂卡片
+                            if (f.getParentFragment() != null) {
+                                return;
+                            }
                             final String fragmentRoute = f.getClass().getName();
                             postBgTask(new Runnable() {
                                 @Override
@@ -665,6 +780,35 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                                 }
                             });
                         }
+
+                        @Override
+                        public void onFragmentPaused(FragmentManager fm, Fragment f) {
+                            super.onFragmentPaused(fm, f);
+                            if (f.getParentFragment() != null) {
+                                return;
+                            }
+                            final String fragmentRoute = f.getClass().getName();
+                            postBgTask(new Runnable() {
+                                @Override
+                                public void run() {
+                                    try {
+                                        if (fragmentRoute.equals(currentPageRoute) && lastPageStartTime > 0) {
+                                            long duration = System.currentTimeMillis() - lastPageStartTime;
+                                            if (duration >= 500) {
+                                                JSONObject event = createBaseEvent("page_stay", "page_stay");
+                                                event.put("duration", duration);
+                                                event.put("pageTitle", getFriendlyPageTitle(fragmentRoute));
+                                                enqueueEvent(event);
+                                                flushAsync();
+                                            }
+                                            lastPageStartTime = 0;
+                                        }
+                                    } catch (Exception e) {
+                                        Log.e(TAG, "===> [Native Fragment Paused Error]", e);
+                                    }
+                                }
+                            });
+                        }
                     }, true);
         }
 
@@ -846,7 +990,11 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                     Log.i(TAG, "===> [Native Activity Resumed] Page: " + currentPageRoute + ", Referrer: " + referrerPageRoute);
                     JSONObject event = createBaseEvent("page_view", "page_view");
                     String activityTitle = activity.getTitle() != null ? activity.getTitle().toString() : "";
-                    event.put("pageTitle", !TextUtils.isEmpty(activityTitle) ? activityTitle : getFriendlyPageTitle(route));
+                    String friendly = getFriendlyPageTitle(route);
+                    if (TextUtils.isEmpty(activityTitle) || "银友圈".equals(activityTitle)) {
+                        activityTitle = friendly;
+                    }
+                    event.put("pageTitle", activityTitle);
                     enqueueEvent(event);
                     flushAsync();
                 } catch (Exception e) {
@@ -867,6 +1015,9 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                         if (duration >= 500) {
                             JSONObject event = createBaseEvent("page_stay", "page_stay");
                             event.put("duration", duration);
+                            String actTitle = activity.getTitle() != null ? activity.getTitle().toString() : "";
+                            String friendly = getFriendlyPageTitle(activity.getClass().getName());
+                            event.put("pageTitle", !TextUtils.isEmpty(friendly) ? friendly : actTitle);
                             enqueueEvent(event);
                             flushAsync();
                         }

package/package.json

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

package/platforms/web.js

@@ -44,21 +44,50 @@ export class WebAdapter {
 
   getStorage(key) {
     try {
-      return uni.getStorageSync(key)
-    } catch (e) {
-      return null
-    }
+      if (typeof uni !== 'undefined' && typeof uni.getStorageSync === 'function') {
+        const val = uni.getStorageSync(key)
+        if (val !== undefined && val !== null && val !== '') return val
+      }
+    } catch (e) {}
+    try {
+      if (typeof localStorage !== 'undefined') {
+        const val = localStorage.getItem(key)
+        if (val !== null && val !== undefined && val !== '') {
+          try {
+            return JSON.parse(val)
+          } catch (e1) {
+            return val
+          }
+        }
+      }
+    } catch (e) {}
+    return null
   }
 
   setStorage(key, value) {
     try {
-      uni.setStorageSync(key, value)
+      if (typeof uni !== 'undefined' && typeof uni.setStorageSync === 'function') {
+        uni.setStorageSync(key, value)
+      }
+    } catch (e) {}
+    try {
+      if (typeof localStorage !== 'undefined') {
+        const strVal = typeof value === 'object' && value !== null ? JSON.stringify(value) : String(value)
+        localStorage.setItem(key, strVal)
+      }
     } catch (e) {}
   }
 
   removeStorage(key) {
     try {
-      uni.removeStorageSync(key)
+      if (typeof uni !== 'undefined' && typeof uni.removeStorageSync === 'function') {
+        uni.removeStorageSync(key)
+      }
+    } catch (e) {}
+    try {
+      if (typeof localStorage !== 'undefined') {
+        localStorage.removeItem(key)
+      }
     } catch (e) {}
   }
 
@@ -193,7 +222,21 @@ export class WebAdapter {
   }
 
   getToken() {
-    return this.getStorage(this.config.tokenKey || 'token')
+    var key = this.config.tokenKey || 'token'
+    var t = this.getStorage(key)
+    if (t) return t
+    var candidates = ['token', 'Token', 'appToken', 'rsc-token', 'rsb-token', 'Authorization']
+    for (var i = 0; i < candidates.length; i++) {
+      var candidate = candidates[i]
+      if (candidate === key) continue
+      t = this.getStorage(candidate)
+      if (t) return t
+    }
+    if (typeof document !== 'undefined') {
+      var match = document.cookie.match(/(?:^|;\s*)(?:token|static-c-token|appToken)=([^;]+)/)
+      if (match) return decodeURIComponent(match[1])
+    }
+    return null
   }
 
   // [PROJECT-ADAPT] 网络请求实现
@@ -234,9 +277,17 @@ export class WebAdapter {
   // ---- 网络状态 ----
 
   getNetworkType() {
+    try {
+      if (typeof window !== 'undefined' && window.NativeBridge && typeof window.NativeBridge.getNetworkType === 'function') {
+        const net = window.NativeBridge.getNetworkType()
+        if (net) return net
+      }
+    } catch (e) {}
     try {
       if (typeof navigator !== 'undefined' && navigator.connection) {
-        return navigator.connection.effectiveType || 'unknown'
+        if (navigator.connection.type && navigator.connection.type !== 'unknown') {
+          return navigator.connection.type
+        }
       }
     } catch (e) {}
     return typeof navigator !== 'undefined' && navigator.onLine ? 'wifi' : 'offline'
@@ -246,15 +297,20 @@ export class WebAdapter {
 
   getDeviceInfo() {
     try {
-      const info = uni.getSystemInfoSync()
+      const info = (typeof uni !== 'undefined' && typeof uni.getSystemInfoSync === 'function')
+        ? (uni.getSystemInfoSync() || {})
+        : {}
       var ua = (typeof navigator !== 'undefined' ? navigator.userAgent : '').toLowerCase()
       var rawBrand = info.brand || this._judgeBrand(ua, info.model) || ''
       var brand = rawBrand.toUpperCase() === 'OPPO' ? 'OPPO' : rawBrand
+      var rawSystem = info.system || ''
+      // 去除重复的 "Android " 前缀，与 Native 端对齐为纯版本号（如 "16"）
+      var cleanSystem = rawSystem.replace(/^Android\s*/i, '').trim() || rawSystem
       return {
         brand: brand,
         model: info.model || '',
         platform: (info.platform || '').toLowerCase() === 'android' ? 'Android' : (info.platform || ''),
-        system: (info.system || '').toLowerCase().startsWith('android') ? ('Android ' + (info.system.split(' ')[1] || '')) : (info.system || ''),
+        system: cleanSystem,
         screenWidth: info.screenWidth || 0,
         screenHeight: info.screenHeight || 0,
         userAgent:

package/plugins/page-view.js

@@ -99,9 +99,9 @@ export class PageViewPlugin {
     // 锁定进页时刻的时间戳（避免被后方的 title 异步重试链延迟 100~500ms）
     var entryTimestamp = adapter.getTimestamp()
 
-    // 防抖：同路由 500ms 内不重复上报（防框架路由重入导致的竞态）
+    // 防抖：同路由 800ms 内不重复上报（防框架路由重入或组件双重挂载导致的竞态）
     var now = Date.now()
-    if (this._lastFiredRoute === currentPage && now - this._lastFiredTime < 500) return
+    if (this._lastFiredRoute === currentPage && now - this._lastFiredTime < 800) return
 
     this._lastPage = currentPage
     this._lastFiredRoute = currentPage