Release 1.0.5

weiqiangliu · weiqiangliu · commit ac5d9ae77443 · 2021-01-18T19:03:17.000+08:00
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
-## 1.0.3
+## 1.0.5
+
+* 增加合规功能
+
+## 1.0.4
 
 * 属性中适配 DateTime 实例
 
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 ```yml
 dependencies:
   # 添加神策 flutter plugin 
-  sensors_analytics_flutter_plugin: ^1.0.4
+  sensors_analytics_flutter_plugin: ^1.0.5
 ```
 
 执行 flutter packages get 命令安装插件
diff --git a/android/build.gradle b/android/build.gradle
@@ -33,5 +33,5 @@ android {
 }
 
 dependencies {
-    api 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:4.2.1'
+    api 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:4.4.9'
 }
diff --git a/android/src/main/java/com/sensorsdata/analytics/sensorsanalyticsflutterplugin/SensorsAnalyticsFlutterPlugin.java b/android/src/main/java/com/sensorsdata/analytics/sensorsanalyticsflutterplugin/SensorsAnalyticsFlutterPlugin.java
@@ -104,6 +104,9 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
                 case "profileUnsetPushId":
                     profileUnsetPushId(list);
                     break;
+                case "enableDataCollect":
+                    enableDataCollect();
+                    break;
                 default:
                     result.notImplemented();
                     break;
@@ -278,6 +281,13 @@ private void profileUnsetPushId(List list){
         SensorsDataAPI.sharedInstance().profileUnsetPushId((String)list.get(0));
     }
 
+    /**
+     * 开启数据采集
+     */
+    private void enableDataCollect(){
+        SensorsDataAPI.sharedInstance().enableDataCollect();
+    }
+
     private JSONObject assertProperties(Map map) {
         if (map != null) {
             return new JSONObject(map);
diff --git a/example/android/app/src/main/java/com/sensorsdata/analytics/sensorsanalyticsflutterplugin_example/App.java b/example/android/app/src/main/java/com/sensorsdata/analytics/sensorsanalyticsflutterplugin_example/App.java
@@ -34,6 +34,7 @@ private void initSensorsDataAPI() {
                 SensorsAnalyticsAutoTrackEventType.APP_CLICK)
                 .enableTrackAppCrash()
                 .enableVisualizedAutoTrack(true)
+                //.disableDataCollect()
                 .enableVisualizedAutoTrackConfirmDialog(true);
         SensorsDataAPI.startWithConfigOptions(this, configOptions);
         SensorsDataAPI.sharedInstance(this).trackFragmentAppViewScreen();
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '9.0'
+# platform :ios, '9.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -10,75 +10,29 @@ project 'Runner', {
   'Release' => :release,
 }
 
-def parse_KV_file(file, separator='=')
-  file_abs_path = File.expand_path(file)
-  if !File.exists? file_abs_path
-    return [];
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
   end
-  generated_key_values = {}
-  skip_line_start_symbols = ["#", "/"]
-  File.foreach(file_abs_path) do |line|
-    next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
-    plugin = line.split(pattern=separator)
-    if plugin.length == 2
-      podname = plugin[0].strip()
-      path = plugin[1].strip()
-      podpath = File.expand_path("#{path}", file_abs_path)
-      generated_key_values[podname] = podpath
-    else
-      puts "Invalid plugin specification: #{line}"
-    end
-  end
-  generated_key_values
-end
-
-target 'Runner' do
-  # Flutter Pod
-
-  copied_flutter_dir = File.join(__dir__, 'Flutter')
-  copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework')
-  copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec')
-  unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path)
-    # Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet.
-    # That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration.
-    # CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist.
 
-    generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig')
-    unless File.exist?(generated_xcode_build_settings_path)
-      raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first"
-    end
-    generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path)
-    cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR'];
-
-    unless File.exist?(copied_framework_path)
-      FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir)
-    end
-    unless File.exist?(copied_podspec_path)
-      FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir)
-    end
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
   end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+end
 
-  # Keep pod path relative so it can be checked into Podfile.lock.
-  pod 'Flutter', :path => 'Flutter'
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
 
-  # Plugin Pods
+flutter_ios_podfile_setup
 
-  # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
-  # referring to absolute paths on developers' machines.
-  system('rm -rf .symlinks')
-  system('mkdir -p .symlinks/plugins')
-  plugin_pods = parse_KV_file('../.flutter-plugins')
-  plugin_pods.each do |name, path|
-    symlink = File.join('.symlinks', 'plugins', name)
-    File.symlink(path, symlink)
-    pod name, :path => File.join(symlink, 'ios')
-  end
+target 'Runner' do
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
 
 post_install do |installer|
   installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings['ENABLE_BITCODE'] = 'NO'
-    end
+    flutter_additional_ios_build_settings(target)
   end
 end
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - Flutter (1.0.0)
-  - sensors_analytics_flutter_plugin (1.0.2):
+  - sensors_analytics_flutter_plugin (1.0.5):
     - Flutter
     - SensorsAnalyticsSDK
   - SensorsAnalyticsSDK (2.2.4):
