@rk911/tracker-sdk 1.7.15 → 1.7.17

package/index.js

@@ -253,17 +253,19 @@ function _ensureUserId(tracker) {
     } catch (e) {}
   }
 
-  // 2. URL query 跨端注入参数兜底
-  if (!uid && typeof window !== 'undefined' && window.location && window.location.search) {
+  // 2. URL query 跨端注入参数兜底（全面兼容标准 search 与 SPA Hash 路由后的 query）
+  if (typeof window !== 'undefined' && window.location) {
     try {
-      var search = window.location.search
+      var search = (window.location.search || '') + '&' + (window.location.hash || '')
       var matchSeq = search.match(/[?&]_trk_seq=([^&]+)/)
       if (matchSeq) {
         session.setInitialSequence(Number(decodeURIComponent(matchSeq[1])))
       }
-      var matchUid = search.match(/[?&]_trk_userId=([^&]+)/)
-      if (matchUid) {
-        uid = decodeURIComponent(matchUid[1])
+      if (!uid) {
+        var matchUid = search.match(/[?&]_trk_userId=([^&]+)/)
+        if (matchUid) {
+          uid = decodeURIComponent(matchUid[1])
+        }
       }
     } catch (e) {}
   }

package/native/android/AndroidTracker.java

@@ -74,6 +74,7 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
     private volatile String userId;
     private volatile String phone;
     private volatile String storeName;
+    private volatile String userName;
     private volatile int sequence = 0;
     private volatile int pflag = -1;
     private volatile String platformName = "";
@@ -189,6 +190,10 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
      * 初始化 SDK
      */
     public void init(Application app, String serverUrl, String deviceId, String userId, String phone, String storeName) {
+        init(app, serverUrl, deviceId, userId, phone, storeName, "");
+    }
+
+    public void init(Application app, String serverUrl, String deviceId, String userId, String phone, String storeName, String userName) {
         this.application = app;
         if (serverUrl != null && !serverUrl.contains("/api/point/task/trackBatch")) {
             if (serverUrl.endsWith("/")) {
@@ -203,6 +208,7 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         this.userId = userId != null ? userId : "";
         this.phone = phone != null ? phone : "";
         this.storeName = storeName != null ? storeName : "";
+        this.userName = userName != null ? userName : "";
         this.sessionId = "android_" + System.currentTimeMillis() + "_" + (int) (Math.random() * 10000);
 
         // 初始化 SQLite 本地持久化数据库 (S1 防丢保障)
@@ -233,10 +239,15 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
     }
 
     public void updateUser(String userId, String phone, String storeName) {
+        updateUser(userId, phone, storeName, null);
+    }
+
+    public void updateUser(String userId, String phone, String storeName, String userName) {
         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);
+        if (userName != null) this.userName = userName;
+        Log.i(TAG, "===> [Native Tracker User Updated] UserId: " + this.userId + ", Phone: " + this.phone + ", Store: " + this.storeName + ", User: " + this.userName);
     }
 
     public void setPlatform(int pflag, String platformName) {
@@ -273,6 +284,10 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         return storeName != null ? storeName : "";
     }
 
+    public String getUserName() {
+        return userName != null ? userName : "";
+    }
+
     public void setUserId(String userId) {
         updateUser(userId, null, null);
     }
@@ -424,7 +439,19 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                         event.put("elementText", elementText);
                     }
                     if (customProperties != null) {
-                        event.put("extraData", customProperties.toString());
+                        JSONObject extra = new JSONObject();
+                        String baseExtraStr = event.optString("extraData");
+                        if (!TextUtils.isEmpty(baseExtraStr)) {
+                            try {
+                                extra = new JSONObject(baseExtraStr);
+                            } catch (Exception ignored) {}
+                        }
+                        Iterator<String> keys = customProperties.keys();
+                        while (keys.hasNext()) {
+                            String k = keys.next();
+                            extra.put(k, customProperties.opt(k));
+                        }
+                        event.put("extraData", extra.toString());
                     }
                     enqueueEvent(event);
                     flushAsync();
@@ -442,7 +469,19 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                 try {
                     JSONObject event = createBaseEvent("custom", eventName);
                     if (customProperties != null) {
-                        event.put("extraData", customProperties.toString());
+                        JSONObject extra = new JSONObject();
+                        String baseExtraStr = event.optString("extraData");
+                        if (!TextUtils.isEmpty(baseExtraStr)) {
+                            try {
+                                extra = new JSONObject(baseExtraStr);
+                            } catch (Exception ignored) {}
+                        }
+                        Iterator<String> keys = customProperties.keys();
+                        while (keys.hasNext()) {
+                            String k = keys.next();
+                            extra.put(k, customProperties.opt(k));
+                        }
+                        event.put("extraData", extra.toString());
                     }
                     enqueueEvent(event);
                     flushAsync(); // 自定义点位立即上报
@@ -457,26 +496,40 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
      * 旧 $dadian 点位兼容方法 (自动匹配后端双写 point.log)
      */
     public void trackFrontUrl(final String frontUrl, final String elementId, final String postParam) {
-        final String key = (frontUrl != null ? frontUrl : "") + "|" + (elementId != null ? elementId : "");
-        final long now = System.currentTimeMillis();
-        if (key.equals(lastLegacyClickKey) && (now - lastLegacyClickTime < 500)) {
-            return;
+        boolean isExposure = elementId != null && (elementId.startsWith("look") || elementId.startsWith("show") || elementId.contains("Exposure") || elementId.contains("Show") || elementId.contains("Bubble"));
+        if (!isExposure) {
+            final String key = (frontUrl != null ? frontUrl : "") + "|" + (elementId != null ? elementId : "") + "|" + (postParam != null ? postParam : "");
+            final long now = System.currentTimeMillis();
+            if (key.equals(lastLegacyClickKey) && (now - lastLegacyClickTime < 500)) {
+                return;
+            }
+            lastLegacyClickKey = key;
+            lastLegacyClickTime = now;
         }
-        lastLegacyClickKey = key;
-        lastLegacyClickTime = now;
 
         postBgTask(new Runnable() {
             @Override
             public void run() {
                 try {
-                    String eventType = "click";
-                    if (elementId != null && (elementId.startsWith("look") || elementId.contains("Exposure") || elementId.contains("Show") || elementId.contains("Bubble"))) {
-                        eventType = "exposure";
+                    // 对齐 tracker-sdk 规范：业务手动精准埋点统一使用 custom 事件类型，令两端一致触发后端双写 (SDK_DESIGN 2.2)
+                    String eventType = "custom";
+                    String targetId = !TextUtils.isEmpty(frontUrl) ? frontUrl : elementId;
+                    JSONObject event = createBaseEvent(eventType, targetId);
+                    event.put("frontUrl", targetId);
+                    event.put("elementId", targetId);
+                    if (postParam != null) {
+                        event.put("postParam", postParam);
+                        event.put("extraKey", "param");
+                        event.put("extraValue", postParam);
+                        try {
+                            String baseExtraStr = event.optString("extraData");
+                            JSONObject extra = TextUtils.isEmpty(baseExtraStr) ? new JSONObject() : new JSONObject(baseExtraStr);
+                            extra.put("param", postParam);
+                            extra.put("getParam", postParam);
+                            extra.put("postParam", postParam);
+                            event.put("extraData", extra.toString());
+                        } catch (Exception ignored) {}
                     }
-                    JSONObject event = createBaseEvent(eventType, "legacy_dadian");
-                    event.put("frontUrl", frontUrl);
-                    event.put("elementId", elementId);
-                    if (postParam != null) event.put("postParam", postParam);
                     enqueueEvent(event);
                     flushAsync();
                 } catch (Exception e) {
@@ -523,8 +576,13 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                     if (!TextUtils.isEmpty(error)) {
                         extra.put("error", error.length() > 512 ? error.substring(0, 512) : error);
                     }
+                    String reqId = extractRequestIdSafe(reqParam, respData);
+                    if (!TextUtils.isEmpty(reqId)) {
+                        extra.put("requestId", reqId);
+                    }
                     if (!TextUtils.isEmpty(phone)) extra.put("phone", phone);
                     if (!TextUtils.isEmpty(storeName)) extra.put("storeName", storeName);
+                    if (!TextUtils.isEmpty(userName)) extra.put("userName", userName);
                     if (!TextUtils.isEmpty(userId)) extra.put("userId", userId);
                     if (pflag != -1) extra.put("pflag", pflag);
                     if (!TextUtils.isEmpty(platformName)) extra.put("platformName", platformName);
@@ -562,6 +620,38 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         }
     }
 
+    private static String extractRequestIdSafe(String reqParam, String respData) {
+        try {
+            if (!TextUtils.isEmpty(reqParam) && reqParam.contains("requestId")) {
+                int idx = reqParam.indexOf("\"requestId\"");
+                if (idx >= 0) {
+                    int colon = reqParam.indexOf(':', idx);
+                    if (colon >= 0) {
+                        int q1 = reqParam.indexOf('"', colon);
+                        if (q1 >= 0) {
+                            int q2 = reqParam.indexOf('"', q1 + 1);
+                            if (q2 > q1) return reqParam.substring(q1 + 1, q2);
+                        }
+                    }
+                }
+            }
+            if (!TextUtils.isEmpty(respData) && respData.contains("requestId")) {
+                int idx = respData.indexOf("\"requestId\"");
+                if (idx >= 0) {
+                    int colon = respData.indexOf(':', idx);
+                    if (colon >= 0) {
+                        int q1 = respData.indexOf('"', colon);
+                        if (q1 >= 0) {
+                            int q2 = respData.indexOf('"', q1 + 1);
+                            if (q2 > q1) return respData.substring(q1 + 1, q2);
+                        }
+                    }
+                }
+            }
+        } catch (Exception ignored) {}
+        return "";
+    }
+
     public String getNetworkType() {
         try {
             if (application == null) return "";
@@ -620,6 +710,7 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         JSONObject extra = new JSONObject();
         if (!TextUtils.isEmpty(phone)) extra.put("phone", phone);
         if (!TextUtils.isEmpty(storeName)) extra.put("storeName", storeName);
+        if (!TextUtils.isEmpty(userName)) extra.put("userName", userName);
         if (!TextUtils.isEmpty(userId)) extra.put("userId", userId);
         if (pflag != -1) extra.put("pflag", pflag);
         if (!TextUtils.isEmpty(platformName)) extra.put("platformName", platformName);
@@ -758,6 +849,7 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             body.put("userId", batchUserId);
             body.put("phone", phone != null ? phone : "");
             body.put("storeName", storeName != null ? storeName : "");
+            body.put("userName", userName != null ? userName : "");
             body.put("platform", "android");
             if (pflag != -1) body.put("pflag", pflag);
             if (!TextUtils.isEmpty(platformName)) body.put("platformName", platformName);
@@ -996,7 +1088,7 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         if (TextUtils.isEmpty(elementId)) return "";
         String lower = elementId.toLowerCase();
         if (lower.equals("ll_page_one")) return "首页";
-        if (lower.equals("ll_page_two")) return "银友圈";
+        if (lower.equals("ll_page_two")) return "发光者";
         if (lower.equals("ll_page_three")) return "小视频";
         if (lower.equals("ll_page_four")) return "商城";
         if (lower.equals("ll_page_five")) return "我的";
@@ -1066,6 +1158,12 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                         event.put("elementText", elementText.length() > 30 ? elementText.substring(0, 30) : elementText);
                     }
                     JSONObject extra = new JSONObject();
+                    String baseExtraStr = event.optString("extraData");
+                    if (!TextUtils.isEmpty(baseExtraStr)) {
+                        try {
+                            extra = new JSONObject(baseExtraStr);
+                        } catch (Exception ignored) {}
+                    }
                     extra.put("viewType", target.getClass().getName());
                     extra.put("pageX", rawX);
                     extra.put("pageY", rawY);