xt / Flutter-ReserveApp · Commits

Go to a project

Commit b73ed6b6955851be2e417c2750529e5a8e536888

Authored by wdn127929
1 parent 5fea93a0
build: skipped

合并

Inline Side-by-side
Showing 5 changed files with 39 additions and 41 deletions
@@ -5,8 +5,8 @@ import 'package:shared_preferences/shared_preferences.dart'; @@ -5,8 +5,8 @@ import 'package:shared_preferences/shared_preferences.dart';
5 5
6 import 'route/navigate_service.dart'; 6 import 'route/navigate_service.dart';
7 7
8 -class App{  
9 - static Router router; 8 +class App {
  9 + static FluroRouter router;
10 static GlobalKey<NavigatorState> key = GlobalKey(); 10 static GlobalKey<NavigatorState> key = GlobalKey();
11 static SharedPreferences sp; 11 static SharedPreferences sp;
12 static double screenWidth; 12 static double screenWidth;
@@ -15,12 +15,11 @@ class App{ @@ -15,12 +15,11 @@ class App{
15 static double bottomBarHeight; 15 static double bottomBarHeight;
16 static GetIt getIt = GetIt.instance; 16 static GetIt getIt = GetIt.instance;
17 17
18 - static initSp() async{ 18 + static initSp() async {
19 sp = await SharedPreferences.getInstance(); 19 sp = await SharedPreferences.getInstance();
20 } 20 }
21 21
22 - static setupLocator(){ 22 + static setupLocator() {
23 getIt.registerSingleton(NavigateService()); 23 getIt.registerSingleton(NavigateService());
24 } 24 }
25 -  
26 -}  
  25 +}
@@ -30,7 +30,7 @@ import 'package:flutter/services.dart'; @@ -30,7 +30,7 @@ import 'package:flutter/services.dart';
30 Future<void> main() async { 30 Future<void> main() async {
31 FlutterBugly.postCatchedException(() async { 31 FlutterBugly.postCatchedException(() async {
32 WidgetsFlutterBinding.ensureInitialized(); 32 WidgetsFlutterBinding.ensureInitialized();
33 - Router router = Router(); 33 + FluroRouter router = FluroRouter();
34 Routes.configureRoutes(router); 34 Routes.configureRoutes(router);
35 App.router = router; 35 App.router = router;
36 App.setupLocator(); 36 App.setupLocator();
@@ -6,19 +6,18 @@ import 'package:one_key/utils/log_util.dart'; @@ -6,19 +6,18 @@ import 'package:one_key/utils/log_util.dart';
6 import 'route_handles.dart'; 6 import 'route_handles.dart';
7 7
8 class Routes { 8 class Routes {
9 - static String login = "/";//登录页  
10 - static String home = "/home";//主页  
11 - static String handle_online_page="/handle_online_page";//处理在线预订  
12 - static String reserve_detail="/reserve_detail";//预订详情  
13 - static String select_table="/select_table";//选择桌位  
14 - static String invication="/invication";//邀请函  
15 - static String sms="/sms";//发短信  
16 - static String webview="/webview";//网页 9 + static String login = "/"; //登录页
  10 + static String home = "/home"; //主页
  11 + static String handle_online_page = "/handle_online_page"; //处理在线预订
  12 + static String reserve_detail = "/reserve_detail"; //预订详情
  13 + static String select_table = "/select_table"; //选择桌位
  14 + static String invication = "/invication"; //邀请函
  15 + static String sms = "/sms"; //发短信
  16 + static String webview = "/webview"; //网页
17 static String web_page = '/web_page'; //隐私协议 17 static String web_page = '/web_page'; //隐私协议
18 - static String change_detail="/change_detail";//变更预订 18 + static String change_detail = "/change_detail"; //变更预订
19 19
20 -  
21 - static void configureRoutes(Router router) { 20 + static void configureRoutes(FluroRouter router) {
22 router.notFoundHandler = new Handler( 21 router.notFoundHandler = new Handler(
23 handlerFunc: (BuildContext context, Map<String, List<String>> params) { 22 handlerFunc: (BuildContext context, Map<String, List<String>> params) {
24 print("ROUTE WAS NOT FOUND !!!"); 23 print("ROUTE WAS NOT FOUND !!!");
@@ -21,7 +21,7 @@ packages: @@ -21,7 +21,7 @@ packages:
21 name: async 21 name: async
22 url: "https://pub.flutter-io.cn" 22 url: "https://pub.flutter-io.cn"
23 source: hosted 23 source: hosted
24 - version: "2.4.2" 24 + version: "2.5.0-nullsafety.1"
25 audioplayers: 25 audioplayers:
26 dependency: "direct main" 26 dependency: "direct main"
27 description: 27 description:
@@ -35,7 +35,7 @@ packages: @@ -35,7 +35,7 @@ packages:
35 name: boolean_selector 35 name: boolean_selector
36 url: "https://pub.flutter-io.cn" 36 url: "https://pub.flutter-io.cn"
37 source: hosted 37 source: hosted
38 - version: "2.0.0" 38 + version: "2.1.0-nullsafety.1"
39 build: 39 build:
40 dependency: transitive 40 dependency: transitive
41 description: 41 description:
@@ -105,14 +105,14 @@ packages: @@ -105,14 +105,14 @@ packages:
105 name: characters 105 name: characters
106 url: "https://pub.flutter-io.cn" 106 url: "https://pub.flutter-io.cn"
107 source: hosted 107 source: hosted
108 - version: "1.0.0" 108 + version: "1.1.0-nullsafety.3"
109 charcode: 109 charcode:
110 dependency: transitive 110 dependency: transitive
111 description: 111 description:
112 name: charcode 112 name: charcode
113 url: "https://pub.flutter-io.cn" 113 url: "https://pub.flutter-io.cn"
114 source: hosted 114 source: hosted
115 - version: "1.1.3" 115 + version: "1.2.0-nullsafety.1"
116 checked_yaml: 116 checked_yaml:
117 dependency: transitive 117 dependency: transitive
118 description: 118 description:
@@ -126,7 +126,7 @@ packages: @@ -126,7 +126,7 @@ packages:
126 name: clock 126 name: clock
127 url: "https://pub.flutter-io.cn" 127 url: "https://pub.flutter-io.cn"
128 source: hosted 128 source: hosted
129 - version: "1.0.1" 129 + version: "1.1.0-nullsafety.1"
130 code_builder: 130 code_builder:
131 dependency: transitive 131 dependency: transitive
132 description: 132 description:
@@ -140,7 +140,7 @@ packages: @@ -140,7 +140,7 @@ packages:
140 name: collection 140 name: collection
141 url: "https://pub.flutter-io.cn" 141 url: "https://pub.flutter-io.cn"
142 source: hosted 142 source: hosted
143 - version: "1.14.13" 143 + version: "1.15.0-nullsafety.3"
144 common_utils: 144 common_utils:
145 dependency: "direct main" 145 dependency: "direct main"
146 description: 146 description:
@@ -259,7 +259,7 @@ packages: @@ -259,7 +259,7 @@ packages:
259 name: fake_async 259 name: fake_async
260 url: "https://pub.flutter-io.cn" 260 url: "https://pub.flutter-io.cn"
261 source: hosted 261 source: hosted
262 - version: "1.1.0" 262 + version: "1.2.0-nullsafety.1"
263 ffi: 263 ffi:
264 dependency: transitive 264 dependency: transitive
265 description: 265 description:
@@ -287,7 +287,7 @@ packages: @@ -287,7 +287,7 @@ packages:
287 name: fluro 287 name: fluro
288 url: "https://pub.flutter-io.cn" 288 url: "https://pub.flutter-io.cn"
289 source: hosted 289 source: hosted
290 - version: "1.6.3" 290 + version: "1.7.8"
291 flutter: 291 flutter:
292 dependency: "direct main" 292 dependency: "direct main"
293 description: flutter 293 description: flutter
@@ -365,7 +365,7 @@ packages: @@ -365,7 +365,7 @@ packages:
365 name: fluwx 365 name: fluwx
366 url: "https://pub.flutter-io.cn" 366 url: "https://pub.flutter-io.cn"
367 source: hosted 367 source: hosted
368 - version: "2.1.0" 368 + version: "2.0.6"
369 front_end: 369 front_end:
370 dependency: transitive 370 dependency: transitive
371 description: 371 description:
@@ -491,14 +491,14 @@ packages: @@ -491,14 +491,14 @@ packages:
491 name: matcher 491 name: matcher
492 url: "https://pub.flutter-io.cn" 492 url: "https://pub.flutter-io.cn"
493 source: hosted 493 source: hosted
494 - version: "0.12.8" 494 + version: "0.12.10-nullsafety.1"
495 meta: 495 meta:
496 dependency: transitive 496 dependency: transitive
497 description: 497 description:
498 name: meta 498 name: meta
499 url: "https://pub.flutter-io.cn" 499 url: "https://pub.flutter-io.cn"
500 source: hosted 500 source: hosted
501 - version: "1.1.8" 501 + version: "1.3.0-nullsafety.3"
502 mime: 502 mime:
503 dependency: transitive 503 dependency: transitive
504 description: 504 description:
@@ -561,7 +561,7 @@ packages: @@ -561,7 +561,7 @@ packages:
561 name: path 561 name: path
562 url: "https://pub.flutter-io.cn" 562 url: "https://pub.flutter-io.cn"
563 source: hosted 563 source: hosted
564 - version: "1.7.0" 564 + version: "1.8.0-nullsafety.1"
565 path_provider: 565 path_provider:
566 dependency: "direct main" 566 dependency: "direct main"
567 description: 567 description:
@@ -769,7 +769,7 @@ packages: @@ -769,7 +769,7 @@ packages:
769 name: source_span 769 name: source_span
770 url: "https://pub.flutter-io.cn" 770 url: "https://pub.flutter-io.cn"
771 source: hosted 771 source: hosted
772 - version: "1.7.0" 772 + version: "1.8.0-nullsafety.2"
773 sqflite: 773 sqflite:
774 dependency: "direct main" 774 dependency: "direct main"
775 description: 775 description:
@@ -790,14 +790,14 @@ packages: @@ -790,14 +790,14 @@ packages:
790 name: stack_trace 790 name: stack_trace
791 url: "https://pub.flutter-io.cn" 791 url: "https://pub.flutter-io.cn"
792 source: hosted 792 source: hosted
793 - version: "1.9.5" 793 + version: "1.10.0-nullsafety.1"
794 stream_channel: 794 stream_channel:
795 dependency: transitive 795 dependency: transitive
796 description: 796 description:
797 name: stream_channel 797 name: stream_channel
798 url: "https://pub.flutter-io.cn" 798 url: "https://pub.flutter-io.cn"
799 source: hosted 799 source: hosted
800 - version: "2.0.0" 800 + version: "2.1.0-nullsafety.1"
801 stream_transform: 801 stream_transform:
802 dependency: transitive 802 dependency: transitive
803 description: 803 description:
@@ -811,7 +811,7 @@ packages: @@ -811,7 +811,7 @@ packages:
811 name: string_scanner 811 name: string_scanner
812 url: "https://pub.flutter-io.cn" 812 url: "https://pub.flutter-io.cn"
813 source: hosted 813 source: hosted
814 - version: "1.0.5" 814 + version: "1.1.0-nullsafety.1"
815 synchronized: 815 synchronized:
816 dependency: transitive 816 dependency: transitive
817 description: 817 description:
@@ -832,14 +832,14 @@ packages: @@ -832,14 +832,14 @@ packages:
832 name: term_glyph 832 name: term_glyph
833 url: "https://pub.flutter-io.cn" 833 url: "https://pub.flutter-io.cn"
834 source: hosted 834 source: hosted
835 - version: "1.1.0" 835 + version: "1.2.0-nullsafety.1"
836 test_api: 836 test_api:
837 dependency: transitive 837 dependency: transitive
838 description: 838 description:
839 name: test_api 839 name: test_api
840 url: "https://pub.flutter-io.cn" 840 url: "https://pub.flutter-io.cn"
841 source: hosted 841 source: hosted
842 - version: "0.2.17" 842 + version: "0.2.19-nullsafety.2"
843 timing: 843 timing:
844 dependency: transitive 844 dependency: transitive
845 description: 845 description:
@@ -862,7 +862,7 @@ packages: @@ -862,7 +862,7 @@ packages:
862 name: typed_data 862 name: typed_data
863 url: "https://pub.flutter-io.cn" 863 url: "https://pub.flutter-io.cn"
864 source: hosted 864 source: hosted
865 - version: "1.2.0" 865 + version: "1.3.0-nullsafety.3"
866 url_launcher: 866 url_launcher:
867 dependency: "direct main" 867 dependency: "direct main"
868 description: 868 description:
@@ -918,7 +918,7 @@ packages: @@ -918,7 +918,7 @@ packages:
918 name: vector_math 918 name: vector_math
919 url: "https://pub.flutter-io.cn" 919 url: "https://pub.flutter-io.cn"
920 source: hosted 920 source: hosted
921 - version: "2.0.8" 921 + version: "2.1.0-nullsafety.3"
922 watcher: 922 watcher:
923 dependency: transitive 923 dependency: transitive
924 description: 924 description:
@@ -962,5 +962,5 @@ packages: @@ -962,5 +962,5 @@ packages:
962 source: hosted 962 source: hosted
963 version: "2.2.1" 963 version: "2.2.1"
964 sdks: 964 sdks:
965 - dart: ">=2.9.0 <3.0.0" 965 + dart: ">=2.10.0-110 <2.11.0"
966 flutter: ">=1.20.0 <2.0.0" 966 flutter: ">=1.20.0 <2.0.0"
@@ -34,7 +34,7 @@ dependencies: @@ -34,7 +34,7 @@ dependencies:
34 # 屏幕适配 34 # 屏幕适配
35 flutter_screenutil: ^1.0.2 35 flutter_screenutil: ^1.0.2
36 # 路由管理 36 # 路由管理
37 - fluro: ^1.6.0 37 + fluro: ^1.7.8
38 # Toast提示 38 # Toast提示
39 fluttertoast: ^3.1.3 39 fluttertoast: ^3.1.3
40 # 权限管理 40 # 权限管理
@@ -63,7 +63,7 @@ dependencies: @@ -63,7 +63,7 @@ dependencies:
63 # 日历 63 # 日历
64 table_calendar: ^2.2.1 64 table_calendar: ^2.2.1
65 # 微信SDK 65 # 微信SDK
66 - fluwx: 2.1.0 66 + fluwx: 2.0.6
67 #网页，短信，电话 67 #网页，短信，电话
68 url_launcher: ^5.4.2 68 url_launcher: ^5.4.2
69 # 滚轮选择器 69 # 滚轮选择器