v6

lib/v5/pages/color/color_add_page.dart

@@ -89,9 +89,6 @@ class _ColorAddPageState extends State<ColorAddPage> {
     );
   }
 
-  void _selectColor() {
-    Navigator.of(context).pop(_color);
-  }
 
   void changeColor(Color value) {
     _color = value;

lib/v5/pages/color/color_detail_page.dart

@@ -15,15 +15,6 @@ class ColorDetailPage extends StatelessWidget {
     );
     String text = '# ${color.value.toRadixString(16)}';
     return Scaffold(
-      // appBar: AppBar(
-      //     systemOverlayStyle: SystemUiOverlayStyle(
-      //         statusBarColor: Colors.transparent,
-      //         statusBarIconBrightness: Brightness.light
-      //     ),
-      //   iconTheme: IconThemeData(color: Colors.white),
-      //   titleTextStyle:TextStyle(color: Colors.white,fontSize: 18) ,
-      //   backgroundColor: color,
-      //   title: Text('颜色界面',),),
       body: Container(
         alignment: Alignment.center,
         color: color,

lib/v5/pages/color/color_page.dart

@@ -36,15 +36,14 @@ class _ColorPageState extends State<ColorPage> {
   }
 
   void _selectColor(Color color){
-    String value = color.value.toRadixString(16);
-    router.path = '/color/detail?color=$value';
-    // router.setPathForData('/color/detail',color);
-    // router.setPathKeepLive('/color/detail?color=$value');
+    // String value = color.value.toRadixString(16);
+    // router.path = '/color/detail?color=$value';
+    router.setPathForData('/color/detail',color);
 
   }
 
   void _toAddPage() async {
-   Color? color = await router.changePath('/color/add',forResult: true);
+   Color? color = await router.changePathForResult('/color/add');
    if (color != null) {
      setState(() {
        _colors.add(color);