v6

lib/v5/app/navigation/router/app_router_delegate.dart

@@ -7,16 +7,14 @@ import '../../../pages/color/color_detail_page.dart';
 import '../../../pages/color/color_page.dart';
 import '../../../pages/empty/empty_page.dart';
 import '../../../pages/settings/settings_page.dart';
-import '../../../pages/user/user_page.dart';
 import '../../../pages/counter/counter_page.dart';
-import '../../../pages/sort/views/sort_page.dart';
+import '../../../pages/user/user_page.dart';
 import '../transition/fade_transition_page.dart';
 import '../../../pages/color/color_add_page.dart';
 
 const List<String> kDestinationsPaths = [
   '/color',
   '/counter',
-  '/sort',
   '/user',
   '/settings',
 ];
@@ -27,13 +25,14 @@ class AppRouterDelegate extends RouterDelegate<Object> with ChangeNotifier {
   String _path = '/color';
 
   String get path => _path;
-
+  AppRouterDelegate(){
+    // keepAlivePath.add('/color');
+  }
   int? get activeIndex {
     if(path.startsWith('/color')) return 0;
     if(path.startsWith('/counter')) return 1;
-    if(path.startsWith('/sort')) return 2;
-    if(path.startsWith('/user')) return 3;
-    if(path.startsWith('/settings')) return 4;
+    if(path.startsWith('/user')) return 2;
+    if(path.startsWith('/settings')) return 3;
     return null;
   }
 
@@ -41,28 +40,29 @@ class AppRouterDelegate extends RouterDelegate<Object> with ChangeNotifier {
 
   Completer<dynamic>? completer;
 
-  final Map<String,List<Page>> _alivePageMap = {};
+  final Map<String,dynamic> _pathExtraMap = {};
+
+  final List<String> keepAlivePath = [] ;
 
   void setPathKeepLive(String value){
-    _alivePageMap[value] = _buildPageByPath(value);
+    if(keepAlivePath.contains(value)){
+      keepAlivePath.remove(value);
+    }
+    keepAlivePath.add(value);
     path = value;
   }
 
-  final Map<String,dynamic> _pathExtraMap = {};
-
-  FutureOr<dynamic> changePath(String value,{bool forResult=false,Object? extra}){
-    if(forResult){
-      _completerMap[value] = Completer();
-    }
-    if(extra!=null){
-      _pathExtraMap[value] = extra;
-    }
-
-    if(forResult){
-      return _completerMap[value]!.future;
-    }
+  void setPathForData(String value,dynamic data){
+    _pathExtraMap[value] = data;
+    path = value;
   }
 
+  Future<dynamic> changePathForResult(String value) async{
+    Completer<dynamic> completer = Completer();
+    _completerMap[value] = completer;
+    path = value;
+    return completer.future;
+  }
 
   set path(String value) {
     if (_path == value) return;
@@ -72,22 +72,30 @@ class AppRouterDelegate extends RouterDelegate<Object> with ChangeNotifier {
 
   @override
   Widget build(BuildContext context) {
-    List<Page> pages = [];
-    if(_alivePageMap.containsKey(path)){
-      pages = _alivePageMap[path]!;
-    }else{
-      for (var element in _alivePageMap.values) {
-        pages.addAll(element);
-      }
-      pages.addAll(_buildPageByPath(path));
-    }
-
     return Navigator(
       onPopPage: _onPopPage,
-      pages: pages.toSet().toList(),
+      pages: _buildPages(path),
     );
   }
 
+  List<Page> _buildPages(path){
+    List<Page> pages = [];
+    List<Page> topPages = _buildPageByPath(path);
+
+    if(keepAlivePath.isNotEmpty){
+      for (String alivePath in keepAlivePath) {
+        if(alivePath!=path){
+          pages.addAll(_buildPageByPath(alivePath)) ;
+        }
+      }
+      /// 去除和 topPages 中重复的界面
+      pages.removeWhere((element) => topPages.map((e) => e.key).contains(element.key));
+    }
+
+    pages.addAll(topPages);
+    return pages;
+  }
+
   List<Page> _buildPageByPath(String path) {
     Widget? child;
     if(path.startsWith('/color')){
@@ -98,12 +106,9 @@ class AppRouterDelegate extends RouterDelegate<Object> with ChangeNotifier {
       child = const CounterPage();
     }
     if (path == kDestinationsPaths[2]) {
-      child = SortPage();
-    }
-    if (path == kDestinationsPaths[3]) {
       child = const UserPage();
     }
-    if (path == kDestinationsPaths[4]) {
+    if (path == kDestinationsPaths[3]) {
       child = const SettingPage();
     }
     return [
@@ -127,10 +132,9 @@ class AppRouterDelegate extends RouterDelegate<Object> with ChangeNotifier {
       if(segment =='detail'){
         final Map<String, String> queryParams = uri.queryParameters;
         String? selectedColor = queryParams['color'];
-
         if (selectedColor != null) {
           Color color = Color(int.parse(selectedColor, radix: 16));
-          result.add( FadeTransitionPage(
+          result.add(FadeTransitionPage(
             key: const ValueKey('/color/detail'),
             child:ColorDetailPage(color: color),
           ));

lib/v5/app/navigation/router/iroute.dart

@@ -1,105 +1,37 @@
-import 'package:flutter/cupertino.dart';
-
-import '../../../pages/color/color_add_page.dart';
-import '../../../pages/color/color_detail_page.dart';
-import '../../../pages/color/color_page.dart';
-import '../transition/fade_transition_page.dart';
-
 class IRoute {
   final String path;
-  final IRoutePageBuilder builder;
   final List<IRoute> children;
 
-  const IRoute({
-    required this.path,
-    this.children = const [],
-    required this.builder,
-  });
+  const IRoute({required this.path, this.children = const []});
 
   @override
   String toString() {
     return 'IRoute{path: $path, children: $children}';
   }
 
-  List<String> list() {
+  List<String> list(){
+
     return [];
   }
+
 }
 
-typedef IRoutePageBuilder = Page? Function(
-    BuildContext context, IRouteData data);
 
-class IRouteData {
-  final Object? extra;
-  final bool forResult;
-  final Uri uri;
-  final bool keepAlive;
-
-  IRouteData({
-    required this.extra,
-    required this.uri,
-    required this.forResult,
-    required this.keepAlive,
-  });
-}
-
-List<IRoute> kDestinationsIRoutes = [
+const List<IRoute> kDestinationsIRoutes = [
   IRoute(
     path: '/color',
-    builder: (ctx, data) {
-      return const FadeTransitionPage(
-        key: ValueKey('/color'),
-        child: ColorPage(),
-      );
-    },
     children: [
-      IRoute(
-        path: '/color/detail',
-        builder: (ctx, data) {
-          final Map<String, String> queryParams = data.uri.queryParameters;
-          String? selectedColor = queryParams['color'];
-          if (selectedColor != null) {
-            Color color = Color(int.parse(selectedColor, radix: 16));
-            return FadeTransitionPage(
-              key: const ValueKey('/color/detail'),
-              child: ColorDetailPage(color: color),
-            );
-          }
-          return null;
-        },
-      ),
-      IRoute(
-          path: '/color/add',
-          builder: (ctx, data) {
-            return const FadeTransitionPage(
-              key: ValueKey('/color/add'),
-              child: ColorAddPage(),
-            );
-          }),
+      IRoute(path: '/color/add'),
+      IRoute(path: '/color/detail'),
     ],
   ),
   IRoute(
-      path: '/counter',
-      builder: (ctx, data) {
-        return const FadeTransitionPage(
-          key: ValueKey('/counter'),
-          child: ColorAddPage(),
-        );
-      }),
+    path: '/counter',
+  ),
   IRoute(
-      path: '/user',
-      builder: (ctx, data) {
-        return const FadeTransitionPage(
-          key: ValueKey('/user'),
-          child: ColorAddPage(),
-        );
-      }),
+    path: '/user',
+  ),
   IRoute(
-      path: '/settings',
-      builder: (ctx, data) {
-        return const FadeTransitionPage(
-          key: ValueKey('/settings'),
-          child: ColorAddPage(),
-        );
-      }),
+    path: '/settings',
+  ),
 ];