From 45d11faa1f507ece216ed88b54bf9c8a5c18a072 Mon Sep 17 00:00:00 2001 From: datang Date: Thu, 26 May 2022 15:54:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E5=80=92?= =?UTF-8?q?=E8=AE=A1=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main.dart | 2 + lib/new_ui/auth/code_message_page.dart | 10 +++-- lib/new_ui/auth/forgot_psd_page.dart | 5 ++- lib/new_ui/auth/forgot_set_psd_page.dart | 8 +++- lib/new_ui/auth/other_login_page.dart | 11 ++--- lib/provider/app_provider.dart | 5 ++- lib/provider/timer_provider.dart | 30 +++++++++++++ lib/tools/user_tool.dart | 5 +++ lib/ui/widgets/common/bee_picker_box.dart | 55 +++++++++++++++-------- pubspec.lock | 9 +++- 10 files changed, 108 insertions(+), 32 deletions(-) create mode 100644 lib/provider/timer_provider.dart diff --git a/lib/main.dart b/lib/main.dart index 734b975..9ac93ae 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,6 +4,7 @@ import 'package:aku_new_community_manager/provider/app_provider.dart'; import 'package:aku_new_community_manager/provider/data_provider.dart'; import 'package:aku_new_community_manager/provider/message_provider.dart'; +import 'package:aku_new_community_manager/provider/timer_provider.dart'; import 'package:aku_new_community_manager/provider/user_provider.dart'; import 'package:aku_new_community_manager/style/apptheme.dart'; import 'package:aku_new_community_manager/tools/user_tool.dart'; @@ -77,6 +78,7 @@ class MyApp extends StatelessWidget { ChangeNotifierProvider(create: (context) => AppProvider()), ChangeNotifierProvider(create: (context) => MessageProvider()), ChangeNotifierProvider(create: (context) => DataProvider()), + ChangeNotifierProvider(create: (context) => ClockTimerProvider()), ], child: GestureDetector( onTap: () { diff --git a/lib/new_ui/auth/code_message_page.dart b/lib/new_ui/auth/code_message_page.dart index 78b1933..054a166 100644 --- a/lib/new_ui/auth/code_message_page.dart +++ b/lib/new_ui/auth/code_message_page.dart @@ -5,9 +5,12 @@ import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:provider/provider.dart'; import 'package:sms_autofill/sms_autofill.dart'; import 'package:velocity_x/velocity_x.dart'; +import '../../provider/timer_provider.dart'; + class CodeMessagePage extends StatefulWidget { final String tel; @@ -38,6 +41,7 @@ class _CodeMessagePageState extends State { @override Widget build(BuildContext context) { + ClockTimerProvider clockTimer = Provider.of(context); return AkuScaffold( title: '', body: SafeArea( @@ -115,14 +119,14 @@ class _CodeMessagePageState extends State { .communityModel!.id); if (base.success) { _errorMessage = null; - UserTool.appProvider.startTimer(); + clockTimer.startTimer(); } else { BotToast.showText(text: base.msg); } }, - child: (UserTool.appProvider.second >= 60 + child: (clockTimer.second >= 60 ? '重新发送验证码' - : '${UserTool.appProvider.second}秒后可重新发送') + : '${clockTimer.second}秒后可重新发送') .text .size(28.sp) .color(Color(0xFF5096F1)) diff --git a/lib/new_ui/auth/forgot_psd_page.dart b/lib/new_ui/auth/forgot_psd_page.dart index 4228912..ac5cb72 100644 --- a/lib/new_ui/auth/forgot_psd_page.dart +++ b/lib/new_ui/auth/forgot_psd_page.dart @@ -8,8 +8,10 @@ import 'package:common_utils/common_utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; +import '../../provider/timer_provider.dart'; import 'forgot_set_psd_page.dart'; class ForgotPsdPage extends StatefulWidget { @@ -30,6 +32,7 @@ class _ForgotPsdPageState extends State { @override Widget build(BuildContext context) { + ClockTimerProvider clockTimer = Provider.of(context); return AkuScaffold( title: '', backgroundColor: Colors.white, @@ -84,7 +87,7 @@ class _ForgotPsdPageState extends State { Get.to(() => ForgotSetPsdPage( tel: _telController.text, )); - UserTool.appProvider.startTimer(); + clockTimer.startTimer(); } else { BotToast.showText(text: base.msg); } diff --git a/lib/new_ui/auth/forgot_set_psd_page.dart b/lib/new_ui/auth/forgot_set_psd_page.dart index c536cc8..9c4306a 100644 --- a/lib/new_ui/auth/forgot_set_psd_page.dart +++ b/lib/new_ui/auth/forgot_set_psd_page.dart @@ -10,8 +10,11 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; +import '../../provider/timer_provider.dart'; + class ForgotSetPsdPage extends StatefulWidget { final String tel; @@ -52,6 +55,7 @@ class _ForgotSetPsdPageState extends State { @override Widget build(BuildContext context) { + ClockTimerProvider clockTimer = Provider.of(context); return AkuScaffold( title: '', backgroundColor: Colors.white, @@ -129,7 +133,7 @@ class _ForgotSetPsdPageState extends State { Get.to(() => ForgotSetPsdPage( tel: widget.tel, )); - UserTool.appProvider.startTimer(); + clockTimer.startTimer(); } else { BotToast.showText(text: base.msg); } @@ -137,7 +141,7 @@ class _ForgotSetPsdPageState extends State { child: Row( mainAxisSize: MainAxisSize.min, children: [ - '｜${UserTool.appProvider.second < 60 ? '${UserTool.appProvider.second}秒后重新获取' : '获取验证码'}' + '｜${clockTimer.second < 60 ? '${clockTimer.second}秒后重新获取' : '获取验证码'}' .text .size(28.sp) .color(Color(0xFF5096F1)) diff --git a/lib/new_ui/auth/other_login_page.dart b/lib/new_ui/auth/other_login_page.dart index 66bc147..f88cc16 100644 --- a/lib/new_ui/auth/other_login_page.dart +++ b/lib/new_ui/auth/other_login_page.dart @@ -3,6 +3,7 @@ import 'package:aku_new_community_manager/new_ui/auth/widget/login_button_widget import 'package:aku_new_community_manager/new_ui/auth/widget/psd_textfield.dart'; import 'package:aku_new_community_manager/new_ui/auth/widget/tel_textfield.dart'; import 'package:aku_new_community_manager/provider/app_provider.dart'; +import 'package:aku_new_community_manager/provider/timer_provider.dart'; import 'package:aku_new_community_manager/tools/user_tool.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:bot_toast/bot_toast.dart'; @@ -154,7 +155,7 @@ class _OtherLoginPageState extends State { } Widget _verificationView() { - AppProvider appProvider = Provider.of(context); + ClockTimerProvider clockTimer = Provider.of(context); return ListView( padding: EdgeInsets.symmetric(horizontal: 32.w), children: [ @@ -171,7 +172,7 @@ class _OtherLoginPageState extends State { ), 100.w.heightBox, LoginButtonWidget( - onTap: UserTool.appProvider.second < 60 + onTap: clockTimer.second < 60 ? () {} : () async { var check = checkInput(); @@ -184,13 +185,13 @@ class _OtherLoginPageState extends State { .communityModel!.id); if (base.success) { Get.to(() => CodeMessagePage(tel: _tel.text)); - appProvider.startTimer(); + clockTimer.startTimer(); } else { BotToast.showText(text: base.msg); } }, - text: appProvider.timerStart - ? '${appProvider.second}秒后重新获取' + text: clockTimer.timerStart + ? '${clockTimer.second}秒后重新获取' : '获取验证码'), 24.w.heightBox, Row( diff --git a/lib/provider/app_provider.dart b/lib/provider/app_provider.dart index fce1dee..8bd19d5 100644 --- a/lib/provider/app_provider.dart +++ b/lib/provider/app_provider.dart @@ -149,7 +149,7 @@ class AppProvider extends ChangeNotifier { } ///登录页验证码计时器 - int second = 60; + /*int second = 60; bool timerStart = false; Timer? timer; @@ -171,5 +171,6 @@ class AppProvider extends ChangeNotifier { timer?.cancel(); timer = null; notifyListeners(); - } + }*/ + notifyListeners(); } diff --git a/lib/provider/timer_provider.dart b/lib/provider/timer_provider.dart new file mode 100644 index 0000000..aa33dd8 --- /dev/null +++ b/lib/provider/timer_provider.dart @@ -0,0 +1,30 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; + +class ClockTimerProvider extends ChangeNotifier{ + ///登录页验证码计时器 + int second = 60; + bool timerStart = false; + Timer? timer; + + void startTimer() { + timerStart = true; + timer = Timer.periodic(Duration(seconds: 1), (timer) { + if (second > 0) { + second--; + notifyListeners(); + } else { + stopTimer(); + } + }); + } + + void stopTimer() { + second = 60; + timerStart = false; + timer?.cancel(); + timer = null; + notifyListeners(); + } +} \ No newline at end of file diff --git a/lib/tools/user_tool.dart b/lib/tools/user_tool.dart index 195ad82..4c9ca0d 100644 --- a/lib/tools/user_tool.dart +++ b/lib/tools/user_tool.dart @@ -3,6 +3,7 @@ import 'package:aku_new_community_manager/provider/app_provider.dart'; import 'package:aku_new_community_manager/provider/data_provider.dart'; import 'package:aku_new_community_manager/provider/message_provider.dart'; +import 'package:aku_new_community_manager/provider/timer_provider.dart'; import 'package:aku_new_community_manager/provider/user_provider.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; @@ -25,5 +26,9 @@ class UserTool { static DataProvider get dataProvider => Provider.of(Get.context!, listen: false); + ///验证码倒计时 + static ClockTimerProvider get clockProvider => + Provider.of(Get.context!, listen: false); + UserTool(); } diff --git a/lib/ui/widgets/common/bee_picker_box.dart b/lib/ui/widgets/common/bee_picker_box.dart index 0d7d666..dd03efb 100644 --- a/lib/ui/widgets/common/bee_picker_box.dart +++ b/lib/ui/widgets/common/bee_picker_box.dart @@ -25,7 +25,10 @@ class BeePickerBox extends StatelessWidget { // height: 48.w, child: TextButton( onPressed: onPressed, - child: Text(title,style: TextStyle(color: Colors.black.withOpacity(0.85)),), + child: Text( + title, + style: TextStyle(color: Colors.black.withOpacity(0.85)), + ), ), ); } @@ -41,26 +44,42 @@ class BeePickerBox extends StatelessWidget { children: [ SizedBox( height: 88.w, - child: NavigationToolbar( - leading: TextButton( - onPressed: () => Navigator.pop(context), - child: Text( - '取消', + child: Row( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + TextButton( + onPressed: () => Navigator.pop(context), + child: Text( + '取消', + style: TextStyle( + color: Colors.black, + fontSize: 28.sp, + ), + ), ), - ), - middle: Text( - title ?? '', - style: TextStyle( - color: kTextPrimaryColor, - fontSize: 28.sp, + Spacer(), + Container( + padding: EdgeInsets.all(25.w), + child: Text( + title ?? '', + style: TextStyle( + color: kTextPrimaryColor, + fontSize: 28.sp, + ), + ), ), - ), - trailing: TextButton( - onPressed: onPressed, - child: Text( - '${confirmString}', + Spacer(), + TextButton( + onPressed: onPressed, + child: Text( + '${confirmString}', + style: TextStyle( + color: Colors.black, + fontSize: 28.sp, + ), + ), ), - ), + ], ), ), BeeDivider.horizontal(), diff --git a/pubspec.lock b/pubspec.lock index 7036f2a..b6a3240 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -618,6 +618,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: @@ -958,7 +965,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" time: dependency: transitive description: From c368e2bd4c57f5ac49f0163d44a576ff5c8f5aee Mon Sep 17 00:00:00 2001 From: datang Date: Thu, 26 May 2022 16:05:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=BC=E5=8C=85=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main.dart | 3 - lib/new_ui/auth/code_message_page.dart | 1 - lib/new_ui/auth/forgot_psd_page.dart | 1 - lib/new_ui/auth/forgot_set_psd_page.dart | 1 - pubspec.lock | 110 +++++++++++------------ 5 files changed, 55 insertions(+), 61 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 2e71017..2efac91 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,7 +2,6 @@ // Project imports: import 'package:aku_new_community_manager/provider/app_provider.dart'; -import 'package:aku_new_community_manager/provider/clock_timer_provider.dart'; import 'package:aku_new_community_manager/provider/data_provider.dart'; import 'package:aku_new_community_manager/provider/message_provider.dart'; import 'package:aku_new_community_manager/provider/timer_provider.dart'; @@ -12,8 +11,6 @@ import 'package:aku_new_community_manager/tools/user_tool.dart'; import 'package:aku_new_community_manager/ui/splash/splash_page.dart'; import 'package:aku_new_community_manager/utils/dev_util.dart'; import 'package:aku_new_community_manager/utils/jpush_message_parse.dart'; -import 'package:aku_new_community_manager/utils/websocket/fier_dialog.dart'; -import 'package:aku_new_community_manager/utils/websocket/web_socket_util.dart'; // Package imports: import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/new_ui/auth/code_message_page.dart b/lib/new_ui/auth/code_message_page.dart index 2eec791..0733960 100644 --- a/lib/new_ui/auth/code_message_page.dart +++ b/lib/new_ui/auth/code_message_page.dart @@ -1,5 +1,4 @@ import 'package:aku_new_community_manager/new_ui/auth/sign_func.dart'; -import 'package:aku_new_community_manager/provider/clock_timer_provider.dart'; import 'package:aku_new_community_manager/tools/user_tool.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:bot_toast/bot_toast.dart'; diff --git a/lib/new_ui/auth/forgot_psd_page.dart b/lib/new_ui/auth/forgot_psd_page.dart index 0df3984..ac5cb72 100644 --- a/lib/new_ui/auth/forgot_psd_page.dart +++ b/lib/new_ui/auth/forgot_psd_page.dart @@ -1,7 +1,6 @@ import 'package:aku_new_community_manager/new_ui/auth/sign_func.dart'; import 'package:aku_new_community_manager/new_ui/auth/widget/login_button_widget.dart'; import 'package:aku_new_community_manager/new_ui/auth/widget/tel_textfield.dart'; -import 'package:aku_new_community_manager/provider/clock_timer_provider.dart'; import 'package:aku_new_community_manager/tools/user_tool.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:bot_toast/bot_toast.dart'; diff --git a/lib/new_ui/auth/forgot_set_psd_page.dart b/lib/new_ui/auth/forgot_set_psd_page.dart index 2d18ae6..9c4306a 100644 --- a/lib/new_ui/auth/forgot_set_psd_page.dart +++ b/lib/new_ui/auth/forgot_set_psd_page.dart @@ -3,7 +3,6 @@ import 'package:aku_new_community_manager/new_ui/auth/psd_verify.dart'; import 'package:aku_new_community_manager/new_ui/auth/sign_func.dart'; import 'package:aku_new_community_manager/new_ui/auth/widget/login_button_widget.dart'; import 'package:aku_new_community_manager/new_ui/auth/widget/psd_textfield.dart'; -import 'package:aku_new_community_manager/provider/clock_timer_provider.dart'; import 'package:aku_new_community_manager/tools/user_tool.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:bot_toast/bot_toast.dart'; diff --git a/pubspec.lock b/pubspec.lock index da02377..45a191d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "38.0.0" + version: "40.0.0" amap_flutter_base: dependency: "direct main" description: @@ -35,14 +35,14 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "3.4.1" + version: "4.1.0" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.3.1" async: dependency: transitive description: @@ -77,14 +77,14 @@ packages: name: bot_toast url: "https://pub.dartlang.org" source: hosted - version: "4.0.1" + version: "4.0.2" build: dependency: transitive description: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.2.1" + version: "2.3.0" build_config: dependency: transitive description: @@ -98,21 +98,21 @@ packages: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.1.0" build_resolvers: dependency: transitive description: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" + version: "2.0.8" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "2.1.8" + version: "2.1.11" build_runner_core: dependency: transitive description: @@ -133,14 +133,14 @@ packages: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "8.1.4" + version: "8.3.2" carousel_slider: dependency: "direct main" description: name: carousel_slider url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.1.1" characters: dependency: transitive description: @@ -217,14 +217,14 @@ packages: name: cross_file url: "https://pub.dartlang.org" source: hosted - version: "0.3.2" + version: "0.3.3+1" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.2" cupertino_icons: dependency: "direct main" description: @@ -238,21 +238,21 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.2.2" + version: "2.2.3" dartx: dependency: transitive description: name: dartx url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0" decimal: dependency: transitive description: name: decimal url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.0" device_info_plus: dependency: transitive description: @@ -273,7 +273,7 @@ packages: name: device_info_plus_macos url: "https://pub.dartlang.org" source: hosted - version: "2.2.2" + version: "2.2.3" device_info_plus_platform_interface: dependency: transitive description: @@ -357,7 +357,7 @@ packages: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.2.1" file: dependency: transitive description: @@ -371,7 +371,7 @@ packages: name: fixnum url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" flutter: dependency: "direct main" description: flutter @@ -390,7 +390,7 @@ packages: name: flutter_gen_core url: "https://pub.dartlang.org" source: hosted - version: "4.1.6" + version: "4.2.0" flutter_gen_runner: dependency: "direct dev" description: @@ -416,14 +416,14 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.6" flutter_rating_bar: dependency: "direct main" description: name: flutter_rating_bar url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.1" flutter_screenutil: dependency: "direct main" description: @@ -447,14 +447,14 @@ packages: name: frontend_server_client url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.3" get: dependency: "direct main" description: name: get url: "https://pub.dartlang.org" source: hosted - version: "4.6.1" + version: "4.6.5" glob: dependency: transitive description: @@ -489,7 +489,7 @@ packages: name: hive url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.1" hive_flutter: dependency: "direct main" description: @@ -503,7 +503,7 @@ packages: name: hive_generator url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.1.3" http: dependency: transitive description: @@ -524,7 +524,7 @@ packages: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.1" image_picker: dependency: "direct main" description: @@ -538,14 +538,14 @@ packages: name: image_picker_for_web url: "https://pub.dartlang.org" source: hosted - version: "2.1.6" + version: "2.1.8" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.4.4" + version: "2.5.0" import_sorter: dependency: "direct dev" description: @@ -589,14 +589,14 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.4.0" + version: "4.5.0" json_serializable: dependency: "direct dev" description: name: json_serializable url: "https://pub.dartlang.org" source: hosted - version: "6.1.5" + version: "6.2.0" logger: dependency: "direct main" description: @@ -638,7 +638,7 @@ packages: name: mime url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.2" nested: dependency: transitive description: @@ -729,49 +729,49 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.10" path_provider_android: dependency: transitive description: name: path_provider_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.12" + version: "2.0.14" path_provider_ios: dependency: transitive description: name: path_provider_ios url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.0.9" path_provider_linux: dependency: transitive description: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.5" + version: "2.1.6" path_provider_macos: dependency: transitive description: name: path_provider_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.6" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" path_provider_windows: dependency: transitive description: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.6" permission_handler: dependency: "direct main" description: @@ -876,7 +876,7 @@ packages: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" shelf_web_socket: dependency: transitive description: @@ -909,14 +909,14 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "1.2.1" + version: "1.2.2" source_helper: dependency: transitive description: name: source_helper url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" + version: "1.3.2" source_span: dependency: transitive description: @@ -1000,35 +1000,35 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.20" + version: "6.1.2" url_launcher_android: dependency: transitive description: name: url_launcher_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.15" + version: "6.0.17" url_launcher_ios: dependency: transitive description: name: url_launcher_ios url: "https://pub.dartlang.org" source: hosted - version: "6.0.15" + version: "6.0.17" url_launcher_linux: dependency: transitive description: name: url_launcher_linux url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" url_launcher_platform_interface: dependency: transitive description: @@ -1042,14 +1042,14 @@ packages: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" + version: "2.0.11" url_launcher_windows: dependency: transitive description: name: url_launcher_windows url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" vector_math: dependency: transitive description: @@ -1063,14 +1063,14 @@ packages: name: velocity_x url: "https://pub.dartlang.org" source: hosted - version: "3.4.0" + version: "3.5.0" vxstate: dependency: transitive description: name: vxstate url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.0" watcher: dependency: transitive description: @@ -1091,14 +1091,14 @@ packages: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.0" win32: dependency: transitive description: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.5.1" + version: "2.5.2" xdg_directories: dependency: transitive description: @@ -1119,7 +1119,7 @@ packages: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.1.1" sdks: - dart: ">=2.15.0 <3.0.0" - flutter: ">=2.8.0" + dart: ">=2.16.0 <3.0.0" + flutter: ">=2.10.0" From feb299a26950a61876a8e0a4cd1ea9f5e0439e59 Mon Sep 17 00:00:00 2001 From: datang Date: Thu, 26 May 2022 17:02:46 +0800 Subject: [PATCH 3/3] update --- pubspec.lock | 21 +++++++-------------- pubspec.yaml | 2 +- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 45a191d..b4fa5d0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -618,13 +618,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.3" meta: dependency: transitive description: @@ -736,7 +729,7 @@ packages: name: path_provider_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.14" + version: "2.0.12" path_provider_ios: dependency: transitive description: @@ -876,7 +869,7 @@ packages: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.2.0" shelf_web_socket: dependency: transitive description: @@ -965,7 +958,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.3" time: dependency: transitive description: @@ -1042,7 +1035,7 @@ packages: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.11" + version: "2.0.6" url_launcher_windows: dependency: transitive description: @@ -1063,7 +1056,7 @@ packages: name: velocity_x url: "https://pub.dartlang.org" source: hosted - version: "3.5.0" + version: "3.4.0" vxstate: dependency: transitive description: @@ -1121,5 +1114,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=2.16.0 <3.0.0" - flutter: ">=2.10.0" + dart: ">=2.15.0 <3.0.0" + flutter: ">=2.8.0" diff --git a/pubspec.yaml b/pubspec.yaml index f8fe6b5..8dc20eb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -52,7 +52,7 @@ dependencies: amap_flutter_base: ^3.0.0 permission_handler: ^6.1.1 - velocity_x: ^3.4.0 + velocity_x: 3.4.0 dotted_border: ^2.0.0-nullsafety.0 dio: ^4.0.0 # #谷歌崩溃分析