更新依赖至空安全

hmxc
张萌 4 years ago
parent 8215939dbd
commit 7c7d114d5c

@ -1,3 +1,3 @@
{ {
"flutterSdkVersion": "1.22.6" "flutterSdkVersion": "2.0.2"
} }

@ -1,3 +1,3 @@
{ {
"dart.flutterSdkPath": "/Users/zhangmeng/fvm/versions/1.22.6" "dart.flutterSdkPath": "/Users/zhangmeng/fvm/versions/2.0.2"
} }

@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
import 'package:amap_map_fluttify/amap_map_fluttify.dart'; import 'package:amap_map_fluttify/amap_map_fluttify.dart';
import 'package:bot_toast/bot_toast.dart'; import 'package:bot_toast/bot_toast.dart';
import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:jpush_flutter/jpush_flutter.dart'; import 'package:jpush_flutter/jpush_flutter.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -53,32 +54,37 @@ class MyApp extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MultiProvider( return MultiProvider(
providers: [ providers: [
ChangeNotifierProvider(create: (context) => UserProvider()), ChangeNotifierProvider(create: (context) => UserProvider()),
ChangeNotifierProvider(create: (context) => AppProvider()), ChangeNotifierProvider(create: (context) => AppProvider()),
ChangeNotifierProvider(create: (context) => FixProvider()), ChangeNotifierProvider(create: (context) => FixProvider()),
ChangeNotifierProvider(create: (context) => GreenManageProvider()), ChangeNotifierProvider(create: (context) => GreenManageProvider()),
ChangeNotifierProvider(create: (context) => InspectionManageProvider()), ChangeNotifierProvider(
ChangeNotifierProvider(create: (context) => GreenManageProvider()), create: (context) => InspectionManageProvider()),
ChangeNotifierProvider(create: (context) => InspectionManageProvider()), ChangeNotifierProvider(create: (context) => GreenManageProvider()),
ChangeNotifierProvider(create: (context) => AnouncementProvider()), ChangeNotifierProvider(
], create: (context) => InspectionManageProvider()),
child: GetMaterialApp( ChangeNotifierProvider(create: (context) => AnouncementProvider()),
title: '小蜜蜂管家',
home: SplashPage(),
builder: BotToastInit(),
navigatorObservers: [
BotToastNavigatorObserver(),
], ],
localizationsDelegates: [ child: ScreenUtilInit(
GlobalCupertinoLocalizations.delegate, designSize: Size(750, 1334),
GlobalMaterialLocalizations.delegate, builder: () {
GlobalWidgetsLocalizations.delegate, return GetMaterialApp(
], title: '小蜜蜂管家',
supportedLocales: [ home: SplashPage(),
const Locale('zh'), builder: BotToastInit(),
], navigatorObservers: [
), BotToastNavigatorObserver(),
); ],
localizationsDelegates: [
GlobalCupertinoLocalizations.delegate,
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
],
supportedLocales: [
const Locale('zh'),
],
);
}));
} }
} }

@ -143,8 +143,6 @@ class _HomePageState extends State<HomePage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final userProvider = Provider.of<UserProvider>(context); final userProvider = Provider.of<UserProvider>(context);
final _anouncementProvider = Provider.of<AnouncementProvider>(context); final _anouncementProvider = Provider.of<AnouncementProvider>(context);
ScreenUtil.init(context,
designSize: Size(750, 1334), allowFontScaling: true);
return AnnotatedRegion<SystemUiOverlayStyle>( return AnnotatedRegion<SystemUiOverlayStyle>(
child: Scaffold( child: Scaffold(
drawer: PersonalDraw(), drawer: PersonalDraw(),

@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
import 'package:aku_ui/aku_ui.dart'; import 'package:aku_ui/aku_ui.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart' hide Response;
import 'package:get/instance_manager.dart'; import 'package:get/instance_manager.dart';
// Project imports: // Project imports:

@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:aku_ui/common_widgets/aku_material_button.dart';
import 'package:bot_toast/bot_toast.dart'; import 'package:bot_toast/bot_toast.dart';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:get/get.dart'; import 'package:get/get.dart' hide Response;
import 'package:pin_input_text_field/pin_input_text_field.dart'; import 'package:pin_input_text_field/pin_input_text_field.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';

@ -51,8 +51,6 @@ class _SplashPageState extends State<SplashPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ScreenUtil.init(context,
designSize: Size(750, 1334), allowFontScaling: true);
return Scaffold( return Scaffold(
body: Center( body: Center(
child: Image.asset(R.ASSETS_PLACEHOLDER_WEBP), child: Image.asset(R.ASSETS_PLACEHOLDER_WEBP),

@ -624,6 +624,7 @@ class _DecorationManagerDetailStatePage
), ),
], ],
), ),
collapsed: null,
), ),
); );
}).toList(), }).toList(),

