@rk911/tracker-sdk 1.7.0 → 1.7.1

package/native/android/AndroidTracker.java

@@ -63,7 +63,15 @@ 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;
+        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 = deviceId;
         this.userId = userId;
         this.phone = phone;
@@ -80,7 +88,7 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
 
         // 启动定时 Flush 任务
         scheduleTimerFlush();
-        Log.d(TAG, "AndroidTracker initialized with sessionId: " + sessionId);
+        Log.d(TAG, "AndroidTracker initialized with sessionId: " + sessionId + ", serverUrl: " + this.serverUrl);
     }
 
     public void updateUser(String userId, String phone, String storeName) {
@@ -143,6 +151,13 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         event.put("sequence", sequence);
         event.put("pageRoute", currentPageRoute);
         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;
     }
 
@@ -189,9 +204,9 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             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();
@@ -204,6 +219,8 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             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);

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.1",
   "description": "人康多端埋点 SDK — 跨端自动化采集 + 手动埋点双写兼容",
   "main": "index.js",
   "module": "index.js",