@rk911/tracker-sdk 1.7.2 → 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) {
@@ -96,6 +105,17 @@ export class Tracker {
         this._referrer = this._currentPage
       }
       this._currentPage = declaredPage
+
+      // 跨端信息携带：当在 Android/iOS 原生容器内运行时，将 H5 页面路由与标题同步给端上
+      if (typeof window !== 'undefined' && window.NativeBridge && window.NativeBridge.postMessage) {
+        try {
+          window.NativeBridge.postMessage('tracker.syncPageState', JSON.stringify({
+            pageRoute: declaredPage,
+            pageTitle: eventData.pageTitle || '',
+            timestamp: Date.now()
+          }), '')
+        } catch (e) {}
+      }
     }
 
     if (!this._currentPage) {
@@ -202,6 +222,14 @@ export class Tracker {
 
   setUser(userId, isNative = false) {
     this.session.setUser(userId, isNative)
+    // 跨端信息携带：当在原生 WebView 登录或切换用户时，将身份变更同步到 Native 端
+    if (!isNative && typeof window !== 'undefined' && window.NativeBridge && window.NativeBridge.postMessage) {
+      try {
+        window.NativeBridge.postMessage('tracker.syncUserIdentity', JSON.stringify({
+          userId: userId
+        }), '')
+      } catch (e) {}
+    }
   }
 
   setDeviceId(deviceId, isNative = false) {
@@ -212,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

@@ -43,7 +43,9 @@ import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 行业级 Native Android Tracker SDK
@@ -71,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;
@@ -84,6 +86,39 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
     private String lastClickKey = "";
     private long lastClickTime = 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.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.SplashActivity", "启动闪屏页");
+        NATIVE_TITLE_MAP.put("com.renrui.web.CommonWebActivity", "通用H5容器");
+        NATIVE_TITLE_MAP.put("com.renrui.web.CommonWebFragment", "通用H5页面");
+    }
+
+    public static String getFriendlyPageTitle(String className) {
+        if (TextUtils.isEmpty(className)) return "";
+        if (NATIVE_TITLE_MAP.containsKey(className)) {
+            return NATIVE_TITLE_MAP.get(className);
+        }
+        int lastDot = className.lastIndexOf('.');
+        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("Mine")) return "个人中心";
+            if (simple.contains("Splash")) return "启动闪屏页";
+            if (simple.contains("Login")) return "登录页";
+            if (simple.contains("Web")) return "Web视图";
+            return simple;
+        }
+        return className;
+    }
+
     private static class EventRecord {
         final long id;
         final JSONObject json;
@@ -193,7 +228,37 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         return deviceId;
     }
 
+    public void setUserId(String userId) {
+        updateUser(userId, null, null);
+    }
+
+    public synchronized int getCurrentSequence() {
+        return sequence;
+    }
+
+    /**
+     * H5 路由状态同步 (由 CommonWebPresenter 通过 NativeBridge 触发)
+     */
+    public void updateH5PageState(final String h5Route, final String h5Title) {
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    if (TextUtils.isEmpty(h5Route)) return;
+                    String referrer = currentPageRoute;
+                    currentPageRoute = h5Route;
+                    referrerPageRoute = referrer;
+                    lastPageStartTime = System.currentTimeMillis();
+                    Log.i(TAG, "===> [H5 Page State Synced to Native] Route: " + currentPageRoute + ", Title: " + h5Title + ", Referrer: " + referrerPageRoute);
+                } catch (Exception e) {
+                    Log.e(TAG, "===> [updateH5PageState Error]", e);
+                }
+            }
+        });
+    }
+
     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);
     }
@@ -270,6 +335,80 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         });
     }
 
+    /**
+     * 接口请求与异常自动化上报 (S6 API Tracking - 0 阻塞、异步持久化)
+     */
+    public void trackApi(final String url, final String method, final int statusCode,
+                         final long duration, final String reqParam, final String respData, final String error) {
+        if (TextUtils.isEmpty(url)) return;
+        // 严格防递归：SDK 自身上报地址直接跳过
+        if (url.contains("/api/point/task/trackBatch") || (serverUrl != null && url.contains(serverUrl))) {
+            return;
+        }
+
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    String eventType = (statusCode >= 400 || !TextUtils.isEmpty(error)) ? "api_error" : "api_request";
+                    // 聚合优化：提取纯净的 API 路由路径作为 eventName（例如 /app/user/getUserInfo），方便在报表按接口聚合
+                    String apiPath = extractApiPath(url);
+                    JSONObject event = createBaseEvent(eventType, apiPath);
+
+                    JSONObject extra = new JSONObject();
+                    extra.put("url", url);
+                    extra.put("apiPath", apiPath);
+                    extra.put("method", method != null ? method.toUpperCase() : "GET");
+                    extra.put("statusCode", statusCode);
+                    extra.put("duration", duration);
+
+                    // 字段容量防膨胀安全截断：防止过大 JSON 导致 SQLite CursorWindow 溢出或 HTTP 413
+                    if (!TextUtils.isEmpty(reqParam)) {
+                        extra.put("requestParams", reqParam.length() > 2048 ? reqParam.substring(0, 2048) : reqParam);
+                    }
+                    if (!TextUtils.isEmpty(respData)) {
+                        extra.put("responseData", respData.length() > 2048 ? respData.substring(0, 2048) : respData);
+                    }
+                    if (!TextUtils.isEmpty(error)) {
+                        extra.put("error", error.length() > 512 ? error.substring(0, 512) : error);
+                    }
+                    if (!TextUtils.isEmpty(phone)) extra.put("phone", phone);
+                    if (!TextUtils.isEmpty(storeName)) extra.put("storeName", storeName);
+                    if (!TextUtils.isEmpty(userId)) extra.put("userId", userId);
+                    extra.put("platform", "android");
+
+                    event.put("extraData", extra.toString());
+                    enqueueEvent(event);
+
+                    // 接口异常立即上报排查；正常接口由 3s 定时器批量聚合上报
+                    if ("api_error".equals(eventType)) {
+                        flushAsync();
+                    }
+                } catch (Exception e) {
+                    Log.e(TAG, "===> [Native Tracker trackApi Failed]", e);
+                }
+            }
+        });
+    }
+
+    private static String extractApiPath(String url) {
+        if (TextUtils.isEmpty(url)) return "";
+        try {
+            int qIdx = url.indexOf('?');
+            String clean = qIdx >= 0 ? url.substring(0, qIdx) : url;
+            int schemeIdx = clean.indexOf("://");
+            if (schemeIdx >= 0) {
+                int pathIdx = clean.indexOf('/', schemeIdx + 3);
+                if (pathIdx >= 0) {
+                    return clean.substring(pathIdx);
+                }
+            }
+            return clean;
+        } catch (Exception e) {
+            return url;
+        }
+    }
+
     private JSONObject createBaseEvent(String eventType, String eventName) throws Exception {
         sequence++;
         JSONObject event = new JSONObject();
@@ -283,6 +422,9 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             event.put("referrer", referrerPageRoute);
         }
         event.put("os", "Android");
+        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 : "");
 
         JSONObject extra = new JSONObject();
         if (!TextUtils.isEmpty(phone)) extra.put("phone", phone);
@@ -340,12 +482,24 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
     }
 
     public void flushSync() {
+        if (bgThread != null && Thread.currentThread() == bgThread) {
+            flushInternal();
+            return;
+        }
+        final java.util.concurrent.CountDownLatch latch = new java.util.concurrent.CountDownLatch(1);
         postBgTask(new Runnable() {
             @Override
             public void run() {
-                flushInternal();
+                try {
+                    flushInternal();
+                } finally {
+                    latch.countDown();
+                }
             }
         });
+        try {
+            latch.await(1500, java.util.concurrent.TimeUnit.MILLISECONDS);
+        } catch (InterruptedException ignored) {}
     }
 
     private void flushInternal() {
@@ -493,13 +647,16 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                                 @Override
                                 public void run() {
                                     try {
+                                        if (fragmentRoute.equals(currentPageRoute) && (System.currentTimeMillis() - lastPageStartTime < 500)) {
+                                            return;
+                                        }
                                         String referrer = currentPageRoute;
                                         currentPageRoute = fragmentRoute;
                                         referrerPageRoute = referrer;
                                         lastPageStartTime = System.currentTimeMillis();
                                         Log.i(TAG, "===> [Native Fragment Resumed] Page: " + currentPageRoute + ", Referrer: " + referrerPageRoute);
                                         JSONObject event = createBaseEvent("page_view", "page_view");
-                                        event.put("pageTitle", currentPageRoute);
+                                        event.put("pageTitle", getFriendlyPageTitle(fragmentRoute));
                                         enqueueEvent(event);
                                         flushAsync();
                                     } catch (Exception e) {
@@ -516,7 +673,9 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             Window window = activity.getWindow();
             if (window != null) {
                 final Window.Callback origCb = window.getCallback();
-                window.setCallback(new WindowCallbackWrapper(origCb, activity));
+                if (origCb != null && !(origCb instanceof WindowCallbackWrapper)) {
+                    window.setCallback(new WindowCallbackWrapper(origCb, activity));
+                }
             }
         } catch (Exception e) {
             Log.w(TAG, "===> [Native Window Callback Install Failed]", e);
@@ -558,14 +717,57 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         return root;
     }
 
-    private void handleNativeViewClick(final Activity activity, final View target, final float rawX, final float rawY) {
-        final String elementText;
-        if (target instanceof TextView) {
-            elementText = ((TextView) target).getText().toString().trim();
-        } else {
-            elementText = "";
-        }
+    private String extractViewText(View view) {
+        if (view == null) return "";
+        try {
+            // 1. 优先读取 contentDescription
+            CharSequence desc = view.getContentDescription();
+            if (!TextUtils.isEmpty(desc)) {
+                return desc.toString().trim();
+            }
+            // 2. 本身是 TextView / Button
+            if (view instanceof TextView) {
+                CharSequence text = ((TextView) view).getText();
+                if (!TextUtils.isEmpty(text)) {
+                    return text.toString().trim();
+                }
+            }
+            // 3. ViewGroup 穿透提取子 View 文本
+            if (view instanceof ViewGroup) {
+                ViewGroup group = (ViewGroup) view;
+                int count = group.getChildCount();
+                for (int i = 0; i < count; i++) {
+                    View child = group.getChildAt(i);
+                    if (child != null && child.getVisibility() == View.VISIBLE) {
+                        String childText = extractViewText(child);
+                        if (!TextUtils.isEmpty(childText)) {
+                            return childText;
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {}
+        return "";
+    }
 
+    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 = "";
@@ -577,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)) {
@@ -617,13 +835,18 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             @Override
             public void run() {
                 try {
+                    final String route = activity.getClass().getName();
+                    if (route.equals(currentPageRoute) && (System.currentTimeMillis() - lastPageStartTime < 500)) {
+                        return;
+                    }
                     String referrer = currentPageRoute;
-                    currentPageRoute = activity.getClass().getName();
+                    currentPageRoute = route;
                     referrerPageRoute = referrer;
                     lastPageStartTime = System.currentTimeMillis();
                     Log.i(TAG, "===> [Native Activity Resumed] Page: " + currentPageRoute + ", Referrer: " + referrerPageRoute);
                     JSONObject event = createBaseEvent("page_view", "page_view");
-                    event.put("pageTitle", activity.getTitle() != null ? activity.getTitle().toString() : currentPageRoute);
+                    String activityTitle = activity.getTitle() != null ? activity.getTitle().toString() : "";
+                    event.put("pageTitle", !TextUtils.isEmpty(activityTitle) ? activityTitle : getFriendlyPageTitle(route));
                     enqueueEvent(event);
                     flushAsync();
                 } catch (Exception e) {
@@ -641,11 +864,13 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                 try {
                     if (lastPageStartTime > 0) {
                         long duration = System.currentTimeMillis() - lastPageStartTime;
-                        JSONObject event = createBaseEvent("page_stay", "page_stay");
-                        event.put("duration", duration);
-                        enqueueEvent(event);
+                        if (duration >= 500) {
+                            JSONObject event = createBaseEvent("page_stay", "page_stay");
+                            event.put("duration", duration);
+                            enqueueEvent(event);
+                            flushAsync();
+                        }
                         lastPageStartTime = 0;
-                        flushAsync();
                     }
                 } catch (Exception e) {
                     Log.e(TAG, "===> [Native Tracker onActivityPaused Error]", e);
@@ -662,14 +887,14 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
     // --- Window.Callback 代理包装器 (带 S3 滑动防误触过滤) ---
     private class WindowCallbackWrapper implements Window.Callback {
         private final Window.Callback mWrapped;
-        private final Activity mActivity;
+        private final java.lang.ref.WeakReference<Activity> mActivityRef;
         private float downX, downY;
         private long downTime;
         private int touchSlop = -1;
 
         public WindowCallbackWrapper(Window.Callback wrapped, Activity activity) {
             this.mWrapped = wrapped;
-            this.mActivity = activity;
+            this.mActivityRef = new java.lang.ref.WeakReference<>(activity);
             if (activity != null) {
                 try {
                     this.touchSlop = ViewConfiguration.get(activity).getScaledTouchSlop();
@@ -693,8 +918,9 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                 int slopThreshold = touchSlop > 0 ? touchSlop : 24;
                 if (distance <= slopThreshold && duration < 1500) {
                     try {
-                        if (mActivity != null && mActivity.getWindow() != null) {
-                            View decorView = mActivity.getWindow().getDecorView();
+                        Activity act = mActivityRef != null ? mActivityRef.get() : null;
+                        if (act != null && act.getWindow() != null) {
+                            View decorView = act.getWindow().getDecorView();
                             View leaf = findTouchedLeafView(decorView, (int) event.getRawX(), (int) event.getRawY());
                             View clickableTarget = null;
                             View curr = leaf;
@@ -707,7 +933,7 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                                 curr = (View) curr.getParent();
                             }
                             if (clickableTarget != null) {
-                                handleNativeViewClick(mActivity, clickableTarget, event.getRawX(), event.getRawY());
+                                handleNativeViewClick(act, clickableTarget, event.getRawX(), event.getRawY());
                             }
                         }
                     } catch (Exception e) {
@@ -715,30 +941,30 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                     }
                 }
             }
-            return mWrapped.dispatchTouchEvent(event);
+            return mWrapped != null ? mWrapped.dispatchTouchEvent(event) : false;
         }
 
-        @Override public boolean dispatchKeyEvent(KeyEvent event) { return mWrapped.dispatchKeyEvent(event); }
-        @Override public boolean dispatchKeyShortcutEvent(KeyEvent event) { return mWrapped.dispatchKeyShortcutEvent(event); }
-        @Override public boolean dispatchTrackballEvent(MotionEvent event) { return mWrapped.dispatchTrackballEvent(event); }
-        @Override public boolean dispatchGenericMotionEvent(MotionEvent event) { return mWrapped.dispatchGenericMotionEvent(event); }
-        @Override public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent event) { return mWrapped.dispatchPopulateAccessibilityEvent(event); }
-        @Nullable @Override public View onCreatePanelView(int featureId) { return mWrapped.onCreatePanelView(featureId); }
-        @Override public boolean onCreatePanelMenu(int featureId, @NonNull Menu menu) { return mWrapped.onCreatePanelMenu(featureId, menu); }
-        @Override public boolean onPreparePanel(int featureId, @Nullable View view, @NonNull Menu menu) { return mWrapped.onPreparePanel(featureId, view, menu); }
-        @Override public boolean onMenuOpened(int featureId, @NonNull Menu menu) { return mWrapped.onMenuOpened(featureId, menu); }
-        @Override public boolean onMenuItemSelected(int featureId, @NonNull MenuItem item) { return mWrapped.onMenuItemSelected(featureId, item); }
-        @Override public void onWindowAttributesChanged(WindowManager.LayoutParams attrs) { mWrapped.onWindowAttributesChanged(attrs); }
-        @Override public void onContentChanged() { mWrapped.onContentChanged(); }
-        @Override public void onWindowFocusChanged(boolean hasFocus) { mWrapped.onWindowFocusChanged(hasFocus); }
-        @Override public void onAttachedToWindow() { mWrapped.onAttachedToWindow(); }
-        @Override public void onDetachedFromWindow() { mWrapped.onDetachedFromWindow(); }
-        @Override public void onPanelClosed(int featureId, @NonNull Menu menu) { mWrapped.onPanelClosed(featureId, menu); }
-        @Override public boolean onSearchRequested() { return mWrapped.onSearchRequested(); }
-        @Override public boolean onSearchRequested(SearchEvent searchEvent) { return mWrapped.onSearchRequested(searchEvent); }
-        @Nullable @Override public ActionMode onWindowStartingActionMode(ActionMode.Callback callback) { return mWrapped.onWindowStartingActionMode(callback); }
-        @Nullable @Override public ActionMode onWindowStartingActionMode(ActionMode.Callback callback, int type) { return mWrapped.onWindowStartingActionMode(callback, type); }
-        @Override public void onActionModeStarted(ActionMode mode) { mWrapped.onActionModeStarted(mode); }
-        @Override public void onActionModeFinished(ActionMode mode) { mWrapped.onActionModeFinished(mode); }
+        @Override public boolean dispatchKeyEvent(KeyEvent event) { return mWrapped != null && mWrapped.dispatchKeyEvent(event); }
+        @Override public boolean dispatchKeyShortcutEvent(KeyEvent event) { return mWrapped != null && mWrapped.dispatchKeyShortcutEvent(event); }
+        @Override public boolean dispatchTrackballEvent(MotionEvent event) { return mWrapped != null && mWrapped.dispatchTrackballEvent(event); }
+        @Override public boolean dispatchGenericMotionEvent(MotionEvent event) { return mWrapped != null && mWrapped.dispatchGenericMotionEvent(event); }
+        @Override public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent event) { return mWrapped != null && mWrapped.dispatchPopulateAccessibilityEvent(event); }
+        @Nullable @Override public View onCreatePanelView(int featureId) { return mWrapped != null ? mWrapped.onCreatePanelView(featureId) : null; }
+        @Override public boolean onCreatePanelMenu(int featureId, @NonNull Menu menu) { return mWrapped != null && mWrapped.onCreatePanelMenu(featureId, menu); }
+        @Override public boolean onPreparePanel(int featureId, @Nullable View view, @NonNull Menu menu) { return mWrapped != null && mWrapped.onPreparePanel(featureId, view, menu); }
+        @Override public boolean onMenuOpened(int featureId, @NonNull Menu menu) { return mWrapped != null && mWrapped.onMenuOpened(featureId, menu); }
+        @Override public boolean onMenuItemSelected(int featureId, @NonNull MenuItem item) { return mWrapped != null && mWrapped.onMenuItemSelected(featureId, item); }
+        @Override public void onWindowAttributesChanged(WindowManager.LayoutParams attrs) { if (mWrapped != null) mWrapped.onWindowAttributesChanged(attrs); }
+        @Override public void onContentChanged() { if (mWrapped != null) mWrapped.onContentChanged(); }
+        @Override public void onWindowFocusChanged(boolean hasFocus) { if (mWrapped != null) mWrapped.onWindowFocusChanged(hasFocus); }
+        @Override public void onAttachedToWindow() { if (mWrapped != null) mWrapped.onAttachedToWindow(); }
+        @Override public void onDetachedFromWindow() { if (mWrapped != null) mWrapped.onDetachedFromWindow(); }
+        @Override public void onPanelClosed(int featureId, @NonNull Menu menu) { if (mWrapped != null) mWrapped.onPanelClosed(featureId, menu); }
+        @Override public boolean onSearchRequested() { return mWrapped != null && mWrapped.onSearchRequested(); }
+        @Override public boolean onSearchRequested(SearchEvent searchEvent) { return mWrapped != null && mWrapped.onSearchRequested(searchEvent); }
+        @Nullable @Override public ActionMode onWindowStartingActionMode(ActionMode.Callback callback) { return mWrapped != null ? mWrapped.onWindowStartingActionMode(callback) : null; }
+        @Nullable @Override public ActionMode onWindowStartingActionMode(ActionMode.Callback callback, int type) { return mWrapped != null ? mWrapped.onWindowStartingActionMode(callback, type) : null; }
+        @Override public void onActionModeStarted(ActionMode mode) { if (mWrapped != null) mWrapped.onActionModeStarted(mode); }
+        @Override public void onActionModeFinished(ActionMode mode) { if (mWrapped != null) mWrapped.onActionModeFinished(mode); }
     }
 }

package/native/android/TrackerInterceptor.java

@@ -0,0 +1,134 @@
+package com.renrui.tracker;
+
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+
+/**
+ * 行业级 Native OkHttp 埋点无侵入网络拦截器
+ * 1. 0 侵入：仅安全只读提取（peekBody），绝对不消耗或关闭原始 Stream
+ * 2. 0 阻塞：主线程 0ms 开销，数据采集后直接抛给 HandlerThread 异步队列
+ * 3. 严格防递归：过滤 SDK 自身上报 URL，杜绝死循环
+ * 4. 异常原样抛出：记录超时/断网 api_error 后原样 throw e，不破坏原有业务逻辑
+ */
+public class TrackerInterceptor implements Interceptor {
+
+    private static final String TAG = "TrackerInterceptor";
+    private static final int MAX_PARAM_LENGTH = 4096;
+    private static final int MAX_RESP_PREVIEW_LENGTH = 2048;
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request request = chain.request();
+        String url = request.url() != null ? request.url().toString() : "";
+
+        // 1. 过滤自身打点接口，防止递归死循环
+        if (isTrackerInternalUrl(url)) {
+            return chain.proceed(request);
+        }
+
+        String reqParam = extractRequestParams(request);
+        long startTime = System.currentTimeMillis();
+        Response response;
+
+        try {
+            response = chain.proceed(request);
+        } catch (IOException e) {
+            // 网络异常（如超时、无法连接），采集并原样抛出；过滤客户端主动 cancel 引起的异常
+            long duration = System.currentTimeMillis() - startTime;
+            boolean isCanceled = "Canceled".equalsIgnoreCase(e.getMessage());
+            if (!isCanceled) {
+                try {
+                    AndroidTracker.getInstance().trackApi(url, request.method(), 0, duration, reqParam, null, e.getMessage());
+                } catch (Exception ex) {
+                    Log.e(TAG, "trackApi error", ex);
+                }
+            }
+            throw e;
+        }
+
+        long duration = System.currentTimeMillis() - startTime;
+        String respData = null;
+
+        // 2. 使用 OkHttp 官方推荐的 peekBody 做安全无损预览（不破坏业务层 response.body() 流）
+        try {
+            if (response.body() != null) {
+                MediaType mediaType = response.body().contentType();
+                if (mediaType != null) {
+                    String sub = mediaType.subtype();
+                    if (sub != null && (sub.contains("json") || sub.contains("text") || sub.contains("xml") || sub.contains("html"))) {
+                        ResponseBody peek = response.peekBody(MAX_RESP_PREVIEW_LENGTH);
+                        respData = peek.string();
+                    }
+                }
+            }
+        } catch (Throwable ignored) {}
+
+        // 3. 异步送入 AndroidTracker，后台 HandlerThread 处理，0 阻塞当前网络线程
+        try {
+            AndroidTracker.getInstance().trackApi(url, request.method(), response.code(), duration, reqParam, respData, null);
+        } catch (Exception e) {
+            Log.e(TAG, "trackApi error", e);
+        }
+
+        return response;
+    }
+
+    private boolean isTrackerInternalUrl(String url) {
+        if (TextUtils.isEmpty(url)) return true;
+        String lower = url.toLowerCase();
+        return lower.contains("/api/point/task/trackBatch")
+                || lower.contains("/point/task/trackBatch")
+                || lower.contains("/point/task/activeReport")
+                || lower.contains("/api/point/task/activeReport")
+                || lower.contains("/api/track/collect")
+                || lower.contains(".png")
+                || lower.contains(".jpg")
+                || lower.contains(".jpeg")
+                || lower.contains(".webp")
+                || lower.contains(".gif")
+                || lower.contains(".mp4")
+                || lower.contains(".svg");
+    }
+
+    private String extractRequestParams(Request request) {
+        try {
+            if ("GET".equalsIgnoreCase(request.method())) {
+                String query = request.url().query();
+                return !TextUtils.isEmpty(query) ? query : "";
+            }
+            RequestBody body = request.body();
+            if (body != null && body.contentLength() > 0 && body.contentLength() <= MAX_PARAM_LENGTH) {
+                MediaType contentType = body.contentType();
+                if (contentType != null) {
+                    String type = contentType.type();
+                    String sub = contentType.subtype();
+                    if ("multipart".equalsIgnoreCase(type) || "image".equalsIgnoreCase(type)
+                            || "video".equalsIgnoreCase(type) || "audio".equalsIgnoreCase(type)
+                            || (sub != null && sub.contains("octet-stream"))) {
+                        return "[binary/multipart: " + body.contentLength() + " bytes]";
+                    }
+                }
+                Buffer buffer = new Buffer();
+                body.writeTo(buffer);
+                Charset charset = StandardCharsets.UTF_8;
+                if (contentType != null) {
+                    charset = contentType.charset(StandardCharsets.UTF_8);
+                }
+                return buffer.readString(charset != null ? charset : StandardCharsets.UTF_8);
+            }
+        } catch (Throwable ignored) {}
+        return "";
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rk911/tracker-sdk",
-  "version": "1.7.2",
+  "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/api-watch.js

@@ -50,44 +50,149 @@ export class ApiWatchPlugin {
     var self = this
     var config = this.tracker.getConfig()
 
-    try {
-      uni.addInterceptor('request', {
-        invoke: function (args) {
-          // 给请求打上开始时间标记
-          args._trackStartTime = Date.now()
-          args._trackBgCount = self._bgCount
-          args._trackHiddenTimeStart = self._totalHiddenTime + (self._lastHideTime ? Date.now() - self._lastHideTime : 0)
-          return args
-        },
-        success: function (res, args) {
-          self._reportApi(args, res, null)
-        },
-        fail: function (err, args) {
-          self._reportApi(args, null, err)
-        },
-      })
-      this._interceptorAdded = true
-    } catch (e) {
-      if (config.debug) {
-        console.warn('[TrackerSDK] api-watch: failed to add interceptor', e)
+    // 1. uni-app 运行时环境：优先使用官方 uni.addInterceptor
+    if (typeof uni !== 'undefined' && typeof uni.addInterceptor === 'function') {
+      try {
+        uni.addInterceptor('request', {
+          invoke: function (args) {
+            args._trackStartTime = Date.now()
+            args._trackBgCount = self._bgCount
+            args._trackHiddenTimeStart = self._totalHiddenTime + (self._lastHideTime ? Date.now() - self._lastHideTime : 0)
+            return args
+          },
+          success: function (res, args) {
+            self._reportApi(args, res, null)
+          },
+          fail: function (err, args) {
+            self._reportApi(args, null, err)
+          },
+        })
+        this._interceptorAdded = true
+        return
+      } catch (e) {
+        if (config.debug) {
+          console.warn('[TrackerSDK] api-watch: failed to add uni interceptor', e)
+        }
       }
     }
+
+    // 2. 标准浏览器/WebView 环境：拦截 window.fetch 与 XMLHttpRequest
+    if (typeof window !== 'undefined') {
+      this._setupWebInterceptors()
+    }
   }
 
-  _reportApi(args, res, err) {
-    if (!args || !args.url) return
+  _isInternalUrl(url) {
+    if (!url || typeof url !== 'string') return true
+    var config = this.tracker ? this.tracker.getConfig() : {}
+    return (
+      url.indexOf('trackBatch') >= 0 ||
+      url.indexOf('activeReport') >= 0 ||
+      url.indexOf('/api/track/collect') >= 0 ||
+      url.indexOf('/api/point/device/add') >= 0 ||
+      (config && config.batchReportUrl && url.indexOf(config.batchReportUrl) >= 0)
+    )
+  }
 
-    var config = this.tracker.getConfig()
+  _setupWebInterceptors() {
+    var self = this
+
+    // 2.1 拦截 window.fetch
+    if (typeof window.fetch === 'function') {
+      var origFetch = window.fetch
+      this._origFetch = origFetch
+      window.fetch = function (input, init) {
+        var url = typeof input === 'string' ? input : (input && input.url ? input.url : '')
+        if (self._isInternalUrl(url)) {
+          return origFetch.apply(this, arguments)
+        }
+
+        var startTime = Date.now()
+        var method = (init && init.method) || (input && input.method) || 'GET'
+        var requestParams = (init && init.body) || null
 
-    // [PROJECT-ADAPT] 自身请求过滤列表
-    if (
-      args.url.indexOf('/api/point/task/activeReport') >= 0 ||
-      args.url.indexOf(config.batchReportUrl) >= 0 ||
-      args.url.indexOf('/api/track/collect') >= 0
-    ) {
-      return
+        var args = {
+          url: url,
+          method: method,
+          data: requestParams,
+          _trackStartTime: startTime
+        }
+
+        return origFetch.apply(this, arguments).then(function (res) {
+          try {
+            var clone = res.clone()
+            clone.text().then(function (text) {
+              self._reportApi(args, {
+                statusCode: res.status,
+                data: text,
+                header: {}
+              }, null)
+            }).catch(function () {
+              self._reportApi(args, {
+                statusCode: res.status,
+                data: null,
+                header: {}
+              }, null)
+            })
+          } catch (e) {
+            self._reportApi(args, { statusCode: res.status }, null)
+          }
+          return res
+        }, function (err) {
+          self._reportApi(args, null, err)
+          throw err
+        })
+      }
     }
 
+    // 2.2 拦截 XMLHttpRequest
+    if (typeof window.XMLHttpRequest === 'function') {
+      var origOpen = window.XMLHttpRequest.prototype.open
+      var origSend = window.XMLHttpRequest.prototype.send
+      this._origXhrOpen = origOpen
+      this._origXhrSend = origSend
+
+      window.XMLHttpRequest.prototype.open = function (method, url) {
+        this._trackMethod = method
+        this._trackUrl = url
+        return origOpen.apply(this, arguments)
+      }
+
+      window.XMLHttpRequest.prototype.send = function (data) {
+        var xhr = this
+        var url = xhr._trackUrl || ''
+        if (self._isInternalUrl(url)) {
+          return origSend.apply(this, arguments)
+        }
+
+        var startTime = Date.now()
+        var method = xhr._trackMethod || 'GET'
+
+        var args = {
+          url: url,
+          method: method,
+          data: data,
+          _trackStartTime: startTime
+        }
+
+        xhr.addEventListener('loadend', function () {
+          try {
+            self._reportApi(args, {
+              statusCode: xhr.status,
+              data: xhr.responseType === '' || xhr.responseType === 'text' ? xhr.responseText : null
+            }, xhr.status === 0 ? 'Network Error' : null)
+          } catch (e) {}
+        })
+
+        return origSend.apply(this, arguments)
+      }
+    }
+    this._interceptorAdded = true
+  }
+
+  _reportApi(args, res, err) {
+    if (!args || !args.url || this._isInternalUrl(args.url)) return
+
     var duration = args._trackStartTime
       ? Date.now() - args._trackStartTime
       : 0
@@ -210,8 +315,17 @@ export class ApiWatchPlugin {
     }
     if (this._interceptorAdded) {
       try {
-        uni.removeInterceptor('request')
+        if (typeof uni !== 'undefined' && uni.removeInterceptor) {
+          uni.removeInterceptor('request')
+        }
       } catch (e) {}
+      if (this._origFetch && typeof window !== 'undefined') {
+        window.fetch = this._origFetch
+      }
+      if (this._origXhrOpen && typeof window !== 'undefined') {
+        window.XMLHttpRequest.prototype.open = this._origXhrOpen
+        window.XMLHttpRequest.prototype.send = this._origXhrSend
+      }
     }
     if (this._visibilityHandler && typeof document !== 'undefined') {
       document.removeEventListener('visibilitychange', this._visibilityHandler)

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
     }