Feat: 支持到flutter 3.13.7

swiftdo · Nov 14, 2023 · e5d7f18 · e5d7f18
1 parent f35a316
commit e5d7f18
Show file tree

Hide file tree

Showing 6 changed files with 164 additions and 162 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # web_demo
 
-Flutter 3.10.1 快速构建的一个站点样例，长期维护。
+Flutter 3.13 快速构建的一个站点样例，长期维护。
 
 在线预览：[https://webdemo.oldbird.run](https://webdemo.oldbird.run)
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -31,8 +31,7 @@ class MyApp extends StatelessWidget {
         builder: (context, model, child) {
           return MaterialApp.router(
             debugShowCheckedModeBanner: false,
-            routerDelegate: GetX.router.routerDelegate,
-            routeInformationParser: GetX.router.routeInformationParser,
+            routerConfig: GetX.router.router,
             theme: context.currentTheme,
             builder: EasyLoading.init(),
           );

diff --git a/lib/router/router.dart b/lib/router/router.dart
@@ -45,11 +45,6 @@ FutureOr<String?> _loginRedirect(BuildContext context, GoRouterState state) {
 }
 
 class Router {
-  RouterDelegate<Object> get routerDelegate => router.routerDelegate;
-
-  RouteInformationParser<Object> get routeInformationParser =>
-      router.routeInformationParser;
-
   final GoRouter router = GoRouter(
     observers: [MyNavObserver()],
     routes: <GoRoute>[
@@ -80,7 +75,7 @@ class Router {
           key: state.pageKey,
           child: CategoryArticlesPage(
             categoryId: state.pathParameters['id']!,
-            params: state.queryParameters,
+            params: state.uri.queryParameters,
           ),
         ),
       ),

diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -16,7 +16,7 @@ import window_to_front
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FlutterWebAuth2Plugin.register(with: registry.registrar(forPlugin: "FlutterWebAuth2Plugin"))
-  FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
+  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))