@@ -23,9 +23,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
-  sensors_analytics_flutter_plugin: 67005f4a6591e48b68618f18dd5a68e842598056
+  sensors_analytics_flutter_plugin: 28c92a16312453a6834eda00ee94d27a5406adf1
   SensorsAnalyticsSDK: d898a6b6427dc842fa8c54c4cfb17dcc8a7e2220
 
-PODFILE CHECKSUM: 8685ee79ad9489b94b9f1ac3974f4638bb57b02e
+PODFILE CHECKSUM: 8e679eca47255a8ca8067c4c67aab20e64cb974d
 
 COCOAPODS: 1.9.3
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -220,7 +220,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -234,7 +234,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
 		98F6785E94D4D2429BB76349 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -113,6 +113,12 @@ class _MyAppState extends State<MyApp> {
                 SensorsAnalyticsFlutterPlugin.profileUnsetPushId("jgId");
               },
             ),
+            ListTile(
+              title: Text("合规功能测试"),
+              onTap: () {
+                SensorsAnalyticsFlutterPlugin.enableDataCollect();
+              },
+            ),
             ListTile(
               title: Text(
                   'https://github.com/sensorsdata/sensors_analytics_flutter_plugin'),
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -11,13 +11,14 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  #sensors_analytics_flutter_plugin: ^1.0.5
 
   sensors_analytics_flutter_plugin:
     # When depending on this package from a real application you should use:
     #   sensorsanalyticsflutterplugin: ^x.y.z
     # See https://dart.dev/tools/pub/dependencies#version-constraints
     # The example app is bundled with the plugin so we use a path dependency on
-    # the parent directory to use the current plugin's version. 
+    # the parent directory to use the current plugin's version.
     path: ../
 
   # The following adds the Cupertino Icons font to your application.
diff --git a/ios/Classes/SensorsAnalyticsFlutterPlugin.m b/ios/Classes/SensorsAnalyticsFlutterPlugin.m
@@ -26,6 +26,7 @@
 static NSString* const SensorsAnalyticsFlutterPluginMethodClearSuperProperties = @"clearSuperProperties";
 static NSString* const SensorsAnalyticsFlutterPluginMethodProfilePushKey = @"profilePushId";
 static NSString* const SensorsAnalyticsFlutterPluginMethodProfileUnsetPushKey = @"profileUnsetPushId";
+static NSString* const SensorsAnalyticsFlutterPluginMethodEnableDataCollect = @"enableDataCollect";
 
 
 @implementation SensorsAnalyticsFlutterPlugin
@@ -146,7 +147,9 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
         argumentSetNSNullToNil(&pushKey);
         [self profileUnsetPushKey:pushKey];
         result(nil);
-    } else {
+    } else if ([method isEqualToString:SensorsAnalyticsFlutterPluginMethodEnableDataCollect]){
+        result(nil);
+     } else {
         result(FlutterMethodNotImplemented);
     }
 }
diff --git a/ios/sensors_analytics_flutter_plugin.podspec b/ios/sensors_analytics_flutter_plugin.podspec
@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'sensors_analytics_flutter_plugin'
-  s.version          = '1.0.2'
+  s.version          = '1.0.5'
   s.summary          = 'A new flutter plugin project.'
   s.description      = <<-DESC
 A new flutter plugin project.
diff --git a/lib/sensors_analytics_flutter_plugin.dart b/lib/sensors_analytics_flutter_plugin.dart
@@ -289,6 +289,14 @@ class SensorsAnalyticsFlutterPlugin {
     _channel.invokeMethod("profileUnsetPushId", [pushTypeKey]);
   }
 
+  ///
+  /// 开启数据采集，此方法合规功能，需要配合 SAConfigOptions.disableDataCollect() 方法一起使用，并且此方法只针对 Android 平台：
+  /// 详情请参考：https://manual.sensorsdata.cn/sa/latest/page-22252691.html
+  ///
+  static void enableDataCollect(){
+    _channel.invokeMethod("enableDataCollect");
+  }
+
   /// 如果 map 中的 value 字段是 DateTime 类型，将其转换成
   static void _convertDateTime(Map<String, dynamic> map){
     if(map != null){
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: sensors_analytics_flutter_plugin
 description: This is the official flutter plugin for Sensors Analytics,with this plugin you can easily collect your app data on Android and iOS.
-version: 1.0.3
+version: 1.0.5
 author: "yangzhankun <yzhankun@gmail.com>"
 homepage: "https://github.com/sensorsdata/sensors_analytics_flutter_plugin"
 
diff --git a/sensors_analytics_flutter_plugin.iml b/sensors_analytics_flutter_plugin.iml
@@ -15,5 +15,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Dart SDK" level="project" />
     <orderEntry type="library" name="Flutter Plugins" level="project" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
   </component>
 </module>

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@ android {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`dependencies {`
`36`		`- api 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:4.2.1'`
	`36`	`+ api 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:4.4.9'`
`37`	`37`	`}`