Merge branch 'zw_fix_remove_future' into 'master'

[fix]修复 init 方法在异步情况下阻塞

See merge request sensors-analytics/sdk/sensors_analytics_flutter_plugin!19

Author: 刘伟强

android/src/main/java/com/sensorsdata/analytics/sensorsanalyticsflutterplugin/SensorsAnalyticsFlutterPlugin.java

@@ -174,7 +174,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
                     profileUnsetPushId(list);
                     break;
                 case "init":
-                    startWithConfig(list);
+                    startWithConfig(list, result);
                     break;
                 default:
                     result.notImplemented();
@@ -490,86 +490,90 @@ private void profileUnsetPushId(List list) {
         SensorsDataAPI.sharedInstance().profileUnsetPushId((String) list.get(0));
     }
 
-    private void startWithConfig(List list) {
-        Map map = (Map) list.get(0);
-        Object serverUrl = map.get("serverUrl");
-
-        SAConfigOptions configOptions = new SAConfigOptions(serverUrl == null ? "" : serverUrl.toString());
-        Object autotrackTypes = map.get("autotrackTypes");
-        if (autotrackTypes != null) {
-            configOptions.setAutoTrackEventType((Integer) autotrackTypes);
-        }
-
-        Object networkTypes = map.get("networkTypes");
-        if (networkTypes != null) {
-            configOptions.setNetworkTypePolicy((Integer) networkTypes);
-        }
-
-        Object flushInterval = map.get("flushInterval");
-        if (flushInterval != null) {
-            configOptions.setFlushInterval((Integer) flushInterval);
-        }
+    private void startWithConfig(List list, Result result) {
+        try {
+            Map map = (Map) list.get(0);
+            Object serverUrl = map.get("serverUrl");
 
-        Object flushBulkSize = map.get("flushBulkSize");
-        if (flushBulkSize != null) {
-            configOptions.setFlushBulkSize((Integer) flushBulkSize);
-        }
+            SAConfigOptions configOptions = new SAConfigOptions(serverUrl == null ? "" : serverUrl.toString());
+            Object autotrackTypes = map.get("autotrackTypes");
+            if (autotrackTypes != null) {
+                configOptions.setAutoTrackEventType((Integer) autotrackTypes);
+            }
 
-        Object enableLog = map.get("enableLog");
-        if (enableLog != null) {
-            configOptions.enableLog((Boolean) enableLog);
-        }
+            Object networkTypes = map.get("networkTypes");
+            if (networkTypes != null) {
+                configOptions.setNetworkTypePolicy((Integer) networkTypes);
+            }
 
-        Object encrypt = map.get("encrypt");
-        if (encrypt != null) {
-            configOptions.enableEncrypt((Boolean) encrypt);
-        }
+            Object flushInterval = map.get("flushInterval");
+            if (flushInterval != null) {
+                configOptions.setFlushInterval((Integer) flushInterval);
+            }
 
-        Object heatMap = map.get("heatMap");
-        if (heatMap != null) {
-            configOptions.enableHeatMap((Boolean) heatMap);
-        }
+            Object flushBulkSize = map.get("flushBulkSize");
+            if (flushBulkSize != null) {
+                configOptions.setFlushBulkSize((Integer) flushBulkSize);
+            }
 
-        Object androidConfig = map.get("android");
-        boolean jellybean = false;
-        if (androidConfig != null) {
-            Map androidConfigMap = (Map) androidConfig;
-            Object maxCacheSize = androidConfigMap.get("maxCacheSize");
-            if (maxCacheSize != null) {
-                configOptions.setMaxCacheSize(Long.parseLong(maxCacheSize.toString()));
+            Object enableLog = map.get("enableLog");
+            if (enableLog != null) {
+                configOptions.enableLog((Boolean) enableLog);
             }
 
-            Object jellybeanObj = androidConfigMap.get("jellybean");
-            if (jellybeanObj != null) {
-                jellybean = (boolean) jellybeanObj;
+            Object encrypt = map.get("encrypt");
+            if (encrypt != null) {
+                configOptions.enableEncrypt((Boolean) encrypt);
             }
-            Object subProcessFlush = androidConfigMap.get("subProcessFlush");
-            if (subProcessFlush != null && (boolean) subProcessFlush) {
-                configOptions.enableSubProcessFlushData();
+
+            Object heatMap = map.get("heatMap");
+            if (heatMap != null) {
+                configOptions.enableHeatMap((Boolean) heatMap);
             }
-        }
 
-        Object javaScriptBridge = map.get("javaScriptBridge");
-        if (javaScriptBridge != null && (boolean) javaScriptBridge) {
-            configOptions.enableJavaScriptBridge(jellybean);
-        }
+            Object androidConfig = map.get("android");
+            boolean jellybean = false;
+            if (androidConfig != null) {
+                Map androidConfigMap = (Map) androidConfig;
+                Object maxCacheSize = androidConfigMap.get("maxCacheSize");
+                if (maxCacheSize != null) {
+                    configOptions.setMaxCacheSize(Long.parseLong(maxCacheSize.toString()));
+                }
 
-        Object visualizedConfig = map.get("visualized");
-        if (visualizedConfig != null) {
-            Map visualizedConfigMap = (Map) visualizedConfig;
-            Object autoTrack = visualizedConfigMap.get("autoTrack");
-            if (autoTrack != null) {
-                configOptions.enableVisualizedAutoTrack((Boolean) autoTrack);
+                Object jellybeanObj = androidConfigMap.get("jellybean");
+                if (jellybeanObj != null) {
+                    jellybean = (boolean) jellybeanObj;
+                }
+                Object subProcessFlush = androidConfigMap.get("subProcessFlush");
+                if (subProcessFlush != null && (boolean) subProcessFlush) {
+                    configOptions.enableSubProcessFlushData();
+                }
             }
 
-            Object properties = visualizedConfigMap.get("properties");
-            if (properties != null) {
-                configOptions.enableVisualizedProperties((Boolean) properties);
+            Object javaScriptBridge = map.get("javaScriptBridge");
+            if (javaScriptBridge != null && (boolean) javaScriptBridge) {
+                configOptions.enableJavaScriptBridge(jellybean);
             }
-        }
 
+            Object visualizedConfig = map.get("visualized");
+            if (visualizedConfig != null) {
+                Map visualizedConfigMap = (Map) visualizedConfig;
+                Object autoTrack = visualizedConfigMap.get("autoTrack");
+                if (autoTrack != null) {
+                    configOptions.enableVisualizedAutoTrack((Boolean) autoTrack);
+                }
 
-        SensorsDataAPI.startWithConfigOptions(mActivity, configOptions);
+                Object properties = visualizedConfigMap.get("properties");
+                if (properties != null) {
+                    configOptions.enableVisualizedProperties((Boolean) properties);
+                }
+            }
+
+            SensorsDataAPI.startWithConfigOptions(mActivity, configOptions);
+        } catch (Exception e) {
+            SALog.printStackTrace(e);
+        }
+        result.success(null);
     }
 
     private JSONObject assertProperties(Map map) {