Commit 3e44d1a6 authored by 林生雨's avatar 林生雨

commit

parent 3350f491
...@@ -64,7 +64,13 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -64,7 +64,13 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
print("LSY PLAN INIT"); print("LSY PLAN INIT");
// DioUtil.getInstance().setProxy("172.30.8.245"); // DioUtil.getInstance().setProxy("172.30.8.245");
super.initState(); super.initState();
if (CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE) == null) {
RouterCenterImpl().findMainRouter().getInitParams().whenComplete(() {
_model.init(); _model.init();
});
} else {
_model.init();
}
planBarView = planBarView =
PlanBarView(_model.managerLive, clickIndex, hideAllMenuListener); PlanBarView(_model.managerLive, clickIndex, hideAllMenuListener);
} }
...@@ -181,9 +187,9 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin { ...@@ -181,9 +187,9 @@ class PlanState extends BaseState<PlanPage> with TickerProviderStateMixin {
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
maxHeight: 450, maxHeight: 450,
listener: projectMenuListener, listener: projectMenuListener,
child: ProjectView(_model.projectData, (id,name) { child: ProjectView(_model.projectData, (id, name) {
clickIndexOther(0); clickIndexOther(0);
_model.projectClick(id,name); _model.projectClick(id, name);
}), }),
proListener: (pro) { proListener: (pro) {
_model.backProgress(pro, 0); _model.backProgress(pro, 0);
......
...@@ -20,4 +20,7 @@ abstract class MainRouter extends RouterBaser { ...@@ -20,4 +20,7 @@ abstract class MainRouter extends RouterBaser {
Widget getProxyPage(); Widget getProxyPage();
void catchErrorToBugly(String err); void catchErrorToBugly(String err);
Future getInitParams();
} }
...@@ -41,4 +41,9 @@ class MainRouterImpl implements MainRouter { ...@@ -41,4 +41,9 @@ class MainRouterImpl implements MainRouter {
void catchErrorToBugly(String err) { void catchErrorToBugly(String err) {
MainManager.getInstance().catchErrorToBugly(err); MainManager.getInstance().catchErrorToBugly(err);
} }
@override
Future getInitParams() {
return MainManager.getInstance().getInitParams();
}
} }
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
* @author lsy * @author lsy
* @date 2020/6/29 * @date 2020/6/29
**/ **/
import 'dart:async';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_boost/flutter_boost.dart'; import 'package:flutter_boost/flutter_boost.dart';
import 'package:gm_flutter/commonModel/GMBase.dart'; import 'package:gm_flutter/commonModel/GMBase.dart';
...@@ -39,6 +41,12 @@ class MainManager { ...@@ -39,6 +41,12 @@ class MainManager {
if (data is Map) { if (data is Map) {
print("LSY STATEINIT OKKK ${data}"); print("LSY STATEINIT OKKK ${data}");
var map = Map<String, dynamic>.from(data); var map = Map<String, dynamic>.from(data);
initParams(map);
}
});
}
void initParams(Map<String, dynamic> map) {
innerSetData(map, APP_NAME); innerSetData(map, APP_NAME);
innerSetData(map, VERSION); innerSetData(map, VERSION);
innerSetData(map, PLATFORM); innerSetData(map, PLATFORM);
...@@ -77,8 +85,6 @@ class MainManager { ...@@ -77,8 +85,6 @@ class MainManager {
"LSY QQWWEERRTTYY ${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE)}"); "LSY QQWWEERRTTYY ${CacheManager.getInstance().get(MEMORY_CACHE).get(COOKIE)}");
DioUtil.getInstance().changeOpt(); DioUtil.getInstance().changeOpt();
} }
});
}
void innerSetData(Map<String, dynamic> map, String str) { void innerSetData(Map<String, dynamic> map, String str) {
if (map[str] != null && "${map[str]}".isNotEmpty) { if (map[str] != null && "${map[str]}".isNotEmpty) {
...@@ -103,4 +109,18 @@ class MainManager { ...@@ -103,4 +109,18 @@ class MainManager {
flutterChannel.invokeMethod("wrong_report_bugly", err ?? ""); flutterChannel.invokeMethod("wrong_report_bugly", err ?? "");
} }
} }
Future getInitParams() async {
Completer completer = Completer();
if (isInit) {
if (flutterChannel != null) {
var data = await flutterChannel.invokeMethod("get_common_params");
if (data is Map) {
initParams(data);
}
}
}
completer.complete();
return completer.future;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment