@rk911/tracker-sdk 1.7.1 → 1.7.3

package/core/tracker.js

@@ -96,6 +96,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 +213,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) {

package/native/android/AndroidTracker.java

@@ -2,48 +2,156 @@ package com.renrui.tracker;
 
 import android.app.Activity;
 import android.app.Application;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.ActionMode;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.SearchEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 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.UUID;
+import java.util.Map;
 
 /**
  * 行业级 Native Android Tracker SDK
- * 独立后台 HandlerThread 处理打点，主线程耗时 0ms
+ * 1. 独立后台 HandlerThread 处理打点，主线程耗时 0ms
+ * 2. 轻量自包含 SQLite 本地持久化队列，应用退后台/被杀/Crash 100% 防丢 (S1)
+ * 3. 弱网/断网失败重试与补偿机制 (S2)
+ * 4. TouchSlop 滑动误触过滤，彻底排除列表滚动误触发点击 (S3)
+ * 5. 页面来源 Referrer 状态机 (S4)
+ * 6. 对外暴露标准显式操控 API (S5)
+ * 7. 兼容历史自定义点位，支撑后端双写 (A6)
  */
 public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
 
     private static final String TAG = "AndroidTracker";
     private static final int BATCH_SIZE = 20;
-    private static final long FLUSH_INTERVAL_MS = 5000;
+    private static final long FLUSH_INTERVAL_MS = 3000;
+    private static final int MAX_DB_RECORDS = 1000;
 
     private static volatile AndroidTracker instance;
     private Application application;
-    private String serverUrl;
+    private volatile String serverUrl;
     private String appId = "12"; // 12: Android App
-    private String sessionId;
-    private String deviceId;
-    private String userId;
-    private String phone;
-    private String storeName;
+    private volatile String sessionId;
+    private volatile String deviceId;
+    private volatile String userId;
+    private volatile String phone;
+    private volatile String storeName;
     private int sequence = 0;
 
     private HandlerThread bgThread;
     private Handler bgHandler;
-    private final List<JSONObject> eventQueue = new ArrayList<>();
+    private TrackerDbHelper dbHelper;
+    private final Object dbLock = new Object();
+
     private long lastPageStartTime = 0;
     private String currentPageRoute = "";
+    private String referrerPageRoute = "";
+    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;
+
+        EventRecord(long id, JSONObject json) {
+            this.id = id;
+            this.json = json;
+        }
+    }
+
+    private static class TrackerDbHelper extends SQLiteOpenHelper {
+        private static final String DB_NAME = "rk_tracker.db";
+        private static final int DB_VERSION = 1;
+        private static final String TABLE_EVENTS = "events";
+
+        TrackerDbHelper(Context context) {
+            super(context, DB_NAME, null, DB_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+            db.execSQL("CREATE TABLE IF NOT EXISTS " + TABLE_EVENTS + " ("
+                    + "id INTEGER PRIMARY KEY AUTOINCREMENT, "
+                    + "data TEXT NOT NULL, "
+                    + "created_at INTEGER NOT NULL)");
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            db.execSQL("DROP TABLE IF EXISTS " + TABLE_EVENTS);
+            onCreate(db);
+        }
+    }
 
     private AndroidTracker() {}
 
@@ -72,11 +180,18 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         } else {
             this.serverUrl = serverUrl;
         }
-        this.deviceId = deviceId;
-        this.userId = userId;
-        this.phone = phone;
-        this.storeName = storeName;
-        this.sessionId = "android_" + System.currentTimeMillis() + "_" + (int)(Math.random() * 10000);
+        this.deviceId = !TextUtils.isEmpty(deviceId) ? deviceId : "dev_android_" + System.currentTimeMillis();
+        this.userId = userId != null ? userId : "";
+        this.phone = phone != null ? phone : "";
+        this.storeName = storeName != null ? storeName : "";
+        this.sessionId = "android_" + System.currentTimeMillis() + "_" + (int) (Math.random() * 10000);
+
+        // 初始化 SQLite 本地持久化数据库 (S1 防丢保障)
+        try {
+            dbHelper = new TrackerDbHelper(app.getApplicationContext());
+        } catch (Exception e) {
+            Log.e(TAG, "===> [Native Tracker DB Init Error]", e);
+        }
 
         // 创建独立后台线程处理队列与网络请求，保障 UI 0 卡顿
         bgThread = new HandlerThread("TrackerBgThread");
@@ -88,19 +203,91 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
 
         // 启动定时 Flush 任务
         scheduleTimerFlush();
-        Log.d(TAG, "AndroidTracker initialized with sessionId: " + sessionId + ", serverUrl: " + this.serverUrl);
+        Log.i(TAG, "====================================================================");
+        Log.i(TAG, "===> [Native Tracker Init Success] SessionId: " + sessionId);
+        Log.i(TAG, "===> ServerUrl: " + this.serverUrl);
+        Log.i(TAG, "===> DeviceId: " + this.deviceId + ", UserId: " + this.userId + ", Phone: " + this.phone + ", Store: " + this.storeName);
+        Log.i(TAG, "====================================================================");
+
+        // 启动时检查是否有上一轮未发出的积压事件，立即尝试补发 (S2 补偿机制)
+        flushAsync();
     }
 
     public void updateUser(String userId, String phone, String storeName) {
-        if (!TextUtils.isEmpty(userId)) this.userId = userId;
-        if (!TextUtils.isEmpty(phone)) this.phone = phone;
-        if (!TextUtils.isEmpty(storeName)) this.storeName = storeName;
+        if (userId != null) this.userId = userId;
+        if (phone != null) this.phone = phone;
+        if (storeName != null) this.storeName = storeName;
+        Log.i(TAG, "===> [Native Tracker User Updated] UserId: " + this.userId + ", Phone: " + this.phone + ", Store: " + this.storeName);
     }
 
     public String getSessionId() {
         return sessionId;
     }
 
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setUserId(String userId) {
+        updateUser(userId, null, null);
+    }
+
+    /**
+     * 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.sessionId = "android_" + System.currentTimeMillis() + "_" + (int) (Math.random() * 10000);
+        Log.i(TAG, "===> [Native Tracker Session Reset] New SessionId: " + this.sessionId);
+    }
+
+    /**
+     * 手动页面访问打点 (S5 & A4 用于 ViewPager2 Tab 切换补报)
+     */
+    public void trackPageView(final String pageRoute, final String pageTitle) {
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    // S34 类似防御：500ms 内相同路由防抖，避免生命周期和手动调用重复触发
+                    if (pageRoute.equals(currentPageRoute) && (System.currentTimeMillis() - lastPageStartTime < 500)) {
+                        Log.d(TAG, "===> [Native Page View Skipped - Duplicate within 500ms]: " + pageRoute);
+                        return;
+                    }
+                    String referrer = currentPageRoute;
+                    currentPageRoute = pageRoute;
+                    referrerPageRoute = referrer;
+                    lastPageStartTime = System.currentTimeMillis();
+
+                    Log.i(TAG, "===> [Native Page View] Route: " + currentPageRoute + ", Title: " + pageTitle + ", Referrer: " + referrerPageRoute);
+                    JSONObject event = createBaseEvent("page_view", "page_view");
+                    event.put("pageTitle", !TextUtils.isEmpty(pageTitle) ? pageTitle : pageRoute);
+                    enqueueEvent(event);
+                    flushAsync();
+                } catch (Exception e) {
+                    Log.e(TAG, "===> [Native trackPageView Error]", e);
+                }
+            }
+        });
+    }
+
     /**
      * 手动自定义埋点 (Custom Tracking)
      */
@@ -114,8 +301,9 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                         event.put("extraData", customProperties.toString());
                     }
                     enqueueEvent(event);
+                    flushAsync(); // 自定义点位立即上报
                 } catch (Exception e) {
-                    Log.e(TAG, "track custom event failed", e);
+                    Log.e(TAG, "===> [Native Tracker Track Failed]", e);
                 }
             }
         });
