This commit is contained in:
yifeng.yl
2019-05-07 15:41:22 +08:00
parent 4df5288940
commit 4ac0bc2ed6
12 changed files with 181 additions and 28 deletions

View File

@ -10,31 +10,49 @@ import 'package:flutter_go/views/home.dart';
import 'package:flutter_go/model/search_history.dart';
import 'package:flutter_go/utils/analytics.dart' as Analytics;
import 'package:flutter_go/views/login_page/login_page.dart';
import 'package:flutter_go/utils/data_utils.dart';
//import 'views/welcome_page/index.dart';
const int ThemeColor = 0xFFC91B3A;
SpUtil sp;
var db;
class MyApp extends StatelessWidget {
MyApp() {
class MyApp extends StatefulWidget {
MyApp() {
final router = new Router();
Routes.configureRoutes(router);
Application.router = router;
}
@override
_MyAppState createState() => _MyAppState();
}
class _MyAppState extends State<MyApp> {
bool _hasLogin = false;
@override
void initState() {
super.initState();
DataUtils.checkLogin().then((hasLogin) {
setState(() {
_hasLogin = hasLogin;
});
});
}
showWelcomePage() {
// 暂时关掉欢迎介绍
// return AppPage();
return LoginPage();
// bool showWelcome = sp.getBool(SharedPreferencesKeys.showWelcome);
// if (showWelcome == null || showWelcome == true) {
// return WelcomePage();
// } else {
// return AppPage();
// }
if (_hasLogin) {
return AppPage();
} else {
return LoginPage();
}
}
@override
Widget build(BuildContext context) {
return new MaterialApp(
@ -52,9 +70,7 @@ class MyApp extends StatelessWidget {
size: 35.0,
),
),
home: new Scaffold(
body: showWelcomePage()
),
home: new Scaffold(body: showWelcomePage()),
debugShowCheckedModeBanner: false,
onGenerateRoute: Application.router.generator,
navigatorObservers: <NavigatorObserver>[Analytics.observer],
@ -62,7 +78,6 @@ class MyApp extends StatelessWidget {
}
}
void main() async {
final provider = new Provider();
await provider.init(true);