升级Android SDK 2.6.3

WuWenhui · WuWenhui · commit a3bc8e34fbc8 · 2022-08-12T17:55:00.000+08:00
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/android/build.gradle b/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
     }
 }
 
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 16
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/android/libs/OpenInstall_v2.6.2.jar b/android/libs/OpenInstall_v2.6.2.jar
diff --git a/android/libs/OpenInstall_v2.6.3.jar b/android/libs/OpenInstall_v2.6.3.jar
diff --git a/android/src/main/java/io/openinstall/openinstall_flutter_plugin/OpeninstallFlutterPlugin.java b/android/src/main/java/io/openinstall/openinstall_flutter_plugin/OpeninstallFlutterPlugin.java
@@ -41,6 +41,8 @@ public class OpeninstallFlutterPlugin implements FlutterPlugin, MethodCallHandle
     private static final String METHOD_WAKEUP = "registerWakeup";
 
     private static final String METHOD_CONFIG = "config";
+    private static final String METHOD_CLIPBOARD_ENABLED = "clipBoardEnabled";
+    private static final String METHOD_SERIAL_ENABLED = "serialEnabled";
     private static final String METHOD_INIT = "init";
     private static final String METHOD_INSTALL_RETRY = "getInstallCanRetry";
     private static final String METHOD_INSTALL = "getInstall";
@@ -92,12 +94,22 @@ public void onMethodCall(MethodCall call, @NonNull Result result) {
             Boolean imeiDisabled = call.argument("imeiDisabled");
             config(adEnabled, oaid, gaid, macDisabled, imeiDisabled);
             result.success("OK");
+        } else if (METHOD_CLIPBOARD_ENABLED.equalsIgnoreCase(call.method)) {
+            Boolean enabled = call.argument("enabled");
+            OpenInstall.clipBoardEnabled(enabled == null ? true : enabled);
+            result.success("OK");
+        } else if (METHOD_SERIAL_ENABLED.equalsIgnoreCase(call.method)) {
+            Boolean enabled = call.argument("enabled");
+            OpenInstall.serialEnabled(enabled == null ? true : enabled);
+            result.success("OK");
         } else if (METHOD_INIT.equalsIgnoreCase(call.method)) {
-            alwaysCallback = call.argument("alwaysCallback");
+            Boolean box = call.argument("alwaysCallback");
+            alwaysCallback = box == null ? false : box;
             init();
             result.success("OK");
         } else if (METHOD_INIT_PERMISSION.equalsIgnoreCase(call.method)) {
-            alwaysCallback = call.argument("alwaysCallback");
+            Boolean box = call.argument("alwaysCallback");
+            alwaysCallback = box == null ? false : box;
             initWithPermission();
             result.success("OK");
         } else if (METHOD_WAKEUP.equalsIgnoreCase(call.method)) {
diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\OP\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"android":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\OP\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"openinstall_flutter_plugin","dependencies":[]}],"date_created":"2022-04-08 11:50:22.000328","version":"2.8.1"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\OP\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"android":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\OP\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"openinstall_flutter_plugin","dependencies":[]}],"date_created":"2022-08-01 17:19:48.747105","version":"2.8.1"}
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
 
     lintOptions {
         disable 'InvalidPackage'
@@ -35,7 +35,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.openinstall.openinstall_flutter_plugin_example"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -65,5 +65,4 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 
-//    implementation "com.android.support:appcompat-v7:28.0.0"
 }
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
     }
 }
 
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
@@ -1 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
+
+android.useAndroidX=true
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -28,7 +28,8 @@ class _MyAppState extends State<MyApp> {
     // setState to update our non-existent appearance.
     if (!mounted) return;
 
-    _openinstallFlutterPlugin = new OpeninstallFlutterPlugin();
+    _openinstallFlutterPlugin = OpeninstallFlutterPlugin();
+
     _openinstallFlutterPlugin.init(wakeupHandler);
     _openinstallFlutterPlugin.install(installHandler);
 
@@ -78,19 +79,21 @@ class _MyAppState extends State<MyApp> {
     );
   }
 
