Merge branch 'test' of http://git.wanmeizhensuo.com/linshengyu/gm_flutter into zcc/flutter

lib/ClueModel/ClueRouter.dart

@@ -16,11 +16,11 @@ abstract class ClueRouter implements RouterBaser {
 
   Widget getLevelOnePage(Map<String, dynamic> params);
 
-  Widget getLevelTwoPage();
+  Widget getLevelTwoPage(Map<String, dynamic> params);
 
   Widget getPlanPage();
 
-  Widget getPlanCompareDetailPage();
+  Widget getPlanCompareDetailPage(Map<String, dynamic> params);
 
   Widget getTopPage(Map<String, dynamic> params);
 }

lib/ClueModel/ClueRouterImpl.dart

@@ -25,8 +25,8 @@ class ClueRouterImpl implements ClueRouter {
   }
 
   @override
-  Widget getLevelTwoPage() {
-    return LevelTwoPage();
+  Widget getLevelTwoPage(Map<String, dynamic> params) {
+    return LevelTwoPage(params);
   }
 
   @override
@@ -40,8 +40,8 @@ class ClueRouterImpl implements ClueRouter {
   }
 
   @override
-  Widget getPlanCompareDetailPage() {
-    return PlanCompareDetailPage();
+  Widget getPlanCompareDetailPage(Map<String, dynamic> params) {
+    return PlanCompareDetailPage(params);
   }
 
   @override

lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart

@@ -15,6 +15,8 @@ import 'package:gm_flutter/commonModel/base/BaseState.dart';
 import 'package:gm_flutter/commonModel/bean/Pair.dart';
 
 class PlanCompareDetailPage extends StatefulWidget {
+  PlanCompareDetailPage(Map<String, dynamic> params) {}
+
   @override
   State<StatefulWidget> createState() => PlanCompareDetailPageState();
 }

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -23,6 +23,8 @@ import 'package:gm_flutter/main.mark.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class LevelTwoPage extends StatefulWidget {
+  LevelTwoPage(Map<String, dynamic> params) {}
+
   @override
   State<StatefulWidget> createState() => LevelTwoState();
 }

lib/ClueModel/page/plan/PlanPage.dart

@@ -391,7 +391,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
                     Map<String, dynamic> map = {"rank_type": "0"};
                     RouterCenterImpl()
                         .findMainRouter()
-                        .jumpPage(context, "clueTop", map, false);
+                        .jumpPage(context, "favor_plan", map, false);
                   });
                 },
               ),
@@ -416,7 +416,7 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
                     Map<String, dynamic> map = {"rank_type": "1"};
                     RouterCenterImpl()
                         .findMainRouter()
-                        .jumpPage(context, "clueTop", map, false);
+                        .jumpPage(context, "hot_plan", map, false);
                   });
                 },
               ),

lib/MainRouter/manager/JumpManager.dart

@@ -37,14 +37,15 @@ class JumpManager {
 
   Map<String, dynamic> initMap(Map<String, dynamic> params) {
     return {
-      "flutter://clueLevelOne":
+      "flutter://level_one_plan_detail":
           RouterCenterImpl().findClueRouter().getLevelOnePage(params),
-      "flutter://clueProjectDetails":
+      "flutter://level_one_plan_instruction":
           RouterCenterImpl().findClueRouter().getProjectDetailsPage(params),
-      "flutter://cluePlansCompareFeed":
+      "flutter://level_one_plan_compare":
           RouterCenterImpl().findClueRouter().getPlansCompareFeed(params),
-      "flutter://cluePlan": RouterCenterImpl().findClueRouter().getPlanPage(),
-      "flutter://clueTop": RouterCenterImpl().findClueRouter().getTopPage(params),
+      "flutter://plan_home": RouterCenterImpl().findClueRouter().getPlanPage(),
+      "flutter://favor_plan": RouterCenterImpl().findClueRouter().getTopPage(params),
+      "flutter://hot_plan": RouterCenterImpl().findClueRouter().getTopPage(params),
     };
   }
 }

lib/MainRouter/page/test/TestPage.dart

@@ -34,7 +34,7 @@ class TestState extends BaseState<TestPage> {
     }));
     list.add(listItem("二级列表页", () {
       JumpUtil.jumpToPageRight(
-          context, RouterCenterImpl().findClueRouter().getLevelTwoPage());
+          context, RouterCenterImpl().findClueRouter().getLevelTwoPage({}));
     }));
     list.add(listItem("方案页面", () {
       JumpUtil.jumpToPageRight(
@@ -42,7 +42,7 @@ class TestState extends BaseState<TestPage> {
     }));
     list.add(listItem("对比详情页", () {
       JumpUtil.jumpToPageRight(context,
-          RouterCenterImpl().findClueRouter().getPlanCompareDetailPage());
+          RouterCenterImpl().findClueRouter().getPlanCompareDetailPage({}));
     }));
     list.add(listItem("项目说明", () {
       JumpUtil.jumpToPageRight(

lib/main.dart

@@ -58,15 +58,25 @@ class MyApp extends State<MyAppWidget> {
   void initState() {
     super.initState();
     FlutterBoost.singleton.registerPageBuilders({
-      'clueLevelOne': (pageName, params, _) =>
+      'plan_home': (pageName, params, _) =>
+          RouterCenterImpl().findClueRouter().getPlanPage(),
+      'level_one_plan_detail': (pageName, params, _) =>
           RouterCenterImpl().findClueRouter().getLevelOnePage(params),
-      'clueProjectDetails': (pageName, params, _) =>
+      'level_two_plan_deatil': (pageName, params, _) =>
+          RouterCenterImpl().findClueRouter().getLevelTwoPage(params),
+      'level_one_plan_instruction': (pageName, params, _) =>
+          RouterCenterImpl().findClueRouter().getProjectDetailsPage(params),
+      'level_two_plan_instruction': (pageName, params, _) =>
           RouterCenterImpl().findClueRouter().getProjectDetailsPage(params),
-      'cluePlansCompareFeed': (pageName, params, _) =>
+      'level_one_plan_compare': (pageName, params, _) =>
           RouterCenterImpl().findClueRouter().getPlansCompareFeed(params),
-      'cluePlan': (pageName, params, _) =>
-          RouterCenterImpl().findClueRouter().getPlanPage(),
-      'clueTop': (pageName, params, _) =>
+      'level_one_plan_compare_detail': (pageName, params, _) =>
+          RouterCenterImpl().findClueRouter().getPlanCompareDetailPage(params),
+      'level_two_plan_compare_deatil': (pageName, params, _) =>
+          RouterCenterImpl().findClueRouter().getPlanCompareDetailPage(params),
+      'favor_plan': (pageName, params, _) =>
+          RouterCenterImpl().findClueRouter().getTopPage(params),
+      'hot_plan': (pageName, params, _) =>
           RouterCenterImpl().findClueRouter().getTopPage(params),
     });
     FlutterBoost.singleton