Release 2.3.4

weiqiangliu · weiqiangliu · commit 5ce4a2eb561d · 2022-10-25T10:27:17.000+08:00
diff --git a/RNSensorsAnalyticsModule.podspec b/RNSensorsAnalyticsModule.podspec
@@ -1,19 +1,19 @@
 
 Pod::Spec.new do |s|
   s.name         = "RNSensorsAnalyticsModule"
-  s.version      = "2.3.3"
+  s.version      = "2.3.4"
   s.summary      = "The official React Native SDK of Sensors Analytics."
   s.description  = <<-DESC
                   神策分析 RN 组件
                    DESC
   s.homepage     = "http://www.sensorsdata.cn"
   s.license      = { :type => "Apache License, Version 2.0" }
-  s.author       = { "Yuanyang Peng" => "pengyuanyang@sensorsdata.cn" }
-  s.platform     = :ios, "7.0"
+  s.author       = { "YuGuo Chen" => "chenyuguo@sensorsdata.cn" }
+  s.platform     = :ios, "8.0"
   s.source       = { :git => "https://github.com/sensorsdata/react-native-sensors-analytics.git", :tag => "v#{s.version}" }
   s.source_files = "ios/*.{h,m}"
   s.requires_arc = true
   s.dependency   "React"
-  s.dependency   "SensorsAnalyticsSDK", ">= 4.4.1"
+  s.dependency   "SensorsAnalyticsSDK", ">= 4.4.6"
 
 end
diff --git a/android/build.gradle b/android/build.gradle
@@ -40,5 +40,5 @@ dependencies {
     compileOnly 'com.facebook.react:react-native:+'
 
     //添加 Sensors Analytics SDK 依赖
-    compileOnly 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:6.4.3'
+    compileOnly 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:6.5.1'
 }
diff --git a/android/src/main/java/com/sensorsdata/analytics/RNAgent.java b/android/src/main/java/com/sensorsdata/analytics/RNAgent.java
@@ -184,11 +184,11 @@ static void ignoreView() {
         }
     }
 
