合并

@@ -5,8 +5,8 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 import 'route/navigate_service.dart';
 
-class App{
-  static Router router;
+class App {
+  static FluroRouter router;
   static GlobalKey<NavigatorState> key = GlobalKey();
   static SharedPreferences sp;
   static double screenWidth;
@@ -15,12 +15,11 @@ class App{
   static double bottomBarHeight;
   static GetIt getIt = GetIt.instance;
 
-  static initSp() async{
+  static initSp() async {
     sp = await SharedPreferences.getInstance();
   }
 
-  static setupLocator(){
+  static setupLocator() {
     getIt.registerSingleton(NavigateService());
   }
-
-}
\ No newline at end of file
+}

@@ -30,7 +30,7 @@ import 'package:flutter/services.dart';
 Future<void> main() async {
   FlutterBugly.postCatchedException(() async {
     WidgetsFlutterBinding.ensureInitialized();
-    Router router = Router();
+    FluroRouter router = FluroRouter();
     Routes.configureRoutes(router);
     App.router = router;
     App.setupLocator();

@@ -6,19 +6,18 @@ import 'package:one_key/utils/log_util.dart';
 import 'route_handles.dart';
 
 class Routes {
-  static String login = "/";//登录页
-  static String home = "/home";//主页
-  static String handle_online_page="/handle_online_page";//处理在线预订
-  static String reserve_detail="/reserve_detail";//预订详情
-  static String select_table="/select_table";//选择桌位
-  static String invication="/invication";//邀请函
-  static String sms="/sms";//发短信
-  static String webview="/webview";//网页
+  static String login = "/"; //登录页
+  static String home = "/home"; //主页
+  static String handle_online_page = "/handle_online_page"; //处理在线预订
+  static String reserve_detail = "/reserve_detail"; //预订详情
+  static String select_table = "/select_table"; //选择桌位
+  static String invication = "/invication"; //邀请函
+  static String sms = "/sms"; //发短信
+  static String webview = "/webview"; //网页
   static String web_page = '/web_page'; //隐私协议
-  static String change_detail="/change_detail";//变更预订
+  static String change_detail = "/change_detail"; //变更预订
 
-
-  static void configureRoutes(Router router) {
+  static void configureRoutes(FluroRouter router) {
     router.notFoundHandler = new Handler(
         handlerFunc: (BuildContext context, Map<String, List<String>> params) {
       print("ROUTE WAS NOT FOUND !!!");

@@ -21,7 +21,7 @@ packages:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.2"
+    version: "2.5.0-nullsafety.1"
   audioplayers:
     dependency: "direct main"
     description:
@@ -35,7 +35,7 @@ packages:
       name: boolean_selector
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0-nullsafety.1"
   build:
     dependency: transitive
     description:
@@ -105,14 +105,14 @@ packages:
       name: characters
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0-nullsafety.3"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.3"
+    version: "1.2.0-nullsafety.1"
   checked_yaml:
     dependency: transitive
     description:
@@ -126,7 +126,7 @@ packages:
       name: clock
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0-nullsafety.1"
   code_builder:
     dependency: transitive
     description:
@@ -140,7 +140,7 @@ packages:
       name: collection
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.14.13"
+    version: "1.15.0-nullsafety.3"
   common_utils:
     dependency: "direct main"
     description:
@@ -259,7 +259,7 @@ packages:
       name: fake_async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0-nullsafety.1"
   ffi:
     dependency: transitive
     description:
@@ -287,7 +287,7 @@ packages:
       name: fluro
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.6.3"
+    version: "1.7.8"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -365,7 +365,7 @@ packages:
       name: fluwx
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0"
+    version: "2.0.6"
   front_end:
     dependency: transitive
     description:
@@ -491,14 +491,14 @@ packages:
       name: matcher
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.8"
+    version: "0.12.10-nullsafety.1"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.8"
+    version: "1.3.0-nullsafety.3"
   mime:
     dependency: transitive
     description:
@@ -561,7 +561,7 @@ packages:
       name: path
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0-nullsafety.1"
   path_provider:
     dependency: "direct main"
     description:
@@ -769,7 +769,7 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0-nullsafety.2"
   sqflite:
     dependency: "direct main"
     description:
@@ -790,14 +790,14 @@ packages:
       name: stack_trace
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.9.5"
+    version: "1.10.0-nullsafety.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0-nullsafety.1"
   stream_transform:
     dependency: transitive
     description:
@@ -811,7 +811,7 @@ packages:
       name: string_scanner
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0-nullsafety.1"
   synchronized:
     dependency: transitive
     description:
@@ -832,14 +832,14 @@ packages:
       name: term_glyph
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0-nullsafety.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.17"
+    version: "0.2.19-nullsafety.2"
   timing:
     dependency: transitive
     description:
@@ -862,7 +862,7 @@ packages:
       name: typed_data
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0-nullsafety.3"
   url_launcher:
     dependency: "direct main"
     description:
@@ -918,7 +918,7 @@ packages:
       name: vector_math
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0-nullsafety.3"
   watcher:
     dependency: transitive
     description:
@@ -962,5 +962,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.9.0 <3.0.0"
+  dart: ">=2.10.0-110 <2.11.0"
   flutter: ">=1.20.0 <2.0.0"

@@ -34,7 +34,7 @@ dependencies:
 #  屏幕适配
   flutter_screenutil: ^1.0.2
 #  路由管理
-  fluro: ^1.6.0
+  fluro: ^1.7.8
 #  Toast提示
   fluttertoast: ^3.1.3
 #  权限管理
@@ -63,7 +63,7 @@ dependencies:
 #  日历
   table_calendar: ^2.2.1
 #  微信SDK
-  fluwx: 2.1.0
+  fluwx: 2.0.6
   #网页，短信，电话
   url_launcher: ^5.4.2
 #  滚轮选择器