@ -3,11 +3,10 @@ import 'dart:io';
// Package imports: // Package imports:
import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/provider/user_provider.dart';
import 'package:aku_community_manager/ui/home/home_page.dart';
import 'package:aku_community_manager/ui/login/login_page.dart'; import 'package:aku_community_manager/ui/login/login_page.dart';
import 'package:bot_toast/bot_toast.dart'; import 'package:bot_toast/bot_toast.dart';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:get/get.dart'; import 'package:get/get.dart' hide Response, FormData, MultipartFile;
import 'package:power_logger/power_logger.dart'; import 'package:power_logger/power_logger.dart';
// Project imports: // Project imports:

@ -58,7 +58,7 @@ packages:
name: animator name: animator
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.2" version: "3.0.0"
args: args:
dependency: transitive dependency: transitive
description: description:
@ -72,7 +72,7 @@ packages:
name: async name: async
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.5.0-nullsafety.1" version: "2.5.0"
auto_size_text: auto_size_text:
dependency: transitive dependency: transitive
description: description:
@ -80,41 +80,48 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.0" version: "2.1.0"
auto_size_text_pk:
dependency: transitive
description:
name: auto_size_text_pk
url: "https://pub.flutter-io.cn"
source: hosted
version: "3.0.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.flutter-io.cn"
source: hosted source: hosted
version: "2.1.0-nullsafety.1" version: "2.1.0"
bot_toast: bot_toast:
dependency: "direct main" dependency: "direct main"
description: description:
name: bot_toast name: bot_toast
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.0.4" version: "4.0.1"
carousel_slider: carousel_slider:
dependency: "direct main" dependency: "direct main"
description: description:
name: carousel_slider name: carousel_slider
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.3.1" version: "4.0.0-nullsafety.0"
characters: characters:
dependency: transitive dependency: transitive
description: description:
name: characters name: characters
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
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.flutter-io.cn"
source: hosted source: hosted
version: "1.2.0-nullsafety.1" version: "1.2.0"
cli_util: cli_util:
dependency: transitive dependency: transitive
description: description:
@ -128,14 +135,14 @@ packages:
name: clock name: clock
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
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.flutter-io.cn"
source: hosted source: hosted
version: "1.15.0-nullsafety.3" version: "1.15.0"
colorize: colorize:
dependency: transitive dependency: transitive
description: description:
@ -149,14 +156,14 @@ packages:
name: common_utils name: common_utils
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.2.1" version: "2.0.2"
convert: convert:
dependency: transitive dependency: transitive
description: description:
name: convert name: convert
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.1" version: "3.0.0"
core_location_fluttify: core_location_fluttify:
dependency: transitive dependency: transitive
description: description:
@ -170,14 +177,14 @@ packages:
name: crypto name: crypto
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.5" version: "3.0.0"
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.flutter-io.cn"
source: hosted source: hosted
version: "1.0.0" version: "1.0.2"
dart_style: dart_style:
dependency: transitive dependency: transitive
description: description:
@ -191,7 +198,7 @@ packages:
name: decimal name: decimal
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.3.5" version: "1.0.0"
device_info: device_info:
dependency: transitive dependency: transitive
description: description:
@ -219,28 +226,28 @@ packages:
name: expandable name: expandable
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "4.1.4" version: "5.0.1"
extended_text: extended_text:
dependency: "direct main" dependency: "direct main"
description: description:
name: extended_text name: extended_text
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "4.0.0" version: "5.0.4"
extended_text_library: extended_text_library:
dependency: transitive dependency: transitive
description: description:
name: extended_text_library name: extended_text_library
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "4.0.1" version: "5.0.2"
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.flutter-io.cn"
source: hosted source: hosted
version: "1.2.0-nullsafety.1" version: "1.2.0"
file: file:
dependency: transitive dependency: transitive
description: description:
@ -292,14 +299,14 @@ packages:
name: flutter_rating_bar name: flutter_rating_bar
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.0.1+1" version: "4.0.0"
flutter_screenutil: flutter_screenutil:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_screenutil name: flutter_screenutil
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.2.0" version: "5.0.0-nullsafety.11"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter
@ -323,7 +330,7 @@ packages:
name: get name: get
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.15.0" version: "4.0.0-nullsafety.2"
glob: glob:
dependency: transitive dependency: transitive
description: description:
@ -351,7 +358,7 @@ packages:
name: hive name: hive
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.4.4+1" version: "1.6.0-nullsafety.2"
hive_flutter: hive_flutter:
dependency: "direct main" dependency: "direct main"
description: description:
@ -400,7 +407,7 @@ packages:
name: intl name: intl
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.16.1" version: "0.17.0"
io: io:
dependency: transitive dependency: transitive
description: description:
@ -411,9 +418,11 @@ packages:
jpush_flutter: jpush_flutter:
dependency: "direct main" dependency: "direct main"
description: description:
name: jpush_flutter path: "."
url: "https://pub.flutter-io.cn" ref: HEAD
source: hosted resolved-ref: c713c4be12073302b6f1b5c7a71199046a3ee47c
url: "http://159.75.73.143:8080/third_packages/jpush_flutter"
source: git
version: "0.6.3" version: "0.6.3"
js: js:
dependency: transitive dependency: transitive
@ -421,35 +430,35 @@ packages:
name: js name: js
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.6.2" version: "0.6.3"
logger: logger:
dependency: "direct main" dependency: "direct main"
description: description:
name: logger name: logger
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.9.4" version: "1.0.0"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
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.flutter-io.cn"
source: hosted source: hosted
version: "1.3.0-nullsafety.3" version: "1.3.0"
nested: nested:
dependency: transitive dependency: transitive
description: description:
name: nested name: nested
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.0.4" version: "1.0.0"
node_interop: node_interop:
dependency: transitive dependency: transitive
description: description:
@ -484,7 +493,7 @@ packages:
name: path name: path
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.8.0-nullsafety.1" version: "1.8.0"
path_provider: path_provider:
dependency: transitive dependency: transitive
description: description:
@ -533,14 +542,14 @@ packages:
name: pin_input_text_field name: pin_input_text_field
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.1.1" version: "4.0.0"
platform: platform:
dependency: transitive dependency: transitive
description: description:
name: platform name: platform
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.2.1" version: "3.0.0"
plugin_platform_interface: plugin_platform_interface:
dependency: transitive dependency: transitive
description: description:
@ -554,7 +563,7 @@ packages:
name: power_logger name: power_logger
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.1.1" version: "0.1.3"
pretty_json: pretty_json:
dependency: transitive dependency: transitive
description: description:
@ -568,7 +577,7 @@ packages:
name: provider name: provider
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "4.3.2+2" version: "5.0.0"
pub_semver: pub_semver:
dependency: transitive dependency: transitive
description: description:
@ -582,14 +591,14 @@ packages:
name: qr_code_scanner name: qr_code_scanner
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.3.4" version: "0.4.0-nullsafety.0"
rational: rational:
dependency: transitive dependency: transitive
description: description:
name: rational name: rational
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.3.8" version: "1.0.0"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@ -601,56 +610,56 @@ packages:
name: source_span name: source_span
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
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.flutter-io.cn"
source: hosted source: hosted
version: "1.10.0-nullsafety.1" version: "1.10.0"
states_rebuilder: states_rebuilder:
dependency: transitive dependency: transitive
description: description:
name: states_rebuilder name: states_rebuilder
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.2.0" version: "4.0.0+1"
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.flutter-io.cn"
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.flutter-io.cn"
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.flutter-io.cn"
source: hosted source: hosted
version: "1.2.0-nullsafety.1" version: "1.2.0"
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.flutter-io.cn"
source: hosted source: hosted
version: "0.2.19-nullsafety.2" version: "0.2.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.flutter-io.cn"
source: hosted source: hosted
version: "1.3.0-nullsafety.3" version: "1.3.0"
url_launcher: url_launcher:
dependency: "direct main" dependency: "direct main"
description: description:
@ -699,21 +708,21 @@ packages:
name: vector_math name: vector_math
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.0-nullsafety.3" version: "2.1.0"
velocity_x: velocity_x:
dependency: "direct main" dependency: "direct main"
description: description:
name: velocity_x name: velocity_x
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.4.1" version: "2.6.0"
vxstate: vxstate:
dependency: transitive dependency: transitive
description: description:
name: vxstate name: vxstate
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.0.1" version: "2.0.1"
watcher: watcher:
dependency: transitive dependency: transitive
description: description:
@ -729,5 +738,5 @@ packages:
source: hosted source: hosted
version: "2.2.1" version: "2.2.1"
sdks: sdks:
dart: ">=2.10.0 <2.11.0" dart: ">=2.12.0 <3.0.0"
flutter: ">=1.22.0 <2.0.0" flutter: ">=2.0.0"

