w

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -32,9 +32,11 @@ class LevelOnePage extends StatefulWidget {
   int planId = 10;
   Map<String, dynamic> params;
   final String PAGE_NAME = "level_one_plan_detail";
+  String title;
 
   LevelOnePage(this.params) {
     this.planId = params["planId"];
+    this.title = params["title"];
   }
 
   @override
@@ -174,7 +176,7 @@ class LevelOneState extends BaseState<LevelOnePage>
               child: newHome(),
             )),
         baseSliverTitle(
-            "title", MediaQuery.of(context).size.width, _model.textLive),
+            "${widget.title}", MediaQuery.of(context).size.width, _model.textLive),
         baseSliverBack(() {
           if (RouterCenterImpl().findMainRouter().isWithNative()) {
             FlutterBoost.singleton.closeCurrent();

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -172,19 +172,19 @@ class LevelTwoState extends BaseState<LevelTwoPage>
               },
               child: newHome(),
             )),
-        Positioned(
-          top: 44,
-          left: 60,
-          child: Container(
-            alignment: Alignment.center,
-            width: MediaQuery.of(context).size.width - 100,
-            child: baseText(_model.name, 18, Color(0xff333333)),
-          ),
-        ),
+//        Positioned(
+//          top: 44,
+//          left: 60,
+//          child: Container(
+//            alignment: Alignment.center,
+//            width: MediaQuery.of(context).size.width - 100,
+//            child: baseText(_model.name, 18, Color(0xff333333)),
+//          ),
+//        ),
         baseSliverBack(() {
-          if(RouterCenterImpl().findMainRouter().isWithNative()){
+          if (RouterCenterImpl().findMainRouter().isWithNative()) {
             FlutterBoost.singleton.closeCurrent();
-          }else{
+          } else {
             Navigator.of(context).pop();
           }
         }),

lib/ClueModel/page/mechanismBox/MechanismBoxPage.dart

@@ -76,6 +76,7 @@ class MechanismBox implements IBottomPicker {
 
   @override
   void dispose() {
+    focusNode.unfocus();
     Map<String, dynamic> map = {
       "business_id": "level_two_plan_compare_deatil",
       "page_name": "",

lib/ClueModel/page/plan/PlanItem.dart

@@ -137,7 +137,10 @@ class PlanItem extends StatelessWidget {
 
       RouterCenterImpl().findMainRouter().buriedEvent("on_click_card", map);
       RouterCenterImpl().findMainRouter().jumpPage(
-          context, "level_one_plan_detail", {"planId": plans.id}, false);
+          context,
+          "level_one_plan_detail",
+          {"planId": plans.id, "title": "${plans.name}"},
+          false);
     });
   }
 }

lib/ClueModel/page/plan/PlanModel.dart

@@ -113,7 +113,12 @@ class PlanModel extends BaseModel {
       page = 1;
       feedDatas.clear();
     }
-    if (needCache) {
+    if (needCache &&
+        PlanModelInstance.getInstance().feedDatas != null &&
+        PlanModelInstance.getInstance().feedDatas.isNotEmpty) {
+      feedDatas.clear();
+      feedDatas.addAll(PlanModelInstance.getInstance().feedDatas);
+      feedsLive.notifyView(Pair(ENDLOADING, feedDatas));
       WidgetsBinding.instance.addPostFrameCallback((_) {
         SimpleEventBus.instance()
             .notifyListener("BaseNestedScrollViewRefreshIndicator", "refresh");
@@ -133,6 +138,8 @@ class PlanModel extends BaseModel {
               }
             } else {
               feedDatas.addAll(event.data.plans);
+              PlanModelInstance.getInstance().feedDatas.clear();
+              PlanModelInstance.getInstance().feedDatas.addAll(feedDatas);
               feedsLive.notifyView(Pair(ENDLOADING, feedDatas));
             }
             controller?.refreshCompleted();