Merge branch 'zw_feature_id3' into 'master'

[feature]适配 IDM3  SDK-5921

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

Author: 刘伟强

android/build.gradle

@@ -33,6 +33,6 @@ android {
 }
 
 dependencies {
-    api 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:6.5.1'
+    api 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:6.5.4'
     //implementation 'org.json:json:20220320'
 }

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

@@ -5,7 +5,6 @@
 
 import androidx.annotation.NonNull;
 
-import com.sensorsdata.analytics.android.sdk.PropertyBuilder;
 import com.sensorsdata.analytics.android.sdk.SAConfigOptions;
 import com.sensorsdata.analytics.android.sdk.SALog;
 import com.sensorsdata.analytics.android.sdk.SensorsDataAPI;
@@ -181,6 +180,15 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
                 case "init":
                     startWithConfig(list, result);
                     break;
+                case "bind":
+                    bind(list, result);
+                    break;
+                case "unbind":
+                    unbind(list, result);
+                    break;
+                case "loginWithKey":
+                    loginWithKey(list, result);
+                    break;
                 default:
                     result.notImplemented();
                     break;
@@ -608,6 +616,40 @@ public void properties(SAPropertiesFetcher fetcher) {
         result.success(null);
     }
 
+    private void bind(List list, Result result) {
+        try {
+            String key = (String) list.get(0);
+            String value = (String) list.get(1);
+            SensorsDataAPI.sharedInstance().bind(key, value);
+            result.success(null);
+        } catch (Exception e) {
+            SALog.printStackTrace(e);
+        }
+    }
+
+    private void unbind(List list, Result result) {
+        try {
+            String key = (String) list.get(0);
+            String value = (String) list.get(1);
+            SensorsDataAPI.sharedInstance().unbind(key, value);
+            result.success(null);
+        } catch (Exception e) {
+            SALog.printStackTrace(e);
+        }
+    }
+
+    private void loginWithKey(List list, Result result) {
+        try {
+            String key = (String) list.get(0);
+            String value = (String) list.get(1);
+            JSONObject properties = assertProperties2(list.get(2));
+            SensorsDataAPI.sharedInstance().loginWithKey(key, value, properties);
+            result.success(null);
+        } catch (Exception e) {
+            SALog.printStackTrace(e);
+        }
+    }
+
     private JSONObject assertProperties(Map map) {
         if (map != null) {
             return new JSONObject(map);

example/.metadata

@@ -1,10 +1,10 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: f7a6a7906be96d2288f5d63a5a54c515a6e987fe
+  revision: eb6d86ee27deecba4a83536aa20f366a6044895c
   channel: stable
 
 project_type: app

example/analysis_options.yaml

@@ -0,0 +1,29 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

example/android/.gitignore

@@ -5,3 +5,9 @@ gradle-wrapper.jar
 /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties
+**/*.keystore
+**/*.jks

example/android/app/build.gradle

@@ -22,20 +22,33 @@ if (flutterVersionName == null) {
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion flutter.compileSdkVersion
+    ndkVersion flutter.ndkVersion
 
-    lintOptions {
-        disable 'InvalidPackage'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.sensorsdata.analytics.sensorsanalyticsflutterplugin_example"
-        minSdkVersion 16
-        targetSdkVersion 28
+        applicationId "cn.sensorsdata.example"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -45,11 +58,14 @@ android {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
-
         }
     }
 }
 
 flutter {
     source '../..'
 }
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}

example/android/app/src/debug/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.sensorsdata.analytics.sensorsanalyticsflutterplugin_example">
-    <!-- Flutter needs it to communicate with the running application
+    package="cn.sensorsdata.example">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

example/android/app/src/main/AndroidManifest.xml

@@ -1,20 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.sensorsdata.analytics.sensorsanalyticsflutterplugin_example">
-    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
-         calls FlutterMain.startInitialization(this); in its onCreate method.
-         In most cases you can leave this as-is, but you if you want to provide
-         additional functionality it is fine to subclass or reimplement
-         FlutterApplication and put your custom class here. -->
-
-
-    <uses-permission android:name="android.permission.INTERNET"/>
-
-    <application
-        android:name=".App"
-        android:label="sensorsanalyticsflutterplugin_example"
+    package="cn.sensorsdata.example">
+   <application
+        android:label="example"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -28,15 +20,6 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -47,9 +30,5 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
-
-        <meta-data
-            android:name="com.sensorsdata.analytics.android.EnableLogging"
-            android:value="true" />
     </application>
 </manifest>