@ -13,33 +13,33 @@ dependencies:
sdk: flutter sdk: flutter
flutter_localizations: flutter_localizations:
sdk: flutter sdk: flutter
cupertino_icons: ^1.0.0 cupertino_icons: ^1.0.2
#屏幕适配 #屏幕适配
flutter_screenutil: ^3.2.0 flutter_screenutil: ^5.0.0-nullsafety.11
#状态管理 #状态管理
provider: ^4.3.2+2 provider: ^5.0.0
#路由 #路由
get: ^3.15.0 get: ^4.0.0-nullsafety.2
#刷新 #刷新
flutter_easyrefresh: ^2.1.6 flutter_easyrefresh: ^2.1.6
#划动组件 #划动组件
carousel_slider: ^2.3.1 carousel_slider: ^4.0.0-nullsafety.0
#qrcode san #qrcode san
qr_code_scanner: ^0.3.4 qr_code_scanner: ^0.4.0-nullsafety.0
#toast #toast
bot_toast: ^3.0.4 bot_toast: ^4.0.1
extended_text: ^4.0.0 extended_text: ^5.0.4
common_utils: ^1.2.1 common_utils: ^2.0.2
#验证码 #验证码
pin_input_text_field: ^3.1.1 pin_input_text_field: ^4.0.0
image_picker: ^0.6.7+12 image_picker: ^0.6.7+12
flutter_rating_bar: ^3.0.1+1 flutter_rating_bar: ^4.0.0
expandable: ^4.1.4 expandable: ^5.0.1
url_launcher: ^5.7.10 url_launcher: ^5.7.10
@ -47,19 +47,21 @@ dependencies:
permission_handler: ^5.0.1+1 permission_handler: ^5.0.1+1
velocity_x: ^1.3.1 velocity_x: ^2.6.0
dio: dio:
power_logger: ^0.1.1 power_logger: ^0.1.3
logger: ^0.9.4 logger: ^1.0.0
aku_ui: aku_ui:
git: git:
url: http://test.akuhotel.com:8099/aku_fe/aku_ui.git url: http://test.akuhotel.com:8099/aku_fe/aku_ui.git
hive: ^1.4.4+1 hive: ^1.4.4+1
hive_flutter: ^0.3.1 hive_flutter: ^0.3.1
jpush_flutter: ^0.6.3 jpush_flutter:
git:
url: http://159.75.73.143:8080/third_packages/jpush_flutter
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:

Loading…
Cancel
Save