-    public static JSONObject getDynamicSuperProperties(){
+    public static JSONObject getDynamicSuperProperties() {
         return mDynamicSuperProperties;
     }
 
-    static void setDynamicSuperProperties(JSONObject dynamicSuperProperties){
+    static void setDynamicSuperProperties(JSONObject dynamicSuperProperties) {
         mDynamicSuperProperties = dynamicSuperProperties;
     }
 }
diff --git a/android/src/main/java/com/sensorsdata/analytics/RNSensorsAnalyticsModule.java b/android/src/main/java/com/sensorsdata/analytics/RNSensorsAnalyticsModule.java
@@ -33,7 +33,9 @@
 import com.sensorsdata.analytics.android.sdk.SALog;
 import com.sensorsdata.analytics.android.sdk.SensorsDataAPI;
 import com.sensorsdata.analytics.property.RNPropertyManager;
+import com.sensorsdata.analytics.property.RNGlobalPropertyPlugin;
 import com.sensorsdata.analytics.utils.RNUtils;
+import com.sensorsdata.analytics.utils.VersionUtils;
 
 import org.json.JSONObject;
 
@@ -1037,6 +1039,10 @@ public void init(ReadableMap config) {
                         .setAutoTrackEventType(configJson.optInt("auto_track", 0))
                         .setFlushBulkSize(configJson.optInt("flush_bulksize", 100))
                         .setFlushInterval(configJson.optInt("flush_interval", 15000));
+                if (VersionUtils.checkSAVersion("6.4.3")) {
+                    final JSONObject globalProperties = configJson.optJSONObject("global_properties");
+                    saConfigOptions.registerPropertyPlugin(new RNGlobalPropertyPlugin(globalProperties));
+                }
                 JSONObject androidConfig = configJson.optJSONObject("android");
                 boolean javascriptBridge = configJson.optBoolean("javascript_bridge", false);
                 boolean isSupportJellybean = false;
@@ -1050,6 +1056,7 @@ public void init(ReadableMap config) {
                 if (javascriptBridge) {
                     saConfigOptions.enableJavaScriptBridge(isSupportJellybean);
                 }
+
                 JSONObject visualizedConfig = configJson.optJSONObject("visualized");
                 if (visualizedConfig != null && visualizedConfig.length() > 0) {
                     saConfigOptions.enableVisualizedAutoTrack(visualizedConfig.optBoolean("auto_track", false));
diff --git a/android/src/main/java/com/sensorsdata/analytics/RNSensorsAnalyticsPackage.java b/android/src/main/java/com/sensorsdata/analytics/RNSensorsAnalyticsPackage.java
@@ -28,7 +28,7 @@
 import java.util.List;
 
 public class RNSensorsAnalyticsPackage implements ReactPackage {
-    public static final String VERSION = "2.3.3";
+    public static final String VERSION = "2.3.4";
 
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
diff --git a/android/src/main/java/com/sensorsdata/analytics/property/RNGlobalPropertyPlugin.java b/android/src/main/java/com/sensorsdata/analytics/property/RNGlobalPropertyPlugin.java
@@ -0,0 +1,33 @@
+package com.sensorsdata.analytics.property;
+
+import com.sensorsdata.analytics.android.sdk.plugin.property.SAPropertyPlugin;
+import com.sensorsdata.analytics.android.sdk.plugin.property.SAPropertyPluginPriority;
+import com.sensorsdata.analytics.android.sdk.plugin.property.beans.SAPropertiesFetcher;
+import com.sensorsdata.analytics.android.sdk.plugin.property.beans.SAPropertyFilter;
+import com.sensorsdata.analytics.utils.RNUtils;
+
+import org.json.JSONObject;
+
+public class RNGlobalPropertyPlugin extends SAPropertyPlugin {
+    private JSONObject mGlobalProperties;
+
+    public RNGlobalPropertyPlugin(JSONObject golbalProperties){
+        mGlobalProperties = golbalProperties;
+    }
+
+    @Override
+    public boolean isMatchedWithFilter(SAPropertyFilter filter) {
+        return filter.getType().isTrack();
+    }
+
+    @Override
+    public void properties(SAPropertiesFetcher fetcher) {
+        RNUtils.mergeJSONObject(mGlobalProperties, fetcher.getProperties());
+    }
+
+    @Override
+    public SAPropertyPluginPriority priority() {
+        return SAPropertyPluginPriority.LOW;
+    }
+
+}
diff --git a/android/src/main/java/com/sensorsdata/analytics/utils/VersionUtils.java b/android/src/main/java/com/sensorsdata/analytics/utils/VersionUtils.java
@@ -21,6 +21,7 @@
 
 import com.sensorsdata.analytics.android.sdk.SALog;
 import com.sensorsdata.analytics.android.sdk.SensorsDataAPI;
+import com.sensorsdata.analytics.android.sdk.SensorsDataAPIEmptyImplementation;
 
 import java.lang.reflect.Field;
 
@@ -30,7 +31,12 @@ public class VersionUtils {
     public static boolean checkSAVersion(final String requiredVersion) {
         try {
             SensorsDataAPI sensorsDataAPI = SensorsDataAPI.sharedInstance();
-            Field field = sensorsDataAPI.getClass().getDeclaredField("VERSION");
+            Field field;
+            if (sensorsDataAPI instanceof SensorsDataAPIEmptyImplementation) {
+                field = sensorsDataAPI.getClass().getSuperclass().getDeclaredField("VERSION");
+            } else {
+                field = sensorsDataAPI.getClass().getDeclaredField("VERSION");
+            }
             field.setAccessible(true);
             String version = (String) field.get(sensorsDataAPI);
             String compareVersion = version;
diff --git a/index.d.ts b/index.d.ts
@@ -8,6 +8,7 @@ declare type Config = {
   ios: {//iOS 端特有配置
     max_cache_size?: number //最大缓存条数，默认 10000
   },
+  global_properties?:PropertiesObjectType,// 全局属性
   auto_track: SAAutoTrackType,// 全埋点开关，默认不开启
   javascript_bridge: boolean,//H5 打通开关，默认 false
   flush_interval: number,//数据上报间隔，默认 15*1000 毫秒
diff --git a/ios/RNSensorsAnalyticsModule.m b/ios/RNSensorsAnalyticsModule.m
@@ -32,7 +32,7 @@
 #import "SAReactNativeManager.h"
 #import "SAReactNativeEventProperty.h"
 
-NSString *const kSAReactNativePluginVersion = @"react_native:2.3.3";
+NSString *const kSAReactNativePluginVersion = @"react_native:2.3.4";
 
 @implementation RNSensorsAnalyticsModule
 
diff --git a/ios/RNSensorsAnalyticsModule.xcodeproj/project.pbxproj b/ios/RNSensorsAnalyticsModule.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		452E43642758986E0074530B /* SAReactNativeSwizzler.m in Sources */ = {isa = PBXBuildFile; fileRef = 452E43612758986E0074530B /* SAReactNativeSwizzler.m */; };
 		4532EFF7275E319600D57554 /* SAReactNativeRootViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4532EFF6275E319600D57554 /* SAReactNativeRootViewManager.m */; };
 		4535DFF727B24DB700456830 /* SAReactNativeDynamicPropertyPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4535DFF627B24DB700456830 /* SAReactNativeDynamicPropertyPlugin.m */; };
+		4D618ED828F27706002F3CCA /* SAReactNativeGlobalPropertyPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D618ED728F27706002F3CCA /* SAReactNativeGlobalPropertyPlugin.m */; };
 		A18E9FB421A6AEDD00A66E41 /* RNSensorsAnalyticsModule.m in Sources */ = {isa = PBXBuildFile; fileRef = A18E9FB221A6AEDD00A66E41 /* RNSensorsAnalyticsModule.m */; };
 		FC39004C244715AE00F486A7 /* SAReactNativeManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FC39004B244715AE00F486A7 /* SAReactNativeManager.m */; };
 		FC6EF7A9259DA6A40099EEB5 /* SAReactNativeEventProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = FC6EF7A8259DA6A40099EEB5 /* SAReactNativeEventProperty.m */; };
@@ -36,6 +37,8 @@
 		4532EFF6275E319600D57554 /* SAReactNativeRootViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAReactNativeRootViewManager.m; sourceTree = "<group>"; };
 		4535DFF527B24DB700456830 /* SAReactNativeDynamicPropertyPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAReactNativeDynamicPropertyPlugin.h; sourceTree = "<group>"; };
 		4535DFF627B24DB700456830 /* SAReactNativeDynamicPropertyPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAReactNativeDynamicPropertyPlugin.m; sourceTree = "<group>"; };
+		4D618ED628F27706002F3CCA /* SAReactNativeGlobalPropertyPlugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SAReactNativeGlobalPropertyPlugin.h; sourceTree = "<group>"; };
+		4D618ED728F27706002F3CCA /* SAReactNativeGlobalPropertyPlugin.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SAReactNativeGlobalPropertyPlugin.m; sourceTree = "<group>"; };
 		A18E9FA621A6AB4300A66E41 /* libRNSensorsAnalyticsModule.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNSensorsAnalyticsModule.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		A18E9FB221A6AEDD00A66E41 /* RNSensorsAnalyticsModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNSensorsAnalyticsModule.m; sourceTree = "<group>"; };
 		A18E9FB321A6AEDD00A66E41 /* RNSensorsAnalyticsModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNSensorsAnalyticsModule.h; sourceTree = "<group>"; };
@@ -73,6 +76,8 @@
 				A18E9FB221A6AEDD00A66E41 /* RNSensorsAnalyticsModule.m */,
 				FC9EE66F243731C000C45D16 /* RNSensorsDataModule.h */,
 				FC9EE670243731C000C45D16 /* RNSensorsDataModule.m */,
+				4D618ED628F27706002F3CCA /* SAReactNativeGlobalPropertyPlugin.h */,
+				4D618ED728F27706002F3CCA /* SAReactNativeGlobalPropertyPlugin.m */,
 				FC39004A244715AE00F486A7 /* SAReactNativeManager.h */,
 				FC39004B244715AE00F486A7 /* SAReactNativeManager.m */,
 				FC6EF7A7259DA6A40099EEB5 /* SAReactNativeEventProperty.h */,
@@ -152,6 +157,7 @@
 				4535DFF727B24DB700456830 /* SAReactNativeDynamicPropertyPlugin.m in Sources */,
 				FC6EF7A9259DA6A40099EEB5 /* SAReactNativeEventProperty.m in Sources */,
 				FCD3CF2B25466B7800758260 /* SAReactNativeCategory.m in Sources */,
+				4D618ED828F27706002F3CCA /* SAReactNativeGlobalPropertyPlugin.m in Sources */,
 				452E43642758986E0074530B /* SAReactNativeSwizzler.m in Sources */,
 				FC9EE671243731C000C45D16 /* RNSensorsDataModule.m in Sources */,
 				4532EFF7275E319600D57554 /* SAReactNativeRootViewManager.m in Sources */,
diff --git a/ios/SAReactNativeGlobalPropertyPlugin.h b/ios/SAReactNativeGlobalPropertyPlugin.h
@@ -0,0 +1,43 @@
+//
+//  SAReactNativeGlobalPropertyPlugin.h
+//  RNSensorsAnalyticsModule
+//
+//  Created by  储强盛 on 2022/10/9.
+//  Copyright © 2015-2022 Sensors Data Co., Ltd. All rights reserved.
+//
+//  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.
+//
+
+#import <Foundation/Foundation.h>
+#if __has_include(<SensorsAnalyticsSDK/SAPropertyPlugin.h>)
+#import <SensorsAnalyticsSDK/SAPropertyPlugin.h>
+#else
+#import "SAPropertyPlugin.h"
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SAReactNativeGlobalPropertyPlugin : SAPropertyPlugin
+
+/// 全局属性插件
+///
+/// 全局属性，所有事件都会包含
+///
+/// @param properties 自定义属性
+- (instancetype)initWithProperties:(NSDictionary *)properties NS_DESIGNATED_INITIALIZER;
+
+- (instancetype)init NS_UNAVAILABLE;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/ios/SAReactNativeGlobalPropertyPlugin.m b/ios/SAReactNativeGlobalPropertyPlugin.m
@@ -0,0 +1,54 @@
+//
+//  SAReactNativeGlobalPropertyPlugin.m
+//  RNSensorsAnalyticsModule
+//
+//  Created by  储强盛 on 2022/10/9.
+//  Copyright © 2015-2022 Sensors Data Co., Ltd. All rights reserved.
+//
+//  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.
+//
+
+#if ! __has_feature(objc_arc)
+#error This file must be compiled with ARC. Either turn on ARC for the project or use -fobjc-arc flag on this file.
+#endif
+
+#import "SAReactNativeGlobalPropertyPlugin.h"
+
+@interface SAReactNativeGlobalPropertyPlugin()
+@property (nonatomic, copy) NSDictionary<NSString *, id> *globleProperties;
+@end
+
+@implementation SAReactNativeGlobalPropertyPlugin
+
+- (instancetype)initWithProperties:(NSDictionary *)properties {
+    self = [super init];
+    if (self) {
+        self.globleProperties = properties;
+    }
+    return self;
+}
+
+- (BOOL)isMatchedWithFilter:(id<SAPropertyPluginEventFilter>)filter {
+    // 支持 track、Signup、Bind、Unbind
+    return filter.type & SAEventTypeDefault;
+}
+
+- (SAPropertyPluginPriority)priority {
+    return SAPropertyPluginPriorityLow;
+}
+
+- (NSDictionary<NSString *,id> *)properties {
+    return [self.globleProperties copy];
+}
+
+@end
diff --git a/ios/SAReactNativeManager.m b/ios/SAReactNativeManager.m
@@ -28,6 +28,7 @@
 #import "SAReactNativeRootViewManager.h"
 #import <React/RCTUIManager.h>
 #import "SAReactNativeDynamicPropertyPlugin.h"
+#import "SAReactNativeGlobalPropertyPlugin.h"
 
 #pragma mark - Constants
 NSString *const kSAEventScreenNameProperty = @"$screen_name";
@@ -272,6 +273,14 @@ + (void)configureSDKWithSettings:(NSDictionary *)settings {
     if ([enableHeatMap isKindOfClass:[NSNumber class]]) {
         options.enableHeatMap = [enableHeatMap boolValue];
     }
+
+    // 注册全局属性插件
+    NSDictionary *properties = settings[@"global_properties"];
+    if ([properties isKindOfClass:NSDictionary.class]) {
+        SAReactNativeGlobalPropertyPlugin *propertyPlugin = [[SAReactNativeGlobalPropertyPlugin alloc] initWithProperties:properties];
+        [options registerPropertyPlugin:propertyPlugin];
+    }
+
     dispatch_async(dispatch_get_main_queue(), ^{
         [SensorsAnalyticsSDK startWithConfigOptions:options];
         [self addNativeIgnoreClasses];
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sensorsdata-analytics-react-native",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "private": false,
   "description": "神策分析 RN 组件",
   "main": "index.js",

Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,5 @@ dependencies {`
`40`	`40`	`compileOnly 'com.facebook.react:react-native:+'`
`41`	`41`
`42`	`42`	`//添加 Sensors Analytics SDK 依赖`
`43`		`- compileOnly 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:6.4.3'`
	`43`	`+ compileOnly 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:6.5.1'`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,11 +184,11 @@ static void ignoreView() {`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`
`187`		`- public static JSONObject getDynamicSuperProperties(){`
	`187`	`+ public static JSONObject getDynamicSuperProperties() {`
`188`	`188`	`return mDynamicSuperProperties;`
`189`	`189`	`}`
`190`	`190`
`191`		`- static void setDynamicSuperProperties(JSONObject dynamicSuperProperties){`
	`191`	`+ static void setDynamicSuperProperties(JSONObject dynamicSuperProperties) {`
`192`	`192`	`mDynamicSuperProperties = dynamicSuperProperties;`
`193`	`193`	`}`
`194`	`194`	`}`