update nullsafety

master
小赖 4 years ago
parent bfff1f37e6
commit cbe804fd23

@ -1 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"jpush_flutter","path":"/Users/raoxudong/JPush/jpush-github/jpush-flutter-plugin/","dependencies":[]}],"android":[{"name":"jpush_flutter","path":"/Users/raoxudong/JPush/jpush-github/jpush-flutter-plugin/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"jpush_flutter","dependencies":[]}],"date_created":"2021-01-26 16:47:22.148262","version":"1.22.5"} {"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"jpush_flutter","path":"/Users/akufe/repos/jpush-flutter-plugin/","dependencies":[]}],"android":[{"name":"jpush_flutter","path":"/Users/akufe/repos/jpush-flutter-plugin/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"jpush_flutter","dependencies":[]}],"date_created":"2021-04-12 14:22:06.965328","version":"2.0.3"}

@ -1,15 +1,13 @@
#!/bin/sh #!/bin/sh
# This is a generated file; do not edit or check into version control. # This is a generated file; do not edit or check into version control.
export "FLUTTER_ROOT=/Applications/flutter" export "FLUTTER_ROOT=/Users/akufe/fvm/versions/stable"
export "FLUTTER_APPLICATION_PATH=/Users/raoxudong/JPush/jpush-github/jpush-flutter-plugin/example" export "FLUTTER_APPLICATION_PATH=/Users/akufe/repos/jpush-flutter-plugin/example"
export "FLUTTER_TARGET=/Users/raoxudong/JPush/jpush-github/jpush-flutter-plugin/example/lib/main.dart" export "FLUTTER_TARGET=lib/main.dart"
export "FLUTTER_BUILD_DIR=build" export "FLUTTER_BUILD_DIR=build"
export "SYMROOT=${SOURCE_ROOT}/../build/ios" export "SYMROOT=${SOURCE_ROOT}/../build/ios"
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
export "FLUTTER_FRAMEWORK_DIR=/Applications/flutter/bin/cache/artifacts/engine/ios"
export "FLUTTER_BUILD_NAME=1.0.0" export "FLUTTER_BUILD_NAME=1.0.0"
export "FLUTTER_BUILD_NUMBER=1" export "FLUTTER_BUILD_NUMBER=1"
export "DART_OBFUSCATION=false" export "DART_OBFUSCATION=false"
export "TRACK_WIDGET_CREATION=true" export "TRACK_WIDGET_CREATION=false"
export "TREE_SHAKE_ICONS=false" export "TREE_SHAKE_ICONS=false"
export "PACKAGE_CONFIG=.packages" export "PACKAGE_CONFIG=.packages"

@ -5,107 +5,114 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: _fe_analyzer_shared name: _fe_analyzer_shared
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.0.0" version: "20.0.0"
analyzer: analyzer:
dependency: transitive dependency: transitive
description: description:
name: analyzer name: analyzer
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.39.8" version: "1.4.0"
args: args:
dependency: transitive dependency: transitive
description: description:
name: args name: args
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.5.2" version: "2.0.0"
async: async:
dependency: transitive dependency: transitive
description: description:
name: async name: async
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.5.0-nullsafety.1" version: "2.5.0"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:
name: boolean_selector name: boolean_selector
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0-nullsafety.1" version: "2.1.0"
characters: characters:
dependency: transitive dependency: transitive
description: description:
name: characters name: characters
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0-nullsafety.3" version: "1.1.0"
charcode: charcode:
dependency: transitive dependency: transitive
description: description:
name: charcode name: charcode
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
cli_util:
dependency: transitive
description:
name: cli_util
url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0-nullsafety.1" version: "0.3.0"
clock: clock:
dependency: transitive dependency: transitive
description: description:
name: clock name: clock
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0-nullsafety.1" version: "1.1.0"
collection: collection:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.15.0-nullsafety.3" version: "1.15.0"
convert: convert:
dependency: transitive dependency: transitive
description: description:
name: convert name: convert
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.1" version: "3.0.0"
coverage: coverage:
dependency: transitive dependency: transitive
description: description:
name: coverage name: coverage
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.13.9" version: "1.0.2"
crypto: crypto:
dependency: transitive dependency: transitive
description: description:
name: crypto name: crypto
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted
version: "2.1.3"
csslib:
dependency: transitive
description:
name: csslib
url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.16.1" version: "3.0.1"
cupertino_icons: cupertino_icons:
dependency: "direct main" dependency: "direct main"
description: description:
name: cupertino_icons name: cupertino_icons
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.3" version: "0.1.3"
fake_async: fake_async:
dependency: transitive dependency: transitive
description: description:
name: fake_async name: fake_async
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0-nullsafety.1" version: "1.2.0"
file:
dependency: transitive
description:
name: file
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.0"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -120,191 +127,156 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: glob name: glob
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
html:
dependency: transitive
description:
name: html
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.14.0+3"
http:
dependency: transitive
description:
name: http
url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.12.1" version: "2.0.1"
http_multi_server: http_multi_server:
dependency: transitive dependency: transitive
description: description:
name: http_multi_server name: http_multi_server
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.2.0" version: "3.0.0"
http_parser: http_parser:
dependency: transitive dependency: transitive
description: description:
name: http_parser name: http_parser
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.1.4" version: "4.0.0"
io: io:
dependency: transitive dependency: transitive
description: description:
name: io name: io
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.3.4" version: "1.0.0"
jpush_flutter: jpush_flutter:
dependency: "direct dev" dependency: "direct dev"
description: description:
path: ".." path: ".."
relative: true relative: true
source: path source: path
version: "0.6.3" version: "2.0.1"
js: js:
dependency: transitive dependency: transitive
description: description:
name: js name: js
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.3-nullsafety.2" version: "0.6.3"
logging: logging:
dependency: transitive dependency: transitive
description: description:
name: logging name: logging
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.11.4" version: "1.0.1"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.10-nullsafety.1" version: "0.12.10"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0-nullsafety.3" version: "1.3.0"
mime: mime:
dependency: transitive dependency: transitive
description: description:
name: mime name: mime
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.9.6+3" version: "1.0.0"
mockito: mockito:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: mockito name: mockito
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.0.2" version: "3.0.2"
node_interop:
dependency: transitive
description:
name: node_interop
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.0"
node_io:
dependency: transitive
description:
name: node_io
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.0"
node_preamble: node_preamble:
dependency: transitive dependency: transitive
description: description:
name: node_preamble name: node_preamble
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.4.8" version: "1.4.13"
package_config: package_config:
dependency: transitive dependency: transitive
description: description:
name: package_config name: package_config
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.9.3" version: "2.0.0"
package_resolver:
dependency: transitive
description:
name: package_resolver
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.10"
path: path:
dependency: transitive dependency: transitive
description: description:
name: path name: path
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.0-nullsafety.1" version: "1.8.0"
pedantic: pedantic:
dependency: transitive dependency: transitive
description: description:
name: pedantic name: pedantic
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.10.0-nullsafety.2" version: "1.11.0"
platform: platform:
dependency: transitive dependency: transitive
description: description:
name: platform name: platform
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.2.1" version: "3.0.0"
pool: pool:
dependency: transitive dependency: transitive
description: description:
name: pool name: pool
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.5.0-nullsafety.2" version: "1.5.0"
pub_semver: pub_semver:
dependency: transitive dependency: transitive
description: description:
name: pub_semver name: pub_semver
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.4.4" version: "2.0.0"
shelf: shelf:
dependency: transitive dependency: transitive
description: description:
name: shelf name: shelf
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.7.5" version: "1.1.0"
shelf_packages_handler: shelf_packages_handler:
dependency: transitive dependency: transitive
description: description:
name: shelf_packages_handler name: shelf_packages_handler
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.4" version: "3.0.0"
shelf_static: shelf_static:
dependency: transitive dependency: transitive
description: description:
name: shelf_static name: shelf_static
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.8" version: "1.0.0"
shelf_web_socket: shelf_web_socket:
dependency: transitive dependency: transitive
description: description:
name: shelf_web_socket name: shelf_web_socket
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.3" version: "1.0.1"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@ -314,121 +286,121 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: source_map_stack_trace name: source_map_stack_trace
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0-nullsafety.3" version: "2.1.0"
source_maps: source_maps:
dependency: transitive dependency: transitive
description: description:
name: source_maps name: source_maps
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.10.10-nullsafety.2" version: "0.10.10"
source_span: source_span:
dependency: transitive dependency: transitive
description: description:
name: source_span name: source_span
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.0-nullsafety.2" version: "1.8.0"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
name: stack_trace name: stack_trace
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.10.0-nullsafety.1" version: "1.10.0"
stream_channel: stream_channel:
dependency: transitive dependency: transitive
description: description:
name: stream_channel name: stream_channel
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0-nullsafety.1" version: "2.1.0"
string_scanner: string_scanner:
dependency: transitive dependency: transitive
description: description:
name: string_scanner name: string_scanner
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0-nullsafety.1" version: "1.1.0"
term_glyph: term_glyph:
dependency: transitive dependency: transitive
description: description:
name: term_glyph name: term_glyph
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0-nullsafety.1" version: "1.2.0"
test: test:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: test name: test
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.16.0-nullsafety.5" version: "1.16.5"
test_api: test_api:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.19-nullsafety.2" version: "0.2.19"
test_core: test_core:
dependency: transitive dependency: transitive
description: description:
name: test_core name: test_core
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.3.12-nullsafety.5" version: "0.3.15"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
name: typed_data name: typed_data
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0-nullsafety.3" version: "1.3.0"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
name: vector_math name: vector_math
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0-nullsafety.3" version: "2.1.0"
vm_service: vm_service:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.3.1" version: "6.2.0"
watcher: watcher:
dependency: transitive dependency: transitive
description: description:
name: watcher name: watcher
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.9.7+15" version: "1.0.0"
web_socket_channel: web_socket_channel:
dependency: transitive dependency: transitive
description: description:
name: web_socket_channel name: web_socket_channel
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "2.0.0"
webkit_inspection_protocol: webkit_inspection_protocol:
dependency: transitive dependency: transitive
description: description:
name: webkit_inspection_protocol name: webkit_inspection_protocol
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.7.4" version: "1.0.0"
yaml: yaml:
dependency: transitive dependency: transitive
description: description:
name: yaml name: yaml
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.2.1" version: "3.1.0"
sdks: sdks:
dart: ">=2.10.0-110 <2.11.0" dart: ">=2.12.0 <3.0.0"
flutter: ">=1.10.0" flutter: ">=1.10.0"

@ -3,7 +3,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:platform/platform.dart'; import 'package:platform/platform.dart';
typedef Future<dynamic> EventHandler(Map<String, dynamic> event); typedef Future<dynamic> EventHandler(Map<String, dynamic>? event);
class JPush { class JPush {
static const String flutter_log = "| JPUSH | Flutter | "; static const String flutter_log = "| JPUSH | Flutter | ";
@ -20,14 +20,14 @@ class JPush {
static final JPush _instance = static final JPush _instance =
new JPush.private(const MethodChannel('jpush'), const LocalPlatform()); new JPush.private(const MethodChannel('jpush'), const LocalPlatform());
EventHandler _onReceiveNotification; EventHandler? _onReceiveNotification;
EventHandler _onOpenNotification; EventHandler? _onOpenNotification;
EventHandler _onReceiveMessage; EventHandler? _onReceiveMessage;
EventHandler _onReceiveNotificationAuthorization; EventHandler? _onReceiveNotificationAuthorization;
void setup({ void setup({
String appKey, String? appKey,
bool production, bool? production,
String channel = '', String channel = '',
bool debug = false, bool debug = false,
}) { }) {
@ -45,10 +45,10 @@ class JPush {
/// JPush () /// JPush ()
/// ///
void addEventHandler({ void addEventHandler({
EventHandler onReceiveNotification, EventHandler? onReceiveNotification,
EventHandler onOpenNotification, EventHandler? onOpenNotification,
EventHandler onReceiveMessage, EventHandler? onReceiveMessage,
EventHandler onReceiveNotificationAuthorization, EventHandler? onReceiveNotificationAuthorization,
}) { }) {
print(flutter_log + "addEventHandler:"); print(flutter_log + "addEventHandler:");
@ -64,13 +64,13 @@ class JPush {
switch (call.method) { switch (call.method) {
case "onReceiveNotification": case "onReceiveNotification":
return _onReceiveNotification(call.arguments.cast<String, dynamic>()); return _onReceiveNotification!(call.arguments.cast<String, dynamic>()) as FutureOr<Null>;
case "onOpenNotification": case "onOpenNotification":
return _onOpenNotification(call.arguments.cast<String, dynamic>()); return _onOpenNotification!(call.arguments.cast<String, dynamic>()) as FutureOr<Null>;
case "onReceiveMessage": case "onReceiveMessage":
return _onReceiveMessage(call.arguments.cast<String, dynamic>()); return _onReceiveMessage!(call.arguments.cast<String, dynamic>()) as FutureOr<Null>;
case "onReceiveNotificationAuthorization": case "onReceiveNotificationAuthorization":
return _onReceiveNotificationAuthorization(call.arguments.cast<String, dynamic>()); return _onReceiveNotificationAuthorization!(call.arguments.cast<String, dynamic>()) as FutureOr<Null>;
default: default:
throw new UnsupportedError("Unrecognized Event"); throw new UnsupportedError("Unrecognized Event");
} }
@ -98,10 +98,10 @@ class JPush {
/// @param {Function} success = ({"tags":[String]}) => { } /// @param {Function} success = ({"tags":[String]}) => { }
/// @param {Function} fail = ({"errorCode":int}) => { } /// @param {Function} fail = ({"errorCode":int}) => { }
/// ///
Future<Map<dynamic, dynamic>> setTags(List<String> tags) async { Future<Map<dynamic, dynamic>?> setTags(List<String> tags) async {
print(flutter_log + "setTags:"); print(flutter_log + "setTags:");
final Map<dynamic, dynamic> result = final Map<dynamic, dynamic>? result =
await _channel.invokeMethod('setTags', tags); await _channel.invokeMethod('setTags', tags);
return result; return result;
} }
@ -112,10 +112,10 @@ class JPush {
/// @param {Function} success = ({"tags":[String]}) => { } /// @param {Function} success = ({"tags":[String]}) => { }
/// @param {Function} fail = ({"errorCode":int}) => { } /// @param {Function} fail = ({"errorCode":int}) => { }
/// ///
Future<Map<dynamic, dynamic>> cleanTags() async { Future<Map<dynamic, dynamic>?> cleanTags() async {
print(flutter_log + "cleanTags:"); print(flutter_log + "cleanTags:");
final Map<dynamic, dynamic> result = final Map<dynamic, dynamic>? result =
await _channel.invokeMethod('cleanTags'); await _channel.invokeMethod('cleanTags');
return result; return result;
} }
@ -128,10 +128,10 @@ class JPush {
/// @param {Function} fail = ({"errorCode":int}) => { } /// @param {Function} fail = ({"errorCode":int}) => { }
/// ///
Future<Map<dynamic, dynamic>> addTags(List<String> tags) async { Future<Map<dynamic, dynamic>?> addTags(List<String> tags) async {
print(flutter_log + "addTags:"); print(flutter_log + "addTags:");
final Map<dynamic, dynamic> result = final Map<dynamic, dynamic>? result =
await _channel.invokeMethod('addTags', tags); await _channel.invokeMethod('addTags', tags);
return result; return result;
} }
@ -143,10 +143,10 @@ class JPush {
/// @param {Function} success = ({"tags":[String]}) => { } /// @param {Function} success = ({"tags":[String]}) => { }
/// @param {Function} fail = ({"errorCode":int}) => { } /// @param {Function} fail = ({"errorCode":int}) => { }
/// ///
Future<Map<dynamic, dynamic>> deleteTags(List<String> tags) async { Future<Map<dynamic, dynamic>?> deleteTags(List<String> tags) async {
print(flutter_log + "deleteTags:"); print(flutter_log + "deleteTags:");
final Map<dynamic, dynamic> result = final Map<dynamic, dynamic>? result =
await _channel.invokeMethod('deleteTags', tags); await _channel.invokeMethod('deleteTags', tags);
return result; return result;
} }
@ -157,10 +157,10 @@ class JPush {
/// @param {Function} success = ({"tags":[String]}) => { } /// @param {Function} success = ({"tags":[String]}) => { }
/// @param {Function} fail = ({"errorCode":int}) => { } /// @param {Function} fail = ({"errorCode":int}) => { }
/// ///
Future<Map<dynamic, dynamic>> getAllTags() async { Future<Map<dynamic, dynamic>?> getAllTags() async {
print(flutter_log + "getAllTags:"); print(flutter_log + "getAllTags:");
final Map<dynamic, dynamic> result = final Map<dynamic, dynamic>? result =
await _channel.invokeMethod('getAllTags'); await _channel.invokeMethod('getAllTags');
return result; return result;
} }
@ -173,10 +173,10 @@ class JPush {
/// @param {Function} success = ({"alias":String}) => { } /// @param {Function} success = ({"alias":String}) => { }
/// @param {Function} fail = ({"errorCode":int}) => { } /// @param {Function} fail = ({"errorCode":int}) => { }
/// ///
Future<Map<dynamic, dynamic>> setAlias(String alias) async { Future<Map<dynamic, dynamic>?> setAlias(String alias) async {
print(flutter_log + "setAlias:"); print(flutter_log + "setAlias:");
final Map<dynamic, dynamic> result = final Map<dynamic, dynamic>? result =
await _channel.invokeMethod('setAlias', alias); await _channel.invokeMethod('setAlias', alias);
return result; return result;
} }
@ -187,10 +187,10 @@ class JPush {
/// @param {Function} success = ({"alias":String}) => { } /// @param {Function} success = ({"alias":String}) => { }
/// @param {Function} fail = ({"errorCode":int}) => { } /// @param {Function} fail = ({"errorCode":int}) => { }
/// ///
Future<Map<dynamic, dynamic>> deleteAlias() async { Future<Map<dynamic, dynamic>?> deleteAlias() async {
print(flutter_log + "deleteAlias:"); print(flutter_log + "deleteAlias:");
final Map<dynamic, dynamic> result = final Map<dynamic, dynamic>? result =
await _channel.invokeMethod('deleteAlias'); await _channel.invokeMethod('deleteAlias');
return result; return result;
} }
@ -239,7 +239,7 @@ class JPush {
/// ///
/// @param notificationId idLocalNotification id /// @param notificationId idLocalNotification id
/// ///
void clearNotification({@required int notificationId}) { void clearNotification({required int notificationId}) {
print(flutter_log + "clearNotification:"); print(flutter_log + "clearNotification:");
_channel.invokeListMethod("clearNotification",notificationId); _channel.invokeListMethod("clearNotification",notificationId);
} }
@ -251,10 +251,10 @@ class JPush {
/// icon notification @{} /// icon notification @{}
/// @param {Function} callback = (Object) => {} /// @param {Function} callback = (Object) => {}
/// ///
Future<Map<dynamic, dynamic>> getLaunchAppNotification() async { Future<Map<dynamic, dynamic>?> getLaunchAppNotification() async {
print(flutter_log + "getLaunchAppNotification:"); print(flutter_log + "getLaunchAppNotification:");
final Map<dynamic, dynamic> result = final Map<dynamic, dynamic>? result =
await _channel.invokeMethod('getLaunchAppNotification'); await _channel.invokeMethod('getLaunchAppNotification');
return result; return result;
} }
@ -264,10 +264,10 @@ class JPush {
/// ///
/// @param {Function} callback = (String) => {} /// @param {Function} callback = (String) => {}
/// ///
Future<String> getRegistrationID() async { Future<String?> getRegistrationID() async {
print(flutter_log + "getRegistrationID:"); print(flutter_log + "getRegistrationID:");
final String rid = await _channel.invokeMethod('getRegistrationID'); final String? rid = await _channel.invokeMethod('getRegistrationID');
return rid; return rid;
} }
@ -285,9 +285,9 @@ class JPush {
/// API /// API
Future<bool> isNotificationEnabled() async { Future<bool?> isNotificationEnabled() async {
final Map<dynamic, dynamic> result = await _channel.invokeMethod('isNotificationEnabled'); final Map<dynamic, dynamic> result = await (_channel.invokeMethod('isNotificationEnabled') as FutureOr<Map<dynamic, dynamic>>);
bool isEnabled = result["isEnabled"]; bool? isEnabled = result["isEnabled"];
return isEnabled; return isEnabled;
} }
@ -327,21 +327,21 @@ class NotificationSettingsIOS {
/// // iOS 10+ Only /// // iOS 10+ Only
/// @property {string} [subtitle] - /// @property {string} [subtitle] -
class LocalNotification { class LocalNotification {
final int buildId; //? final int? buildId; //?
final int id; final int id;
final String title; final String title;
final String content; final String content;
final Map<String, String> extra; //? final Map<String, String>? extra; //?
final DateTime fireTime; final DateTime fireTime;
final int badge; //? final int badge; //?
final String soundName; //? final String? soundName; //?
final String subtitle; //? final String? subtitle; //?
const LocalNotification( const LocalNotification(
{@required this.id, {required this.id,
@required this.title, required this.title,
@required this.content, required this.content,
@required this.fireTime, required this.fireTime,
this.buildId, this.buildId,
this.extra, this.extra,
this.badge = 0, this.badge = 0,

@ -1,387 +1,422 @@
# Generated by pub # Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile # See https://dart.dev/tools/pub/glossary#lockfile
packages: packages:
_fe_analyzer_shared:
dependency: transitive
description:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "20.0.0"
analyzer: analyzer:
dependency: transitive dependency: transitive
description: description:
name: analyzer name: analyzer
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.37.0" version: "1.4.0"
args: args:
dependency: transitive dependency: transitive
description: description:
name: args name: args
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.5.2" version: "2.0.0"
async: async:
dependency: transitive dependency: transitive
description: description:
name: async name: async
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.3.0" version: "2.5.0"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:
name: boolean_selector name: boolean_selector
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
build:
dependency: transitive
description:
name: build
url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.5" version: "2.0.0"
built_collection:
dependency: transitive
description:
name: built_collection
url: "https://pub.dartlang.org"
source: hosted
version: "5.0.0"
built_value:
dependency: transitive
description:
name: built_value
url: "https://pub.dartlang.org"
source: hosted
version: "8.0.4"
characters: characters:
dependency: transitive dependency: transitive
description: description:
name: characters name: characters
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0-nullsafety.3" version: "1.1.0"
charcode: charcode:
dependency: transitive dependency: transitive
description: description:
name: charcode name: charcode
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
cli_util:
dependency: transitive
description:
name: cli_util
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.0"
code_builder:
dependency: transitive
description:
name: code_builder
url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.2" version: "3.7.0"
collection: collection:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.15.0-nullsafety.3" version: "1.15.0"
convert: convert:
dependency: transitive dependency: transitive
description: description:
name: convert name: convert
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.1" version: "3.0.0"
crypto: coverage:
dependency: transitive dependency: transitive
description: description:
name: crypto name: coverage
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.6" version: "1.0.2"
csslib: crypto:
dependency: transitive dependency: transitive
description: description:
name: csslib name: crypto
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.16.1" version: "3.0.1"
flutter: dart_style:
dependency: "direct main"
description: flutter
source: sdk
version: "0.0.0"
front_end:
dependency: transitive dependency: transitive
description: description:
name: front_end name: dart_style
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.20" version: "2.0.0"
glob: file:
dependency: transitive dependency: transitive
description: description:
name: glob name: file
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.7" version: "6.1.0"
html: fixnum:
dependency: transitive dependency: transitive
description: description:
name: html name: fixnum
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.14.0+2" version: "1.0.0"
http: flutter:
dependency: "direct main"
description: flutter
source: sdk
version: "0.0.0"
glob:
dependency: transitive dependency: transitive
description: description:
name: http name: glob
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.0+2" version: "2.0.1"
http_multi_server: http_multi_server:
dependency: transitive dependency: transitive
description: description:
name: http_multi_server name: http_multi_server
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0" version: "3.0.0"
http_parser: http_parser:
dependency: transitive dependency: transitive
description: description:
name: http_parser name: http_parser
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.1.3" version: "4.0.0"
io: io:
dependency: transitive dependency: transitive
description: description:
name: io name: io
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.3.3" version: "1.0.0"
js: js:
dependency: transitive dependency: transitive
description: description:
name: js name: js
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.1+1" version: "0.6.3"
kernel: logging:
dependency: transitive dependency: transitive
description: description:
name: kernel name: logging
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.3.20" version: "1.0.1"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.5" version: "0.12.10"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0-nullsafety.3" version: "1.3.0"
mime: mime:
dependency: transitive dependency: transitive
description: description:
name: mime name: mime
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.9.6+3" version: "1.0.0"
mockito: mockito:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: mockito name: mockito
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted
version: "3.0.2"
multi_server_socket:
dependency: transitive
description:
name: multi_server_socket
url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.0.2" version: "5.0.3"
node_preamble: node_preamble:
dependency: transitive dependency: transitive
description: description:
name: node_preamble name: node_preamble
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.4.5" version: "2.0.0"
package_config: package_config:
dependency: transitive dependency: transitive
description: description:
name: package_config name: package_config
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.5" version: "2.0.0"
package_resolver:
dependency: transitive
description:
name: package_resolver
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.10"
path: path:
dependency: transitive dependency: transitive
description: description:
name: path name: path
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.2" version: "1.8.0"
pedantic: pedantic:
dependency: transitive dependency: transitive
description: description:
name: pedantic name: pedantic
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.0+1" version: "1.11.0"
platform: platform:
dependency: "direct main" dependency: "direct main"
description: description:
name: platform name: platform
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.2.0" version: "3.0.0"
pool: pool:
dependency: transitive dependency: transitive
description: description:
name: pool name: pool
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.4.0" version: "1.5.0"
pub_semver: pub_semver:
dependency: transitive dependency: transitive
description: description:
name: pub_semver name: pub_semver
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.4.2" version: "2.0.0"
shelf: shelf:
dependency: transitive dependency: transitive
description: description:
name: shelf name: shelf
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.7.5" version: "1.1.0"
shelf_packages_handler: shelf_packages_handler:
dependency: transitive dependency: transitive
description: description:
name: shelf_packages_handler name: shelf_packages_handler
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.4" version: "3.0.0"
shelf_static: shelf_static:
dependency: transitive dependency: transitive
description: description:
name: shelf_static name: shelf_static
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.8" version: "1.0.0"
shelf_web_socket: shelf_web_socket:
dependency: transitive dependency: transitive
description: description:
name: shelf_web_socket name: shelf_web_socket
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.3" version: "1.0.1"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.99" version: "0.0.99"
source_gen:
dependency: transitive
description:
name: source_gen
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
source_map_stack_trace: source_map_stack_trace:
dependency: transitive dependency: transitive
description: description:
name: source_map_stack_trace name: source_map_stack_trace
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.5" version: "2.1.0"
source_maps: source_maps:
dependency: transitive dependency: transitive
description: description:
name: source_maps name: source_maps
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.10.8" version: "0.10.10"
source_span: source_span:
dependency: transitive dependency: transitive
description: description:
name: source_span name: source_span
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.5.5" version: "1.8.1"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
name: stack_trace name: stack_trace
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.9.3" version: "1.10.0"
stream_channel: stream_channel:
dependency: transitive dependency: transitive
description: description:
name: stream_channel name: stream_channel
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
stream_transform:
dependency: transitive
description:
name: stream_transform
url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.0.19" version: "2.1.0"
string_scanner: string_scanner:
dependency: transitive dependency: transitive
description: description:
name: string_scanner name: string_scanner
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.4" version: "1.1.0"
term_glyph: term_glyph:
dependency: transitive dependency: transitive
description: description:
name: term_glyph name: term_glyph
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.2.0"
test: test:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: test name: test
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.5" version: "1.16.8"
test_api: test_api:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.6" version: "0.3.0"
test_core: test_core:
dependency: transitive dependency: transitive
description: description:
name: test_core name: test_core
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.7" version: "0.3.19"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
name: typed_data name: typed_data
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0-nullsafety.3" version: "1.3.0"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
name: vector_math name: vector_math
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0-nullsafety.3" version: "2.1.0"
vm_service_lib: vm_service:
dependency: transitive dependency: transitive
description: description:
name: vm_service_lib name: vm_service
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.22.2" version: "6.2.0"
watcher: watcher:
dependency: transitive dependency: transitive
description: description:
name: watcher name: watcher
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.9.7+12" version: "1.0.0"
web_socket_channel: web_socket_channel:
dependency: transitive dependency: transitive
description: description:
name: web_socket_channel name: web_socket_channel
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
webkit_inspection_protocol:
dependency: transitive
description:
name: webkit_inspection_protocol
url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.14" version: "1.0.0"
yaml: yaml:
dependency: transitive dependency: transitive
description: description:
name: yaml name: yaml
url: "https://pub.flutter-io.cn" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.16" version: "3.1.0"
sdks: sdks:
dart: ">=2.10.0-110 <2.11.0" dart: ">=2.12.0 <3.0.0"
flutter: ">=1.10.0" flutter: ">=1.10.0"

@ -5,7 +5,7 @@ version: 2.0.1
homepage: https://www.jiguang.cn homepage: https://www.jiguang.cn
environment: environment:
sdk: ">=2.1.0 <3.0.0" sdk: '>=2.12.0 <3.0.0'
flutter: ">=1.10.0" flutter: ">=1.10.0"
dependencies: dependencies:

@ -7,8 +7,8 @@ import 'package:jpush_flutter/jpush_flutter.dart';
void main() { void main() {
MockMethodChannel mockChannel; late MockMethodChannel mockChannel;
JPush jpush; late JPush jpush;
setUp(() { setUp(() {
mockChannel = new MockMethodChannel(); mockChannel = new MockMethodChannel();

Loading…
Cancel
Save