Release 2.3.7

Author: dengshiwei

RNSensorsAnalyticsModule.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "RNSensorsAnalyticsModule"
-  s.version      = "2.3.6"
+  s.version      = "2.3.7"
   s.summary      = "The official React Native SDK of Sensors Analytics."
   s.description  = <<-DESC
                   神策分析 RN 组件

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.6";
+    public static final String VERSION = "2.3.7";
 
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {

android/src/main/java/com/sensorsdata/analytics/utils/RNUtils.java

@@ -41,15 +41,17 @@ public static JSONObject convertToJSONObject(ReadableMap properties) {
         ReadableNativeMap nativeMap = null;
         try {
             nativeMap = (ReadableNativeMap) properties;
-            json = new JSONObject(properties.toString()).getJSONObject("NativeMap");
+            json = new JSONObject(properties.toString());
+            if (json.has("NativeMap")) {
+                json = json.optJSONObject("NativeMap");
+            } else {
+                String superName = nativeMap.getClass().getSuperclass().getSimpleName();
+                if (json.has(superName)) {
+                    json = json.optJSONObject(superName);
+                }
+            }
         } catch (Exception e) {
             SALog.printStackTrace(e);
-            String superName = nativeMap.getClass().getSuperclass().getSimpleName();
-            try {
-                json = new JSONObject(properties.toString()).getJSONObject(superName);
-            } catch (Exception e1) {
-                SALog.printStackTrace(e1);
-            }
         }
         return json;
     }
@@ -97,6 +99,14 @@ public static HashMap<String, Object> convertToHashMap(ReadableMap properties) {
      */
     public static void mergeJSONObject(final JSONObject source, JSONObject dest) {
         try {
+            if (source == null) {
+                return;
+            }
+
+            if (dest == null) {
+                dest = new JSONObject();
+            }
+
             Iterator<String> sourceIterator = source.keys();
             while (sourceIterator.hasNext()) {
                 String key = sourceIterator.next();

ios/RNSensorsAnalyticsModule.m

@@ -32,7 +32,7 @@
 #import "SAReactNativeManager.h"
 #import "SAReactNativeEventProperty.h"
 
-NSString *const kSAReactNativePluginVersion = @"react_native:2.3.6";
+NSString *const kSAReactNativePluginVersion = @"react_native:2.3.7";
 
 @implementation RNSensorsAnalyticsModule
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sensorsdata-analytics-react-native",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "private": false,
   "description": "神策分析 RN 组件",
   "main": "index.js",