Release 3.0.2

yaoyue · yaoyue · commit 95232b14a546 · 2025-05-15T16:39:58.000+08:00
diff --git a/RNSensorsAnalyticsModule.podspec b/RNSensorsAnalyticsModule.podspec
@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "RNSensorsAnalyticsModule"
-  s.version      = "3.0.0"
+  s.version      = "3.0.2"
   s.summary      = "The official React Native SDK of Sensors Analytics."
   s.description  = <<-DESC
                   神策分析 RN 组件
diff --git a/android/src/main/java/com/sensorsdata/analytics/RNAgent.java b/android/src/main/java/com/sensorsdata/analytics/RNAgent.java
@@ -1,18 +1,6 @@
 /*
  * Created by chenru on 2019/08/27.
- * Copyright 2015－2021 Sensors Data Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2015－2025 Sensors Data Inc.
  */
 
 package com.sensorsdata.analytics;
@@ -36,24 +24,29 @@
 import org.json.JSONObject;
 
 import java.lang.reflect.Field;
+import java.lang.ref.WeakReference;
 import java.util.WeakHashMap;
 
 public class RNAgent {
-    private static final WeakHashMap jsTouchDispatcherViewGroupWeakHashMap = new WeakHashMap();
+    private static final WeakHashMap<JSTouchDispatcher, WeakReference<ViewGroup>> jsTouchDispatcherViewGroupWeakHashMap = new WeakHashMap<>();
     private static SparseArray<SAViewProperties> viewPropertiesArray = new SparseArray();
     private static JSONObject mDynamicSuperProperties;
 
     public static void handleTouchEvent(
             JSTouchDispatcher jsTouchDispatcher, MotionEvent event, EventDispatcher eventDispatcher) {
         try {
             if (event.getAction() == MotionEvent.ACTION_DOWN) { // ActionDown
-                ViewGroup viewGroup = (ViewGroup) jsTouchDispatcherViewGroupWeakHashMap.get(jsTouchDispatcher);
+                WeakReference<ViewGroup> weakViewGroupRef = jsTouchDispatcherViewGroupWeakHashMap.get(jsTouchDispatcher);
+                ViewGroup viewGroup = weakViewGroupRef != null ? weakViewGroupRef.get() : null;
                 if (viewGroup == null) {
                     try {
                         Field viewGroupField = jsTouchDispatcher.getClass().getDeclaredField("mRootViewGroup");
                         viewGroupField.setAccessible(true);
                         viewGroup = (ViewGroup) viewGroupField.get(jsTouchDispatcher);
-                        jsTouchDispatcherViewGroupWeakHashMap.put(jsTouchDispatcher, viewGroup);
+                        // 解决内存泄漏：存入 WeakReference
+                        if (viewGroup != null) {
+                            jsTouchDispatcherViewGroupWeakHashMap.put(jsTouchDispatcher, new WeakReference<>(viewGroup));
+                        }
                     } catch (Exception e) {
                         SALog.printStackTrace(e);
                     }
diff --git a/android/src/main/java/com/sensorsdata/analytics/RNSensorsAnalyticsModule.java b/android/src/main/java/com/sensorsdata/analytics/RNSensorsAnalyticsModule.java
@@ -1,18 +1,6 @@
 /*
  * Created by chenru on 2019/08/27.
- * Copyright 2015－2021 Sensors Data Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2015－2025 Sensors Data Inc.
  */
 
 package com.sensorsdata.analytics;
diff --git a/android/src/main/java/com/sensorsdata/analytics/RNSensorsAnalyticsPackage.java b/android/src/main/java/com/sensorsdata/analytics/RNSensorsAnalyticsPackage.java
@@ -1,18 +1,6 @@
 /*
  * Created by yang on 2017/4/6.
- * Copyright 2015－2021 Sensors Data Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2015－2025 Sensors Data Inc.
  */
 
 package com.sensorsdata.analytics;
@@ -28,7 +16,7 @@
 import java.util.List;
 
 public class RNSensorsAnalyticsPackage implements ReactPackage {
-    public static final String VERSION = "3.0.0";
+    public static final String VERSION = "3.0.2";
 
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
diff --git a/android/src/main/java/com/sensorsdata/analytics/RNSensorsDataModule.java b/android/src/main/java/com/sensorsdata/analytics/RNSensorsDataModule.java
@@ -1,18 +1,6 @@
 /*
  * Created by yang on 2017/4/5
- * Copyright 2015－2021 Sensors Data Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2015－2025 Sensors Data Inc.
  */
 
 package com.sensorsdata.analytics;
diff --git a/android/src/main/java/com/sensorsdata/analytics/data/SAViewProperties.java b/android/src/main/java/com/sensorsdata/analytics/data/SAViewProperties.java
@@ -1,18 +1,6 @@
 /*
  * Created by chenru on 2020/04/22.
- * Copyright 2015－2021 Sensors Data Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2015－2025 Sensors Data Inc.
  */
 
 package com.sensorsdata.analytics.data;
diff --git a/android/src/main/java/com/sensorsdata/analytics/property/LibMethodInterceptor.java b/android/src/main/java/com/sensorsdata/analytics/property/LibMethodInterceptor.java
@@ -1,18 +1,6 @@
 /*
  * Created by chenru on 2021/01/05.
- * Copyright 2015－2021 Sensors Data Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2015－2025 Sensors Data Inc.
  */
 
 package com.sensorsdata.analytics.property;
diff --git a/android/src/main/java/com/sensorsdata/analytics/property/PluginVersionInterceptor.java b/android/src/main/java/com/sensorsdata/analytics/property/PluginVersionInterceptor.java
@@ -1,18 +1,6 @@
 /*
  * Created by chenru on 2020/12/27.
- * Copyright 2015－2021 Sensors Data Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2015－2025 Sensors Data Inc.
  */
 
 package com.sensorsdata.analytics.property;
@@ -44,4 +32,4 @@ public JSONObject proceed(JSONObject properties, boolean isAuto){
         }
         return properties;
     }
-}
+}
diff --git a/android/src/main/java/com/sensorsdata/analytics/property/RNPropertyManager.java b/android/src/main/java/com/sensorsdata/analytics/property/RNPropertyManager.java
@@ -1,30 +1,18 @@
 /*
  * Created by chenru on 2020/12/27.
- * Copyright 2015－2021 Sensors Data Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2015－2025 Sensors Data Inc.
  */
 
 package com.sensorsdata.analytics.property;
 
 import org.json.JSONObject;
 
-import java.util.ArrayList;
+import java.util.Vector;
 import java.util.List;
 
 public class RNPropertyManager {
 
-    public static List<Interceptor> interceptors = new ArrayList<>();
+    public static Vector<Interceptor> interceptors = new Vector<>();
 
     public static void addInterceptor(Interceptor interceptor){
         interceptors.add(interceptor);
@@ -44,4 +32,4 @@ public static JSONObject mergeProperty(JSONObject properties, boolean isAuto){
     interface Interceptor{
         JSONObject proceed(JSONObject properties, boolean isAuto);
     }
-}
+}
diff --git a/android/src/main/java/com/sensorsdata/analytics/utils/RNUtils.java b/android/src/main/java/com/sensorsdata/analytics/utils/RNUtils.java
@@ -1,18 +1,6 @@
 /*
  * Created by chenru on 2019/08/27.
- * Copyright 2015－2021 Sensors Data Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2015－2025 Sensors Data Inc.
  */
 
 package com.sensorsdata.analytics.utils;
diff --git a/android/src/main/java/com/sensorsdata/analytics/utils/RNViewUtils.java b/android/src/main/java/com/sensorsdata/analytics/utils/RNViewUtils.java
@@ -1,18 +1,6 @@
 /*
  * Created by chenru on 2019/08/27.
- * Copyright 2015－2021 Sensors Data Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2015－2025 Sensors Data Inc.
  */
 
 package com.sensorsdata.analytics.utils;
diff --git a/android/src/main/java/com/sensorsdata/analytics/utils/VersionUtils.java b/android/src/main/java/com/sensorsdata/analytics/utils/VersionUtils.java
@@ -1,18 +1,6 @@
 /*
  * Created by chenru on 2022/02/17.
- * Copyright 2015－2022 Sensors Data Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2015－2025 Sensors Data Inc.
  */
 
 package com.sensorsdata.analytics.utils;
diff --git a/harmony/cpp/sensorsdata/RNOHSensorsAnalyticsPackage.h b/harmony/cpp/sensorsdata/RNOHSensorsAnalyticsPackage.h
@@ -15,7 +15,7 @@
 
 namespace rnoh {
 
-class RNOHGeneratedPackageTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
+class RNOHSensorsAnalyticsPackageTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
   public:
     SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
         if (name == "NativeSensorsAnalyticsModule") {
@@ -25,7 +25,7 @@ class RNOHGeneratedPackageTurboModuleFactoryDelegate : public TurboModuleFactory
     };
 };
 
-class GeneratedEventEmitRequestHandler : public EventEmitRequestHandler {
+class SensorsAnalyticsEventEmitRequestHandler : public EventEmitRequestHandler {
   public:
     void handleEvent(Context const &ctx) override {
         auto eventEmitter = ctx.shadowViewRegistry->getEventEmitter<facebook::react::EventEmitter>(ctx.tag);
@@ -41,12 +41,12 @@ class GeneratedEventEmitRequestHandler : public EventEmitRequestHandler {
     }
 };
 
-class RNOHGeneratedPackage : public Package {
+class RNOHSensorsAnalyticsPackage : public Package {
   public:
-    RNOHGeneratedPackage(Package::Context ctx) : Package(ctx){};
+    RNOHSensorsAnalyticsPackage(Package::Context ctx) : Package(ctx){};
 
     std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override {
-        return std::make_unique<RNOHGeneratedPackageTurboModuleFactoryDelegate>();
+        return std::make_unique<RNOHSensorsAnalyticsPackageTurboModuleFactoryDelegate>();
     }
 
     std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override {
@@ -61,7 +61,7 @@ class RNOHGeneratedPackage : public Package {
 
     EventEmitRequestHandlers createEventEmitRequestHandlers() override {
         return {
-            std::make_shared<GeneratedEventEmitRequestHandler>(),
+            std::make_shared<SensorsAnalyticsEventEmitRequestHandler>(),
         };
     }
 };
diff --git a/harmony/ets/sensorsdata/RNSensorsAnalyticsModule.ts b/harmony/ets/sensorsdata/RNSensorsAnalyticsModule.ts
@@ -27,15 +27,17 @@ export class RNSensorsAnalyticsModule extends TurboModule implements SA.NativeSe
   }
 
   login(loginId: string): void {
-    sensors.login(loginId);
+    const newProperties = this.moduleManager.buildLibPluginVersion(null);
+    sensors.login(loginId, newProperties);
   }
 
   logout(): void {
     sensors.logout();
   }
 
   track(event: string, properties: SA.NativeSensorsAnalyticsModule.SAPropertiesObjectType): void {
-    sensors.track(event, properties);
+    const newProperties = this.moduleManager.buildLibPluginVersion(properties);
+    sensors.track(event, newProperties);
   }
 
   trackTimerStart(event: string): void {
@@ -46,7 +48,8 @@ export class RNSensorsAnalyticsModule extends TurboModule implements SA.NativeSe
   trackTimerEnd(event: string, properties: SA.NativeSensorsAnalyticsModule.SAPropertiesObjectType): void {
     const timer = this.moduleManager.fetchTrackTimer(event);
     if (timer) {
-      sensors.trackTimerEnd(timer, properties);
+      const newProperties = this.moduleManager.buildLibPluginVersion(properties);
+      sensors.trackTimerEnd(timer, newProperties);
       this.moduleManager.cleanTrackTimer(event);
     }
   }
@@ -67,9 +70,10 @@ export class RNSensorsAnalyticsModule extends TurboModule implements SA.NativeSe
   }
 
   trackViewScreen(url: string, properties: SA.NativeSensorsAnalyticsModule.SAPropertiesObjectType): void {
+    const newProperties = this.moduleManager.buildLibPluginVersion(properties);
     sensors.trackViewScreen({
       $screen_name: url,
-    }, properties);
+    }, newProperties);
   }
 
   profileSet(profile: SA.NativeSensorsAnalyticsModule.SAPropertiesObjectType): void {
@@ -149,7 +153,8 @@ export class RNSensorsAnalyticsModule extends TurboModule implements SA.NativeSe
   }
 
   trackAppInstall(properties: SA.NativeSensorsAnalyticsModule.SAPropertiesObjectType): void {
-    sensors.trackAppInstall(properties);
+    const newProperties = this.moduleManager.buildLibPluginVersion(properties);
+    sensors.trackAppInstall(newProperties);
   }
 
   setDynamicSuperProperties(properties: SA.NativeSensorsAnalyticsModule.SAPropertiesObjectType): void {
diff --git a/harmony/ets/sensorsdata/SAReactNativeManager.ts b/harmony/ets/sensorsdata/SAReactNativeManager.ts
diff --git a/ios/RNSensorsAnalyticsModule.m b/ios/RNSensorsAnalyticsModule.m
diff --git a/package.json b/package.json
