Merge branch 'zx/gmFlutter' into 'test'

Zx/gm flutter

See merge request !28

lib/ClueModel/page/levelOne/LevelOnePage.dart

@@ -329,7 +329,9 @@ class LevelOneState extends BaseState<LevelOnePage>
             right: 15,
             bottom: 8,
             child: baseText(
-                "销量${NumPlanUtil.getSale(_model.planoverItem.salesCount)}", 11, Color(0xff666666)),
+                "销量${NumPlanUtil.getSale(_model.planoverItem.salesCount)}",
+                11,
+                Color(0xff666666)),
           )
         ],
       ),
@@ -569,14 +571,6 @@ class LevelOneState extends BaseState<LevelOnePage>
                       .jumpPage(context, "show_login", null, true);
                   return;
                 }
-                Map<String, dynamic> map = {
-                  "page_name": "level_one_plan_deatil",
-                  "referrer_link": [],
-                  "popup_name": "interested_plan"
-                };
-                RouterCenterImpl()
-                    .findMainRouter()
-                    .buriedEvent("popup_view", map);
                 DiscussLowPricePopView.showPopView(
                     context, widget.PAGE_NAME, "${widget.planId}", "", "");
               },

lib/ClueModel/page/levelTwo/LevelTwoPage.dart

@@ -534,14 +534,6 @@ class LevelTwoState extends BaseState<LevelTwoPage>
                       .jumpPage(context, "show_login", null, true);
                   return;
                 }
-                Map<String, dynamic> map = {
-                  "page_name": "level_two_plan_deatil",
-                  "referrer_link": [],
-                  "popup_name": "interested_plan"
-                };
-                RouterCenterImpl()
-                    .findMainRouter()
-                    .buriedEvent("popup_view", map);
                 DiscussLowPricePopView.showPopView(
                     context, widget.PAGE_NAME, "${widget.planId}", "", "");
               },

lib/ClueModel/page/top/TopModel.dart

@@ -40,16 +40,16 @@ class TopModel extends BaseModel {
     if (tabIndex == index) {
       return;
     }
-    tabIndex = index;
     Map<String, dynamic> map = {
       "page_name": "favor_plan",
       "referrer": "plan_home",
       "referrer": "plan_home",
       "referrer_id": "",
       "referrer_link": ["plan_home"],
-      "from_tab_name": "",
+      "from_tab_name": tabs[tabIndex].name,
       "tab_name": tabs[index].name,
     };
+    tabIndex = index;
     RouterCenterImpl().findMainRouter().buriedEvent("on_click_tab", map);
   }
 

lib/MainRouter/manager/MainManager.dart

@@ -10,7 +10,6 @@ import 'package:flutter_boost/flutter_boost.dart';
 import 'package:gm_flutter/commonModel/GMBase.dart';
 import 'package:gm_flutter/commonModel/base/BaseUtil.dart';
 import 'package:gm_flutter/commonModel/cache/CacheManager.dart';
-import 'package:gm_flutter/commonModel/eventbus/SimpleEventBus.dart';
 import 'package:gm_flutter/commonModel/util/DartUtil.dart';
 
 import '../../commonModel/App.dart';
@@ -119,20 +118,21 @@ class MainManager {
     }
   }
 
-//  void getInitParams(VoidCallback callback) {
-//    if (isInit) {
-//      if (flutterChannel != null) {
-//        flutterChannel.invokeMethod("get_common_params").then((data) {
-//          if (data is Map) {
-//            var map = Map<String, dynamic>.from(data);
-//            initParams(map, callback: callback);
-//          }
-//        }).whenComplete(() {
-////          callback();
-//        });
-//        return;
-//      }
-//    }
-//    callback();
-//  }
+  void getInitParams(VoidCallback callback) {
+    if (isInit) {
+      if (flutterChannel != null) {
+        flutterChannel.invokeMethod("get_common_params").then((data) {
+          if (data is Map) {
+            var map = Map<String, dynamic>.from(data);
+
+            initParams(map, callback: callback);
+          }
+        }).whenComplete(() {
+//          callback();
+        });
+        return;
+      }
+    }
+    callback();
+  }
 }