-  Future installHandler(Map<String, dynamic> data) async {
+  Future<Object> installHandler(Map<String, Object> data) async {
     print("installHandler : " + data.toString());
     setState(() {
-      installLog = "install result : channel=" + data['channelCode']
+      installLog = "install result : channel=" + data['channelCode'].toString()
           + ", data=" + data['bindData'].toString() + "\n";
     });
+    return "";
   }
 
-  Future wakeupHandler(Map<String, dynamic> data) async {
+  Future<Object> wakeupHandler(Map<String, Object> data) async {
     print("wakeupHandler : " + data.toString());
     setState(() {
-      wakeUpLog = "wakeup result : channel=" + data['channelCode']
+      wakeUpLog = "wakeup result : channel=" + data['channelCode'].toString()
           + ", data=" + data['bindData'].toString() + "\n";
     });
+    return "";
   }
 }
diff --git a/lib/openinstall_flutter_plugin.dart b/lib/openinstall_flutter_plugin.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 
 import 'package:flutter/services.dart';
 
-typedef Future<dynamic> EventHandler(Map<String, dynamic> data);
+typedef Future<Object> EventHandler(Map<String, Object> data);
 
 class OpeninstallFlutterPlugin {
   // 单例
@@ -43,6 +43,27 @@ class OpeninstallFlutterPlugin {
     }
   }
 
+  // 关闭剪切板读取
+  void clipBoardEnabled(bool enabled){
+    if (Platform.isAndroid) {
+      var args = new Map();
+      args["enabled"] = enabled;
+      _channel.invokeMethod('clipBoardEnabled', args);
+    } else {
+      // 仅使用于 Android 平台
+    }
+  }
+  // 关闭SerialNumber读取
+  void serialEnabled(bool enabled){
+    if (Platform.isAndroid) {
+      var args = new Map();
+      args["enabled"] = enabled;
+      _channel.invokeMethod('serialEnabled', args);
+    } else {
+      // 仅使用于 Android 平台
+    }
+  }
+
   // wakeupHandler 拉起回调.
   // alwaysCallback 是否总是有回调。当值为true时，只要触发了拉起方法调用，就会有回调
   // permission 初始化时是否申请 READ_PHONE_STATE 权限，已废弃。请用户自行进行权限申请
@@ -104,9 +125,9 @@ class OpeninstallFlutterPlugin {
     print(call.method);
     switch (call.method) {
       case "onWakeupNotification":
-        return _wakeupHandler(call.arguments.cast<String, dynamic>());
+        return _wakeupHandler(call.arguments.cast<String, Object>());
       case "onInstallNotification":
-        return _installHandler(call.arguments.cast<String, dynamic>());
+        return _installHandler(call.arguments.cast<String, Object>());
       default:
         throw new UnsupportedError("Unrecognized Event");
     }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ buildscript {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`11`		`- classpath 'com.android.tools.build:gradle:3.2.1'`
	`11`	`+ classpath 'com.android.tools.build:gradle:4.1.3'`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
`@@ -22,7 +22,7 @@ rootProject.allprojects {`
`22`	`22`	`apply plugin: 'com.android.library'`
`23`	`23`
`24`	`24`	`android {`
`25`		`- compileSdkVersion 28`
	`25`	`+ compileSdkVersion 33`
`26`	`26`
`27`	`27`	`defaultConfig {`
`28`	`28`	`minSdkVersion 16`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\OP\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"android":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\OP\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"openinstall_flutter_plugin","dependencies":[]}],"date_created":"2022-04-08 11:50:22.000328","version":"2.8.1"}
	`1`	+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\OP\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"android":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\OP\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"openinstall_flutter_plugin","dependencies":[]}],"date_created":"2022-08-01 17:19:48.747105","version":"2.8.1"}
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:3.2.1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:4.1.3'`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`org.gradle.jvmargs=-Xmx1536M`
	`2`	`+`
	`3`	`+android.useAndroidX=true`