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';
@@ -73,17 +72,21 @@ class MainManager {
 
     innerSetData(map, BASE_URL);
     DioUtil.setDefOptions(baseUrl: "${map[BASE_URL]}/", agent: map[USER_AGENT]);
-//    if (map[COOKIE] == null) {
-//      CacheManager.getInstance().get(MEMORY_CACHE).save(COOKIE,
-//          "_gm_token=1da6071594101423; csrftoken=rUrkkYYMOVZfIIQnU2IH09QIGmsfe8tE; sessionid=uz7f70uap76r6og48znci5l2hbr9vm5c; _gtid=5af9a5deba8511ea8d4082a085c393c93393");
-//    } else {
+    if (map[COOKIE] == null) {
+      CacheManager.getInstance().get(MEMORY_CACHE).save(COOKIE,
+          "_gm_token=1da6071594101423; csrftoken=rUrkkYYMOVZfIIQnU2IH09QIGmsfe8tE; sessionid=uz7f70uap76r6og48znci5l2hbr9vm5c; _gtid=5af9a5deba8511ea8d4082a085c393c93393");
+    } else {
       innerSetData(map, COOKIE);
-//    }
+    }
     print(
         "LSY QQWWEERRTTYY ${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE)}"
         "  ${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE) is String}");
     DioUtil.getInstance().changeOpt();
-//    SimpleEventBus.instance().notifyListener("PlanPage!initState", "");
+    print("LSY QQ11   callback is NULL?${callback == null}");
+    if (callback != null) {
+      callback();
+    }
+    print("LSY QQ22");
   }
 
   void innerSetData(Map<String, dynamic> map, String str) {
@@ -110,20 +113,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;
-//      }
-//    }
+  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();
+  }
 }