@@ -134,23 +322,104 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                     event.put("elementId", elementId);
                     if (postParam != null) event.put("postParam", postParam);
                     enqueueEvent(event);
+                    flushAsync();
                 } catch (Exception e) {
-                    Log.e(TAG, "trackFrontUrl failed", e);
+                    Log.e(TAG, "===> [Native Tracker trackFrontUrl Failed]", e);
                 }
             }
         });
     }
 
+    /**
+     * 接口请求与异常自动化上报 (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();
-        event.put("eventId", "e_" + System.currentTimeMillis() + "_" + (int)(Math.random() * 1000));
+        event.put("eventId", "e_" + System.currentTimeMillis() + "_" + (int) (Math.random() * 1000));
         event.put("eventType", eventType);
         event.put("eventName", eventName);
         event.put("timestamp", System.currentTimeMillis());
         event.put("sequence", sequence);
         event.put("pageRoute", currentPageRoute);
+        if (!TextUtils.isEmpty(referrerPageRoute)) {
+            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);
@@ -161,11 +430,28 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         return event;
     }
 
+    /**
+     * S1 本地持久化入库：崩溃/被杀 100% 防丢
+     */
     private void enqueueEvent(JSONObject event) {
-        synchronized (eventQueue) {
-            eventQueue.add(event);
-            if (eventQueue.size() >= BATCH_SIZE) {
-                flushAsync();
+        synchronized (dbLock) {
+            if (dbHelper != null) {
+                try {
+                    SQLiteDatabase db = dbHelper.getWritableDatabase();
+                    ContentValues cv = new ContentValues();
+                    cv.put("data", event.toString());
+                    cv.put("created_at", System.currentTimeMillis());
+                    db.insert(TrackerDbHelper.TABLE_EVENTS, null, cv);
+
+                    // 限制最大记录数防膨胀
+                    db.execSQL("DELETE FROM " + TrackerDbHelper.TABLE_EVENTS + " WHERE id NOT IN ("
+                            + "SELECT id FROM " + TrackerDbHelper.TABLE_EVENTS + " ORDER BY id DESC LIMIT " + MAX_DB_RECORDS + ")");
+
+                    Log.i(TAG, "===> [Native Tracker Event Persisted to SQLite] Type: " + event.optString("eventType")
+                            + ", Name: " + event.optString("eventName") + ", Route: " + event.optString("pageRoute"));
+                } catch (Exception e) {
+                    Log.e(TAG, "===> [Native Tracker DB Insert Failed]", e);
+                }
             }
         }
     }
@@ -185,20 +471,73 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         postBgTask(new Runnable() {
             @Override
             public void run() {
-                List<JSONObject> toSend;
-                synchronized (eventQueue) {
-                    if (eventQueue.isEmpty()) return;
-                    toSend = new ArrayList<>(eventQueue);
-                    eventQueue.clear();
+                flushInternal();
+            }
+        });
+    }
+
+    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() {
+                try {
+                    flushInternal();
+                } finally {
+                    latch.countDown();
                 }
-                sendBatch(toSend);
             }
         });
+        try {
+            latch.await(1500, java.util.concurrent.TimeUnit.MILLISECONDS);
+        } catch (InterruptedException ignored) {}
+    }
+
+    private void flushInternal() {
+        int maxBatches = 5; // 单次最多连续发送 5 批（共 100 条），防止网络恢复时有大量积压滞留
+        while (maxBatches-- > 0) {
+            List<EventRecord> records = new ArrayList<>();
+            synchronized (dbLock) {
+                if (dbHelper != null) {
+                    Cursor cursor = null;
+                    try {
+                        SQLiteDatabase db = dbHelper.getReadableDatabase();
+                        cursor = db.rawQuery("SELECT id, data FROM " + TrackerDbHelper.TABLE_EVENTS + " ORDER BY id ASC LIMIT " + BATCH_SIZE, null);
+                        while (cursor != null && cursor.moveToNext()) {
+                            long id = cursor.getLong(0);
+                            String dataStr = cursor.getString(1);
+                            records.add(new EventRecord(id, new JSONObject(dataStr)));
+                        }
+                    } catch (Exception e) {
+                        Log.e(TAG, "===> [Native Tracker DB Query Failed]", e);
+                    } finally {
+                        if (cursor != null) cursor.close();
+                    }
+                }
+            }
+
+            if (records.isEmpty()) {
+                break;
+            }
+
+            boolean sent = sendBatch(records);
+            if (!sent || records.size() < BATCH_SIZE) {
+                break;
+            }
+        }
     }
 
