Merge branch 'zw_fix_lib_plugin' into 'master'

[fix]添加在页面浏览事件中增加lib plugin 字段

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

Author: zhujg-00

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

@@ -7,8 +7,10 @@
 import com.sensorsdata.analytics.android.sdk.SALog;
 import com.sensorsdata.analytics.android.sdk.SensorsDataAPI;
 
+import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -214,6 +216,17 @@ private void getSuperProperties(Result result) {
             while (keys.hasNext()) {
                 String key = keys.next();
                 Object value = jsonObject.opt(key);
+                if (value instanceof JSONArray) {
+                    JSONArray jsonArray = (JSONArray) value;
+                    if (jsonArray.length() != 0) {
+                        ArrayList<Object> newValue = new ArrayList<>();
+                        for (int index = 0; index < jsonArray.length(); index++) {
+                            newValue.add(jsonArray.opt(index));
+                        }
+                        map.put(key, newValue);
+                        continue;
+                    }
+                }
                 map.put(key, value);
             }
             result.success(map);
@@ -323,7 +336,7 @@ private void track(List list) {
      * login
      */
     private void login(List list) {
-        SensorsDataAPI.sharedInstance().login((String) list.get(0));
+        SensorsDataAPI.sharedInstance().login((String) list.get(0), assertProperties((Map) list.get(1)));
     }
 
     /**

example/lib/main.dart

@@ -12,7 +12,7 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> {
-  String _distinctId = '';
+  String? _distinctId = '';
   var parameters;
 
   @override
@@ -44,7 +44,7 @@ class _MyAppState extends State<MyApp> {
 
   @override
   Widget build(BuildContext context) {
-    dynamic tmpResult;
+    late dynamic tmpResult;
 
     return MaterialApp(
       home: Scaffold(
@@ -66,7 +66,7 @@ class _MyAppState extends State<MyApp> {
               leading: Icon(Icons.account_circle),
               title: Text('注册成功/登录成功时调用 login '),
               onTap: () {
-                SensorsAnalyticsFlutterPlugin.login('传入你们服务端分配给用户的登录 ID');
+                SensorsAnalyticsFlutterPlugin.login("sd", {"hello":"world"});
               },
             ),
             ListTile(
@@ -85,13 +85,30 @@ class _MyAppState extends State<MyApp> {
               title: Text('追踪事件 track'),
               onTap: () {
                 print("======触发事件233");
+
+                dynamic a = "aaa";
+                print(a is String);
+                String? b= "bbb";
+                dynamic c = b;
+                print(c.runtimeType);
+                print(c is String);
+                print(c is! String);
+                print(c is String?);
+                print("======");
+                dynamic d = null;
+                print(d.runtimeType);
+                print(d is String);
+                print(d is! String);
+                print(d is String?);
+
                 // SensorsAnalyticsFlutterPlugin.track(
                 //     'ViewProduct', <String, dynamic>{
                 //   "a_time": DateTime.now(),
                 //   "product_name": "Apple 12 max pro"
                 // });
-                var map = {/*r"$lib_plugin_version":["flutter:234"],*/"address":"000000000000"};
-                 SensorsAnalyticsFlutterPlugin.track("hello", map);
+                List<String?>? list = ["flutter_plugin:12312"];
+                var map = {r"$lib_plugin_version":list, "address":"000000000000"};
+                SensorsAnalyticsFlutterPlugin.track("hello", map);
               },
             ),
             ListTile(
@@ -286,14 +303,17 @@ class _MyAppState extends State<MyApp> {
             ListTile(
               title: Text('setsuperproperties'),
               onTap: () async {
+                List<String?>? list = ["flutter_plugin:super_set"];
+                var map = {r"$lib_plugin_version":list};
                 SensorsAnalyticsFlutterPlugin.registerSuperProperties(
-                    {"age": 100});
-                print("getSuperProperties===");
+                    map);
+                print("setSuperProperties===");
               },
             ),
             ListTile(
               title: Text('getSuperProperties'),
               onTap: () async {
+                var a = 10;
                 dynamic map =
                     await SensorsAnalyticsFlutterPlugin.getSuperProperties();
                 print("getSuperProperties===$map");

example/pubspec.yaml

@@ -6,7 +6,7 @@ description: Demonstrates how to use the sensorsanalyticsflutterplugin plugin.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   flutter:

example/test/widget_test.dart

@@ -19,7 +19,7 @@ void main() {
     expect(
       find.byWidgetPredicate(
         (Widget widget) => widget is Text &&
-                           widget.data.startsWith('Running on:'),
+                           widget.data!.startsWith('Running on:'),
       ),
       findsOneWidget,
     );

lib/sensors_analytics_flutter_plugin.dart

@@ -26,7 +26,7 @@ class SensorsAnalyticsFlutterPlugin {
   /// SensorsAnalyticsFlutterPlugin.track('eventname',{'key1':'value1','key2':'value2'});
   ///
   static void track(String eventName, Map<String, dynamic>? properties) {
-    properties = properties == null ? null : {...properties};
+    properties = properties == null ? {} : {...properties};
     _convertDateTime(properties);
     _setupLibPluginVersion(properties);
     List<dynamic> params = [eventName, properties];
@@ -97,8 +97,9 @@ class SensorsAnalyticsFlutterPlugin {
   ///
   static void trackTimerEnd(
       String eventName, Map<String, dynamic>? properties) {
-    properties = properties == null ? null : {...properties};
+    properties = properties == null ? {} : {...properties};
     _convertDateTime(properties);
+    _setupLibPluginVersion(properties);
     List<dynamic> params = [eventName, properties];
     _channel.invokeMethod('trackTimerEnd', params);
   }
@@ -122,8 +123,11 @@ class SensorsAnalyticsFlutterPlugin {
   /// 使用示例：
   /// SensorsAnalyticsFlutterPlugin.login('login_id');
   ///
-  static void login(String loginId) {
-    List<String> params = [loginId];
+  static void login(String loginId, [Map<String, dynamic>? properties]) {
+    properties = properties == null ? {} : {...properties};
+    _convertDateTime(properties);
+    _setupLibPluginVersion(properties);
+    List<dynamic> params = [loginId, properties];
     _channel.invokeMethod('login', params);
   }
 
@@ -149,8 +153,9 @@ class SensorsAnalyticsFlutterPlugin {
   /// SensorsAnalyticsFlutterPlugin.trackViewScreen('urlForView',{'key1':'value1','key2':'value2'});
   ///
   static void trackViewScreen(String url, Map<String, dynamic>? properties) {
-    properties = properties == null ? null : {...properties};
+    properties = properties == null ? {} : {...properties};
     _convertDateTime(properties);
+    _setupLibPluginVersion(properties);
     List<dynamic> params = [url, properties];
     _channel.invokeMethod('trackViewScreen', params);
   }
@@ -530,7 +535,11 @@ class SensorsAnalyticsFlutterPlugin {
       if (properties == null) {
         properties = {};
       }
-      List<String>? values = properties[r"$lib_plugin_version"];
+      dynamic tmp = properties[r"$lib_plugin_version"];
+      if ((tmp is! List<String>) && (tmp is! List<String?>)) {
+        properties.remove(r"$lib_plugin_version");
+      }
+      dynamic values = properties[r"$lib_plugin_version"];
       values = values == null ? [] : [...values];
       values.add("flutter_plugin:$FLUTTER_PLUGIN_VERSION");
       properties[r"$lib_plugin_version"] = values;