From c47f9c19c0c78e8e6b5f2507dcb9783d2a677716 Mon Sep 17 00:00:00 2001 From: v7lin Date: Wed, 17 Jun 2020 00:58:32 +0800 Subject: [PATCH] update --- analysis_options.yaml | 188 +++++++++++++++++++++++----------- example/.gitignore | 46 ++------- example/analysis_options.yaml | 42 +------- example/lib/main.dart | 2 +- lib/src/tencent.dart | 102 ++++++++---------- 5 files changed, 180 insertions(+), 200 deletions(-) mode change 100644 => 100755 analysis_options.yaml mode change 100644 => 100755 example/analysis_options.yaml diff --git a/analysis_options.yaml b/analysis_options.yaml old mode 100644 new mode 100755 index 8d4684b..fd29b1d --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,13 +1,27 @@ -# Defines a default set of lint rules enforced for -# projects at Google. For details and rationale, -# see https://github.com/dart-lang/pedantic#enabled-lints. -include: package:pedantic/analysis_options.yaml +# Specify analysis options. +# +# Until there are meta linter rules, each desired lint must be explicitly enabled. +# See: https://github.com/dart-lang/linter/issues/288 +# +# For a list of lints, see: http://dart-lang.github.io/linter/lints/ +# See the configuration guide for more +# https://github.com/dart-lang/sdk/tree/master/pkg/analyzer#configuring-the-analyzer +# +# There are other similar analysis options files in the flutter repos, +# which should be kept in sync with this file: +# +# - analysis_options.yaml (this file) +# - packages/flutter/lib/analysis_options_user.yaml +# - https://github.com/flutter/plugins/blob/master/analysis_options.yaml +# - https://github.com/flutter/engine/blob/master/analysis_options.yaml +# +# This file contains the analysis options used by Flutter tools, such as IntelliJ, +# Android Studio, and the `flutter analyze` command. analyzer: strong-mode: implicit-casts: false - # implicit-dynamic: false - + implicit-dynamic: false errors: # treat missing required parameters as a warning (not a hint) missing_required_param: warning @@ -15,11 +29,10 @@ analyzer: missing_return: warning # allow having TODOs in the code todo: ignore - # Ignore errors like - # 'super_goes_last' is a deprecated lint rule and should not be used • included_file_warning - included_file_warning: ignore - - # 过滤 json_serializable + # Ignore analyzer hints for updating pubspecs when using Future or + # Stream and not importing dart:async + # Please see https://github.com/flutter/flutter/pull/24528 for details. + sdk_version_async_exported_from_core: ignore exclude: - "**/*.g.dart" @@ -27,109 +40,164 @@ linter: rules: # these rules are documented on and in the same order as # the Dart Lint rules page to make maintenance easier - # http://dart-lang.github.io/linter/lints/ - - # === error rules === - - avoid_empty_else - - avoid_slow_async_io - - cancel_subscriptions - # - close_sinks # https://github.com/flutter/flutter/issues/5789 - # - comment_references # blocked on https://github.com/dart-lang/dartdoc/issues/1153 - - control_flow_in_finally - - empty_statements - - hash_and_equals - # - invariant_booleans # https://github.com/flutter/flutter/issues/5790 - - iterable_contains_unrelated_type - - list_remove_unrelated_type - # - literal_only_boolean_expressions # https://github.com/flutter/flutter/issues/5791 - - no_adjacent_strings_in_list - - no_duplicate_case_values - - test_types_in_equals - - throw_in_finally - - unrelated_type_equality_checks - - valid_regexps - - # === style rules === + # https://github.com/dart-lang/linter/blob/master/example/all.yaml - always_declare_return_types - # - always_put_control_body_on_new_line + - always_put_control_body_on_new_line + # - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219 - always_require_non_null_named_parameters - always_specify_types - annotate_overrides - # - avoid_annotating_with_dynamic # not yet tested - # - avoid_as # 2019-01-30 removed for no-implicit-casts - # - avoid_catches_without_on_clauses # not yet tested - # - avoid_catching_errors # not yet tested - # - avoid_classes_with_only_static_members # not yet tested - # - avoid_function_literals_in_foreach_calls # not yet tested + # - avoid_annotating_with_dynamic # conflicts with always_specify_types + # - avoid_as # required for implicit-casts: true + - avoid_bool_literals_in_conditional_expressions + # - avoid_catches_without_on_clauses # we do this commonly + # - avoid_catching_errors # we do this commonly + - avoid_classes_with_only_static_members + # - avoid_double_and_int_checks # only useful when targeting JS runtime + - avoid_empty_else + # - avoid_equals_and_hash_code_on_mutable_classes # not yet tested + - avoid_field_initializers_in_const_classes + - avoid_function_literals_in_foreach_calls + # - avoid_implementing_value_types # not yet tested - avoid_init_to_null + # - avoid_js_rounded_ints # only useful when targeting JS runtime - avoid_null_checks_in_equality_operators # - avoid_positional_boolean_parameters # not yet tested + # - avoid_print # not yet tested + # - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356) + # - avoid_redundant_argument_values # not yet tested + - avoid_relative_lib_imports + - avoid_renaming_method_parameters - avoid_return_types_on_setters - # - avoid_returning_null # not yet tested - # - avoid_returning_this # not yet tested + # - avoid_returning_null # there are plenty of valid reasons to return null + # - avoid_returning_null_for_future # not yet tested + - avoid_returning_null_for_void + # - avoid_returning_this # there are plenty of valid reasons to return this # - avoid_setters_without_getters # not yet tested - # - avoid_types_on_closure_parameters # not yet tested + # - avoid_shadowing_type_parameters # not yet tested + - avoid_single_cascade_in_expression_statements + - avoid_slow_async_io + - avoid_types_as_parameter_names + # - avoid_types_on_closure_parameters # conflicts with always_specify_types + # - avoid_unnecessary_containers # not yet tested + - avoid_unused_constructor_parameters + - avoid_void_async + # - avoid_web_libraries_in_flutter # not yet tested - await_only_futures + - camel_case_extensions - camel_case_types + - cancel_subscriptions # - cascade_invocations # not yet tested - # - constant_identifier_names # https://github.com/dart-lang/linter/issues/204 + # - close_sinks # not reliable enough + # - comment_references # blocked on https://github.com/flutter/flutter/issues/20765 + # - constant_identifier_names # needs an opt-out https://github.com/dart-lang/linter/issues/204 + - control_flow_in_finally + # - curly_braces_in_flow_control_structures # not yet tested + # - diagnostic_describe_all_properties # not yet tested - directives_ordering - empty_catches - empty_constructor_bodies + - empty_statements + # - file_names # not yet tested + - flutter_style_todos + - hash_and_equals - implementation_imports + # - invariant_booleans # too many false positives: https://github.com/dart-lang/linter/issues/811 + - iterable_contains_unrelated_type # - join_return_with_assignment # not yet tested - library_names - library_prefixes + # - lines_longer_than_80_chars # not yet tested + - list_remove_unrelated_type + # - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/sdk/issues/34181 + # - missing_whitespace_between_adjacent_strings # not yet tested + - no_adjacent_strings_in_list + - no_duplicate_case_values + # - no_logic_in_create_state # not yet tested + # - no_runtimeType_toString # not yet tested - non_constant_identifier_names + # - null_closures # not yet tested # - omit_local_variable_types # opposite of always_specify_types # - one_member_abstracts # too many false positives # - only_throw_errors # https://github.com/flutter/flutter/issues/5792 - overridden_fields - package_api_docs + - package_names - package_prefixed_library_names # - parameter_assignments # we do this commonly - prefer_adjacent_string_concatenation + - prefer_asserts_in_initializer_lists + # - prefer_asserts_with_message # not yet tested - prefer_collection_literals - # - prefer_conditional_assignment # not yet tested + - prefer_conditional_assignment - prefer_const_constructors + - prefer_const_constructors_in_immutables + - prefer_const_declarations + - prefer_const_literals_to_create_immutables # - prefer_constructors_over_static_methods # not yet tested - prefer_contains + # - prefer_double_quotes # opposite of prefer_single_quotes - prefer_equal_for_default_values # - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods - # - prefer_final_fields # https://github.com/dart-lang/linter/issues/506 + # - prefer_final_fields + # - prefer_final_in_for_each # - prefer_final_locals - # - prefer_foreach # not yet tested + - prefer_for_elements_to_map_fromIterable + - prefer_foreach # - prefer_function_declarations_over_variables # not yet tested + - prefer_generic_function_type_aliases + - prefer_if_elements_to_conditional_expressions + - prefer_if_null_operators - prefer_initializing_formals + - prefer_inlined_adds + # - prefer_int_literals # not yet tested # - prefer_interpolation_to_compose_strings # not yet tested - prefer_is_empty - prefer_is_not_empty + - prefer_is_not_operator + - prefer_iterable_whereType + # - prefer_mixin # https://github.com/dart-lang/language/issues/32 + # - prefer_null_aware_operators # disable until NNBD, see https://github.com/flutter/flutter/pull/32711#issuecomment-492930932 + # - prefer_relative_imports # not yet tested + - prefer_single_quotes + - prefer_spread_collections + - prefer_typing_uninitialized_variables - prefer_void_to_null - # - recursive_getters # https://github.com/dart-lang/linter/issues/452 + # - provide_deprecation_message # not yet tested + # - public_member_api_docs # enabled on a case-by-case basis; see e.g. packages/analysis_options.yaml + - recursive_getters - slash_for_doc_comments + # - sort_child_properties_last # not yet tested - sort_constructors_first + - sort_pub_dependencies - sort_unnamed_constructors_first - # - super_goes_last + - test_types_in_equals + - throw_in_finally # - type_annotate_public_apis # subset of always_specify_types - type_init_formals - # - unawaited_futures # https://github.com/flutter/flutter/issues/5793 + # - unawaited_futures # too many false positives + # - unnecessary_await_in_return # not yet tested - unnecessary_brace_in_string_interps - unnecessary_const + # - unnecessary_final # conflicts with prefer_final_locals - unnecessary_getters_setters - # - unnecessary_lambdas # https://github.com/dart-lang/linter/issues/498 + # - unnecessary_lambdas # has false positives: https://github.com/dart-lang/linter/issues/498 - unnecessary_new - unnecessary_null_aware_assignments - unnecessary_null_in_if_null_operators - # - unnecessary_overrides # https://github.com/dart-lang/linter/issues/626 and https://github.com/dart-lang/linter/issues/627 + - unnecessary_overrides + - unnecessary_parenthesis - unnecessary_statements + - unnecessary_string_interpolations - unnecessary_this + - unrelated_type_equality_checks + # - unsafe_html # not yet tested + - use_full_hex_values_for_flutter_colors + # - use_function_type_syntax_for_parameters # not yet tested + # - use_key_in_widget_constructors # not yet tested - use_rethrow_when_possible # - use_setters_to_change_properties # not yet tested - # - use_string_buffers # https://github.com/dart-lang/linter/pull/664 + # - use_string_buffers # has false positives: https://github.com/dart-lang/sdk/issues/34182 # - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review - - # === pub rules === - - package_names - - # === doc rules === - # - public_member_api_docs + - valid_regexps + - void_checks \ No newline at end of file diff --git a/example/.gitignore b/example/.gitignore index 2ddde2a..1ba9c33 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -24,50 +24,20 @@ **/doc/api/ .dart_tool/ .flutter-plugins +.flutter-plugins-dependencies .packages .pub-cache/ .pub/ /build/ -# Android related -**/android/**/gradle-wrapper.jar -**/android/.gradle -**/android/captures/ -**/android/gradlew -**/android/gradlew.bat -**/android/local.properties -**/android/**/GeneratedPluginRegistrant.java +# Web related +lib/generated_plugin_registrant.dart -# iOS/XCode related -**/ios/**/*.mode1v3 -**/ios/**/*.mode2v3 -**/ios/**/*.moved-aside -**/ios/**/*.pbxuser -**/ios/**/*.perspectivev3 -**/ios/**/*sync/ -**/ios/**/.sconsign.dblite -**/ios/**/.tags* -**/ios/**/.vagrant/ -**/ios/**/DerivedData/ -**/ios/**/Icon? -**/ios/**/Pods/ -**/ios/**/.symlinks/ -**/ios/**/profile -**/ios/**/xcuserdata -**/ios/.generated/ -**/ios/Flutter/App.framework -**/ios/Flutter/Flutter.framework -**/ios/Flutter/Generated.xcconfig -**/ios/Flutter/app.flx -**/ios/Flutter/app.zip -**/ios/Flutter/flutter_assets/ -**/ios/Flutter/flutter_export_environment.sh -**/ios/ServiceDefinitions.json -**/ios/Runner/GeneratedPluginRegistrant.* +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json # Exceptions to above rules. -!**/ios/**/default.mode1v3 -!**/ios/**/default.mode2v3 -!**/ios/**/default.pbxuser -!**/ios/**/default.perspectivev3 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml old mode 100644 new mode 100755 index 45f730b..81dd0eb --- a/example/analysis_options.yaml +++ b/example/analysis_options.yaml @@ -1,40 +1,4 @@ -# Defines a default set of lint rules enforced for -# projects at Google. For details and rationale, -# see https://github.com/dart-lang/pedantic#enabled-lints. -include: package:pedantic/analysis_options.yaml +# Take our settings from the repo's main analysis_options.yaml file, but include +# an additional rule to validate that public members are documented. -analyzer: - strong-mode: - implicit-casts: false - # implicit-dynamic: false - -linter: - rules: - - iterable_contains_unrelated_type - - list_remove_unrelated_type - - test_types_in_equals - - unrelated_type_equality_checks - - valid_regexps - - annotate_overrides - - hash_and_equals - - prefer_is_not_empty - - avoid_empty_else - - cancel_subscriptions - - close_sinks - - always_declare_return_types - - camel_case_types - - empty_constructor_bodies - - avoid_init_to_null - # - constant_identifier_names - - one_member_abstracts - - slash_for_doc_comments - - sort_constructors_first - - unnecessary_brace_in_string_interps - - # === doc rules === - # - public_member_api_docs - - # ignore specify types - # - always_specify_types - # ignore const for now - # - prefer_const_constructors +include: ../analysis_options.yaml diff --git a/example/lib/main.dart b/example/lib/main.dart index 8a145a2..8dc1bb2 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -191,7 +191,7 @@ class _HomeState extends State { } void _showTips(String title, String content) { - showDialog( + showDialog( context: context, builder: (BuildContext context) { return AlertDialog( diff --git a/lib/src/tencent.dart b/lib/src/tencent.dart index 301bd04..55ccb48 100644 --- a/lib/src/tencent.dart +++ b/lib/src/tencent.dart @@ -29,7 +29,7 @@ class Tencent { static const String _METHOD_SHAREWEBPAGE = 'shareWebpage'; static const String _METHOD_ONLOGINRESP = 'onLoginResp'; - static const String _METHOD_ONSHARERESP = "onShareResp"; + static const String _METHOD_ONSHARERESP = 'onShareResp'; static const String _ARGUMENT_KEY_APPID = 'appId'; static const String _ARGUMENT_KEY_UNIVERSALLINK = 'universalLink'; @@ -47,24 +47,19 @@ class Tencent { static const String _SCHEME_FILE = 'file'; - final MethodChannel _channel = - const MethodChannel('v7lin.github.io/tencent_kit'); + final MethodChannel _channel = const MethodChannel('v7lin.github.io/tencent_kit'); - final StreamController _loginRespStreamController = - StreamController.broadcast(); + final StreamController _loginRespStreamController = StreamController.broadcast(); - final StreamController _shareRespStreamController = - StreamController.broadcast(); + final StreamController _shareRespStreamController = StreamController.broadcast(); Future _handleMethod(MethodCall call) async { switch (call.method) { case _METHOD_ONLOGINRESP: - _loginRespStreamController.add( - TencentLoginResp.fromJson(call.arguments as Map)); + _loginRespStreamController.add(TencentLoginResp.fromJson(call.arguments as Map)); break; case _METHOD_ONSHARERESP: - _shareRespStreamController.add( - TencentShareResp.fromJson(call.arguments as Map)); + _shareRespStreamController.add(TencentShareResp.fromJson(call.arguments as Map)); break; } } @@ -74,14 +69,13 @@ class Tencent { @required String appId, String universalLink, }) { - assert(appId != null && appId.isNotEmpty); + assert(appId?.isNotEmpty ?? false); assert(!Platform.isIOS || universalLink == null); - return _channel.invokeMethod( + return _channel.invokeMethod( _METHOD_REGISTERAPP, { _ARGUMENT_KEY_APPID: appId, - if (universalLink?.isNotEmpty ?? false) - _ARGUMENT_KEY_UNIVERSALLINK: universalLink, + if (universalLink?.isNotEmpty ?? false) _ARGUMENT_KEY_UNIVERSALLINK: universalLink, }, ); } @@ -98,20 +92,20 @@ class Tencent { /// 检查QQ是否已安装 Future isQQInstalled() { - return _channel.invokeMethod(_METHOD_ISQQINSTALLED); + return _channel.invokeMethod(_METHOD_ISQQINSTALLED); } /// 检查QQ是否已安装 Future isTIMInstalled() { - return _channel.invokeMethod(_METHOD_ISTIMINSTALLED); + return _channel.invokeMethod(_METHOD_ISTIMINSTALLED); } /// 登录 Future login({ @required List scope, }) { - assert(scope != null && scope.isNotEmpty); - return _channel.invokeMethod( + assert(scope?.isNotEmpty ?? false); + return _channel.invokeMethod( _METHOD_LOGIN, { _ARGUMENT_KEY_SCOPE: scope.join(','), @@ -121,7 +115,7 @@ class Tencent { /// 登出 Future logout() { - return _channel.invokeMethod(_METHOD_LOGOUT); + return _channel.invokeMethod(_METHOD_LOGOUT); } /// 用户信息 @@ -131,24 +125,19 @@ class Tencent { @required String openid, @required String accessToken, }) { - assert(appId != null && appId.isNotEmpty); - assert(openid != null && openid.isNotEmpty); - assert(accessToken != null && accessToken.isNotEmpty); - return HttpClient() - .getUrl(Uri.parse( - 'https://graph.qq.com/user/get_user_info?access_token=$accessToken&oauth_consumer_key=$appId&openid=$openid')) - .then((HttpClientRequest request) { + assert(appId?.isNotEmpty ?? false); + assert(openid?.isNotEmpty ?? false); + assert(accessToken?.isNotEmpty ?? false); + return HttpClient().getUrl(Uri.parse('https://graph.qq.com/user/get_user_info?access_token=$accessToken&oauth_consumer_key=$appId&openid=$openid')).then((HttpClientRequest request) { return request.close(); }).then((HttpClientResponse response) async { if (response.statusCode == HttpStatus.ok) { ContentType contentType = response.headers.contentType; Encoding encoding = Encoding.getByName(contentType?.charset) ?? utf8; String content = await encoding.decodeStream(response); - return TencentUserInfoResp.fromJson( - json.decode(content) as Map); + return TencentUserInfoResp.fromJson(json.decode(content) as Map); } - throw HttpException( - 'HttpResponse statusCode: ${response.statusCode}, reasonPhrase: ${response.reasonPhrase}.'); + throw HttpException('HttpResponse statusCode: ${response.statusCode}, reasonPhrase: ${response.reasonPhrase}.'); }); } @@ -158,11 +147,8 @@ class Tencent { @required String accessToken, String unionid = '1', }) { - assert(accessToken != null && accessToken.isNotEmpty); - return HttpClient() - .getUrl(Uri.parse( - 'https://graph.qq.com/oauth2.0/me?access_token=$accessToken&unionid=$unionid')) - .then((HttpClientRequest request) { + assert(accessToken?.isNotEmpty ?? false); + return HttpClient().getUrl(Uri.parse('https://graph.qq.com/oauth2.0/me?access_token=$accessToken&unionid=$unionid')).then((HttpClientRequest request) { return request.close(); }).then((HttpClientResponse response) async { if (response.statusCode == HttpStatus.ok) { @@ -174,12 +160,10 @@ class Tencent { Match match = exp.firstMatch(callback); if (match.groupCount == 1) { String content = match.group(1); - return TencentUnionidResp.fromJson( - json.decode(content) as Map); + return TencentUnionidResp.fromJson(json.decode(content) as Map); } } - throw HttpException( - 'HttpResponse statusCode: ${response.statusCode}, reasonPhrase: ${response.reasonPhrase}.'); + throw HttpException('HttpResponse statusCode: ${response.statusCode}, reasonPhrase: ${response.reasonPhrase}.'); }); } @@ -191,22 +175,16 @@ class Tencent { Uri videoUri, }) { assert(scene == TencentScene.SCENE_QZONE); - assert((summary != null && summary.isNotEmpty) || - (imageUris != null && imageUris.isNotEmpty) || - (videoUri != null && videoUri.isScheme(_SCHEME_FILE))); - if (imageUris != null && imageUris.isNotEmpty) { - imageUris.forEach((Uri imageUri) { - assert(imageUri != null && imageUri.isScheme(_SCHEME_FILE)); - }); - } - return _channel.invokeMethod( + assert((summary?.isNotEmpty ?? false) || + (imageUris?.isNotEmpty ?? false) || + (videoUri != null && videoUri.isScheme(_SCHEME_FILE)) || + ((imageUris?.isNotEmpty ?? false) && imageUris.every((Uri element) => element != null && element.isScheme(_SCHEME_FILE)))); + return _channel.invokeMethod( _METHOD_SHAREMOOD, { _ARGUMENT_KEY_SCENE: scene, if (summary?.isNotEmpty ?? false) _ARGUMENT_KEY_SUMMARY: summary, - if (imageUris?.isNotEmpty ?? false) - _ARGUMENT_KEY_IMAGEURIS: - imageUris.map((Uri imageUri) => imageUri.toString()).toList(), + if (imageUris?.isNotEmpty ?? false) _ARGUMENT_KEY_IMAGEURIS: imageUris.map((Uri imageUri) => imageUri.toString()).toList(), if (videoUri != null) _ARGUMENT_KEY_VIDEOURI: videoUri.toString(), }, ); @@ -218,8 +196,8 @@ class Tencent { @required String summary, }) { assert(scene == TencentScene.SCENE_QQ); - assert(summary != null && summary.isNotEmpty); - return _channel.invokeMethod( + assert(summary?.isNotEmpty ?? false); + return _channel.invokeMethod( _METHOD_SHARETEXT, { _ARGUMENT_KEY_SCENE: scene, @@ -237,7 +215,7 @@ class Tencent { }) { assert(scene == TencentScene.SCENE_QQ); assert(imageUri != null && imageUri.isScheme(_SCHEME_FILE)); - return _channel.invokeMethod( + return _channel.invokeMethod( _METHOD_SHAREIMAGE, { _ARGUMENT_KEY_SCENE: scene, @@ -260,10 +238,10 @@ class Tencent { int extInt = TencentQZoneFlag.DEFAULT, }) { assert(scene == TencentScene.SCENE_QQ); - assert(title != null && title.isNotEmpty); - assert(musicUrl != null && musicUrl.isNotEmpty); - assert(targetUrl != null && targetUrl.isNotEmpty); - return _channel.invokeMethod( + assert(title?.isNotEmpty ?? false); + assert(musicUrl?.isNotEmpty ?? false); + assert(targetUrl?.isNotEmpty ?? false); + return _channel.invokeMethod( _METHOD_SHAREMUSIC, { _ARGUMENT_KEY_SCENE: scene, @@ -288,9 +266,9 @@ class Tencent { String appName, int extInt = TencentQZoneFlag.DEFAULT, }) { - assert(title != null && title.isNotEmpty); - assert(targetUrl != null && targetUrl.isNotEmpty); - return _channel.invokeMethod( + assert(title?.isNotEmpty ?? false); + assert(targetUrl?.isNotEmpty ?? false); + return _channel.invokeMethod( _METHOD_SHAREWEBPAGE, { _ARGUMENT_KEY_SCENE: scene,