-    private void sendBatch(List<JSONObject> events) {
-        if (TextUtils.isEmpty(serverUrl) || events.isEmpty()) return;
+    /**
+     * S2 网络发送与失败重试补偿机制
+     */
+    private boolean sendBatch(List<EventRecord> records) {
+        if (TextUtils.isEmpty(serverUrl) || records.isEmpty()) return false;
         HttpURLConnection conn = null;
+        boolean success = false;
         try {
             JSONObject body = new JSONObject();
             body.put("appId", Integer.parseInt(appId));
@@ -210,11 +549,13 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             body.put("platform", "android");
 
             JSONArray eventsArr = new JSONArray();
-            for (JSONObject e : events) {
-                eventsArr.put(e);
+            for (EventRecord record : records) {
+                eventsArr.put(record.json);
             }
             body.put("events", eventsArr);
 
+            Log.i(TAG, "===> [Native Tracker Flushing] Sending " + records.size() + " native events to: " + serverUrl);
+
             URL url = new URL(serverUrl);
             conn = (HttpURLConnection) url.openConnection();
             conn.setRequestMethod("POST");
@@ -232,12 +573,51 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             os.close();
 
             int code = conn.getResponseCode();
-            Log.d(TAG, "sendBatch response code: " + code + ", count: " + events.size());
+            InputStream is = (code >= 200 && code < 300) ? conn.getInputStream() : conn.getErrorStream();
+            String responseStr = "";
+            if (is != null) {
+                BufferedReader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+                StringBuilder sb = new StringBuilder();
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    sb.append(line);
+                }
+                reader.close();
+                responseStr = sb.toString();
+            }
+
+            if (code >= 200 && code < 300) {
+                success = true;
+                Log.i(TAG, "===> [Native Tracker Send SUCCESS] Code: " + code + ", Events: " + records.size() + ", Response: " + responseStr);
+            } else {
+                Log.e(TAG, "===> [Native Tracker Send FAILED] HTTP Code: " + code + ", Response: " + responseStr);
+            }
         } catch (Exception e) {
-            Log.e(TAG, "sendBatch failed", e);
+            Log.e(TAG, "===> [Native Tracker Network Error] Send batch failed (will retry in next flush)", e);
         } finally {
             if (conn != null) conn.disconnect();
         }
+
+        // 成功上报才从本地 SQLite 清理已上报事件；失败则保留在本地库中，等待下次补偿重试 (S2)
+        if (success) {
+            synchronized (dbLock) {
+                if (dbHelper != null) {
+                    try {
+                        SQLiteDatabase db = dbHelper.getWritableDatabase();
+                        StringBuilder sb = new StringBuilder("id IN (");
+                        for (int i = 0; i < records.size(); i++) {
+                            sb.append(records.get(i).id);
+                            if (i < records.size() - 1) sb.append(",");
+                        }
+                        sb.append(")");
+                        db.delete(TrackerDbHelper.TABLE_EVENTS, sb.toString(), null);
+                    } catch (Exception e) {
+                        Log.e(TAG, "===> [Native Tracker DB Delete Clean Failed]", e);
+                    }
+                }
+            }
+        }
+        return success;
     }
 
     private void postBgTask(Runnable runnable) {
@@ -246,7 +626,176 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         }
     }
 
