conflict fix

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();
+  }
 }