@rk911/tracker-sdk 1.7.0 → 1.7.2

package/native/android/AndroidTracker.java

@@ -2,48 +2,121 @@ 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.List;
-import java.util.UUID;
 
 /**
  * 行业级 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 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() {}
 
@@ -63,12 +136,27 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
      */
     public void init(Application app, String serverUrl, String deviceId, String userId, String phone, String storeName) {
         this.application = app;
-        this.serverUrl = serverUrl;
-        this.deviceId = deviceId;
-        this.userId = userId;
-        this.phone = phone;
-        this.storeName = storeName;
-        this.sessionId = "android_" + System.currentTimeMillis() + "_" + (int)(Math.random() * 10000);
+        if (serverUrl != null && !serverUrl.contains("/api/point/task/trackBatch")) {
+            if (serverUrl.endsWith("/")) {
+                this.serverUrl = serverUrl + "api/point/task/trackBatch";
+            } else {
+                this.serverUrl = serverUrl + "/api/point/task/trackBatch";
+            }
+        } else {
+            this.serverUrl = serverUrl;
+        }
+        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");
@@ -80,19 +168,66 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
 
         // 启动定时 Flush 任务
         scheduleTimerFlush();
-        Log.d(TAG, "AndroidTracker initialized with sessionId: " + sessionId);
+        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 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)
      */
@@ -106,8 +241,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);
                 }
             }
         });
@@ -126,8 +262,9 @@ 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);
                 }
             }
         });
@@ -136,21 +273,48 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
     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");
+
+        JSONObject extra = new JSONObject();
+        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());
         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);
+                }
             }
         }
     }
@@ -170,40 +334,85 @@ 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();
-                }
-                sendBatch(toSend);
+                flushInternal();
+            }
+        });
+    }
+
+    public void flushSync() {
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                flushInternal();
             }
         });
     }
 
-    private void sendBatch(List<JSONObject> events) {
-        if (TextUtils.isEmpty(serverUrl) || events.isEmpty()) return;
+    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;
+            }
+        }
+    }
+
+    /**
+     * 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));
             body.put("sessionId", sessionId);
             body.put("deviceId", deviceId);
-            body.put("userId", userId);
-            body.put("phone", phone);
-            body.put("storeName", storeName);
+            body.put("userId", userId != null ? userId : "");
+            body.put("phone", phone != null ? phone : "");
+            body.put("storeName", storeName != null ? storeName : "");
             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");
             conn.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+            conn.setRequestProperty("appId", appId);
+            conn.setRequestProperty("deviceId", deviceId != null ? deviceId : "");
             conn.setDoOutput(true);
             conn.setConnectTimeout(5000);
             conn.setReadTimeout(5000);
@@ -215,12 +424,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) {
@@ -229,7 +477,139 @@ 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 {
+                                        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);
+                                        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();
+                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 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 = "";
+        }
+
+        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) {
@@ -237,13 +617,17 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             @Override
             public void run() {
                 try {
+                    String referrer = currentPageRoute;
                     currentPageRoute = activity.getClass().getName();
+                    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);
                     enqueueEvent(event);
+                    flushAsync();
                 } catch (Exception e) {
-                    Log.e(TAG, "onActivityResumed failed", e);
+                    Log.e(TAG, "===> [Native Tracker onActivityResumed Error]", e);
                 }
             }
         });
@@ -261,17 +645,100 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                         event.put("duration", duration);
                         enqueueEvent(event);
                         lastPageStartTime = 0;
+                        flushAsync();
                     }
                 } 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 Activity mActivity;
+        private float downX, downY;
+        private long downTime;
+        private int touchSlop = -1;
+
+        public WindowCallbackWrapper(Window.Callback wrapped, Activity activity) {
+            this.mWrapped = wrapped;
+            this.mActivity = 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 {
+                        if (mActivity != null && mActivity.getWindow() != null) {
+                            View decorView = mActivity.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(mActivity, clickableTarget, event.getRawX(), event.getRawY());
+                            }
+                        }
+                    } catch (Exception e) {
+                        Log.w(TAG, "===> [Native Click Watcher Error]", e);
+                    }
+                }
+            }
+            return mWrapped.dispatchTouchEvent(event);
+        }
+
+        @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); }
+    }
 }

package/native/ios/RKTrackerSDK.swift

@@ -28,7 +28,15 @@ import UIKit
     }
 
     @objc public func initSDK(serverUrl: String, deviceId: String, userId: String, phone: String, storeName: String) {
-        self.serverUrl = serverUrl
+        if !serverUrl.contains("/api/point/task/trackBatch") {
+            if serverUrl.hasSuffix("/") {
+                self.serverUrl = serverUrl + "api/point/task/trackBatch"
+            } else {
+                self.serverUrl = serverUrl + "/api/point/task/trackBatch"
+            }
+        } else {
+            self.serverUrl = serverUrl
+        }
         self.deviceId = deviceId.isEmpty ? (UIDevice.current.identifierForVendor?.uuidString ?? "") : deviceId
         self.userId = userId
         self.phone = phone
@@ -66,13 +74,23 @@ import UIKit
 
     private func createBaseEvent(eventType: String, eventName: String) -> [String: Any] {
         sequence += 1
+        var extra: [String: Any] = ["platform": "ios"]
+        if !phone.isEmpty { extra["phone"] = phone }
+        if !storeName.isEmpty { extra["storeName"] = storeName }
+        if !userId.isEmpty { extra["userId"] = userId }
+        var extraStr = ""
+        if let data = try? JSONSerialization.data(withJSONObject: extra), let str = String(data: data, encoding: .utf8) {
+            extraStr = str
+        }
+
         var event: [String: Any] = [
             "eventId": "e_\(Int(Date().timeIntervalSince1970 * 1000))_\(Int.random(in: 1000...9999))",
             "eventType": eventType,
             "eventName": eventName,
             "timestamp": Int(Date().timeIntervalSince1970 * 1000),
             "sequence": sequence,
-            "os": "iOS"
+            "os": "iOS",
+            "extraData": extraStr
         ]
         return event
     }
@@ -106,6 +124,8 @@ import UIKit
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
         request.setValue("application/json; charset=UTF-8", forHTTPHeaderField: "Content-Type")
+        request.setValue(appId, forHTTPHeaderField: "appId")
+        request.setValue(deviceId, forHTTPHeaderField: "deviceId")
 
         let body: [String: Any] = [
             "appId": Int(appId) ?? 13,

package/package.json

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