-    // --- Activity Lifecycle Auto-Tracking ---
+    // --- Activity & Fragment Lifecycle & Auto Native Click Tracking ---
+
+    @Override
+    public void onActivityCreated(final Activity activity, Bundle savedInstanceState) {
+        // 1. 自动注册 Support Fragment 生命周期回调
+        if (activity instanceof FragmentActivity) {
+            ((FragmentActivity) activity).getSupportFragmentManager()
+                    .registerFragmentLifecycleCallbacks(new FragmentManager.FragmentLifecycleCallbacks() {
+                        @Override
+                        public void onFragmentResumed(FragmentManager fm, Fragment f) {
+                            super.onFragmentResumed(fm, f);
+                            final String fragmentRoute = f.getClass().getName();
+                            postBgTask(new Runnable() {
+                                @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", getFriendlyPageTitle(fragmentRoute));
+                                        enqueueEvent(event);
+                                        flushAsync();
+                                    } catch (Exception e) {
+                                        Log.e(TAG, "===> [Native Fragment Resumed Error]", e);
+                                    }
+                                }
+                            });
+                        }
+                    }, true);
+        }
+
+        // 2. 自动拦截 Window.Callback，捕获 Native 控件点击 (带 S3 滑动防误触过滤)
+        try {
+            Window window = activity.getWindow();
+            if (window != null) {
+                final Window.Callback origCb = window.getCallback();
+                if (origCb != null && !(origCb instanceof WindowCallbackWrapper)) {
+                    window.setCallback(new WindowCallbackWrapper(origCb, activity));
+                }
+            }
+        } catch (Exception e) {
+            Log.w(TAG, "===> [Native Window Callback Install Failed]", e);
+        }
+    }
+
+    private boolean isClickableTarget(View view) {
+        if (view == null) return false;
+        if (view.isClickable() || view.isLongClickable()) return true;
+        if (view instanceof Button || view instanceof EditText) return true;
+        return (view instanceof TextView && !TextUtils.isEmpty(((TextView) view).getText()));
+    }
+
+    private View findTouchedLeafView(View root, int rawX, int rawY) {
+        if (root == null || root.getVisibility() != View.VISIBLE) return null;
+
+        int[] location = new int[2];
+        root.getLocationOnScreen(location);
+        int x = location[0];
+        int y = location[1];
+        int w = root.getWidth();
+        int h = root.getHeight();
+
+        if (rawX < x || rawX > x + w || rawY < y || rawY > y + h) {
+            return null;
+        }
+
+        if (root instanceof ViewGroup) {
+            ViewGroup group = (ViewGroup) root;
+            for (int i = group.getChildCount() - 1; i >= 0; i--) {
+                View child = group.getChildAt(i);
+                View target = findTouchedLeafView(child, rawX, rawY);
+                if (target != null) {
+                    return target;
+                }
+            }
+        }
+
+        return root;
+    }
+
+    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 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;
+
+        final String elementId;
+        if (target.getId() != View.NO_ID) {
+            String resName = "";
+            try {
+                resName = target.getResources().getResourceEntryName(target.getId());
+            } catch (Exception e) {}
+            elementId = !TextUtils.isEmpty(resName) ? resName : "id_" + target.getId();
+        } else {
+            elementId = target.getClass().getSimpleName();
+        }
+
+        final String key = elementId + "|" + elementText;
+        final long now = System.currentTimeMillis();
+        if (key.equals(lastClickKey) && (now - lastClickTime < 800)) {
+            return;
+        }
+        lastClickKey = key;
+        lastClickTime = now;
+
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    JSONObject event = createBaseEvent("click", "native_click");
+                    event.put("elementId", elementId);
+                    if (!TextUtils.isEmpty(elementText)) {
+                        event.put("elementText", elementText.length() > 30 ? elementText.substring(0, 30) : elementText);
+                    }
+                    JSONObject extra = new JSONObject();
+                    extra.put("viewType", target.getClass().getName());
+                    extra.put("pageX", rawX);
+                    extra.put("pageY", rawY);
+                    extra.put("isNative", true);
+                    event.put("extraData", extra.toString());
+
+                    Log.i(TAG, "===> [Native Auto Click Captured] Id: " + elementId + ", Text: " + elementText);
+                    enqueueEvent(event);
+                    flushAsync();
+                } catch (Exception e) {
+                    Log.e(TAG, "===> [Native Click Handle Error]", e);
+                }
+            }
+        });
+    }
 
     @Override
     public void onActivityResumed(final Activity activity) {
@@ -254,13 +803,22 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             @Override
             public void run() {
                 try {
-                    currentPageRoute = activity.getClass().getName();
+                    final String route = activity.getClass().getName();
+                    if (route.equals(currentPageRoute) && (System.currentTimeMillis() - lastPageStartTime < 500)) {
+                        return;
+                    }
+                    String referrer = currentPageRoute;
+                    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) {
-                    Log.e(TAG, "onActivityResumed failed", e);
+                    Log.e(TAG, "===> [Native Tracker onActivityResumed Error]", e);
                 }
             }
         });
