diff --git a/lib/app/splash_page.dart b/lib/app/splash_page.dart index 89d9c23..8f97c18 100644 --- a/lib/app/splash_page.dart +++ b/lib/app/splash_page.dart @@ -45,7 +45,11 @@ class _TransitionViewState extends State { @override void initState() { super.initState(); - SpUtil.preInit(); + init(); + } + + void init() async { + await SpUtil.preInit(); startTime(); } diff --git a/lib/common/core/user_util.dart b/lib/common/core/user_util.dart index 43fa426..08fc988 100644 --- a/lib/common/core/user_util.dart +++ b/lib/common/core/user_util.dart @@ -9,9 +9,9 @@ import 'package:wow_english/utils/sp_util.dart'; class UserUtil { static String token = ''; - static saveUser(UserEntity user) { + static void saveUser(UserEntity user) { token = user.token; - SpUtil.getInstance().setData(SpConst.prefsKeyUserInfo, user.toString()); + saveUserJson(user.toString()); } static UserEntity? getUser() { @@ -30,7 +30,7 @@ class UserUtil { return null; } - static saveUserJson(String userJson) { + static void saveUserJson(String userJson) { SpUtil.getInstance().setData(SpConst.prefsKeyUserInfo, userJson); } @@ -38,12 +38,12 @@ class UserUtil { return SpUtil.getInstance().get(SpConst.prefsKeyUserInfo); } - static clearUserSp() { + static void clearUserSp() { token = ''; SpUtil.getInstance().remove(SpConst.prefsKeyUserInfo); } - static logout() { + static void logout() { clearUserSp(); Navigator.of(AppRouter.context).push(AppRouteName.login as Route); } diff --git a/lib/pages/user/user_page.dart b/lib/pages/user/user_page.dart index c29a825..a0a107d 100644 --- a/lib/pages/user/user_page.dart +++ b/lib/pages/user/user_page.dart @@ -1,16 +1,19 @@ import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:wow_english/common/blocs/cachebloc/cache_bloc.dart'; import 'package:wow_english/common/widgets/we_app_bar.dart'; - +import 'package:wow_english/models/user_entity.dart'; class UserPage extends StatelessWidget { const UserPage({super.key}); @override Widget build(BuildContext context) { - return const Scaffold( + UserEntity? user = context.read().userEntity; + return Scaffold( backgroundColor: Colors.white, appBar: WEAppBar( - titleText: '1', + titleText: user?.name ?? '????', ), body: Row(), );