@@ -274,21 +832,107 @@ 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;
                     }
                 } catch (Exception e) {
-                    Log.e(TAG, "onActivityPaused failed", e);
+                    Log.e(TAG, "===> [Native Tracker onActivityPaused Error]", e);
                 }
             }
         });
     }
 
-    @Override public void onActivityCreated(Activity activity, Bundle savedInstanceState) {}
     @Override public void onActivityStarted(Activity activity) {}
     @Override public void onActivityStopped(Activity activity) { flushAsync(); }
     @Override public void onActivitySaveInstanceState(Activity activity, Bundle outState) {}
     @Override public void onActivityDestroyed(Activity activity) {}
+
+    // --- Window.Callback 代理包装器 (带 S3 滑动防误触过滤) ---
+    private class WindowCallbackWrapper implements Window.Callback {
+        private final Window.Callback mWrapped;
+        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.mActivityRef = new java.lang.ref.WeakReference<>(activity);
+            if (activity != null) {
+                try {
+                    this.touchSlop = ViewConfiguration.get(activity).getScaledTouchSlop();
+                } catch (Exception ignored) {}
+            }
+        }
+
+        @Override
+        public boolean dispatchTouchEvent(MotionEvent event) {
+            if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                downX = event.getRawX();
+                downY = event.getRawY();
+                downTime = System.currentTimeMillis();
+            } else if (event.getAction() == MotionEvent.ACTION_UP) {
+                float dx = Math.abs(event.getRawX() - downX);
+                float dy = Math.abs(event.getRawY() - downY);
+                double distance = Math.hypot(dx, dy);
+                long duration = System.currentTimeMillis() - downTime;
+
+                // S3 过滤：位移小于 touchSlop 且按下时长正常时才判定为点击
+                int slopThreshold = touchSlop > 0 ? touchSlop : 24;
+                if (distance <= slopThreshold && duration < 1500) {
+                    try {
+                        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;
+                            while (curr != null) {
+                                if (isClickableTarget(curr)) {
+                                    clickableTarget = curr;
+                                    break;
+                                }
+                                if (curr == decorView || !(curr.getParent() instanceof View)) break;
+                                curr = (View) curr.getParent();
+                            }
+                            if (clickableTarget != null) {
+                                handleNativeViewClick(act, clickableTarget, event.getRawX(), event.getRawY());
+                            }
+                        }
+                    } catch (Exception e) {
+                        Log.w(TAG, "===> [Native Click Watcher Error]", e);
+                    }
+                }
+            }
+            return mWrapped != null ? mWrapped.dispatchTouchEvent(event) : false;
+        }
+
+        @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.1",
+  "version": "1.7.3",
   "description": "人康多端埋点 SDK — 跨端自动化采集 + 手动埋点双写兼容",
   "main": "index.js",
   "module": "index.js",

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)