diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart index 77020826..25edb1c4 100644 --- a/lib/pages/dynamics/view.dart +++ b/lib/pages/dynamics/view.dart @@ -28,7 +28,7 @@ class _DynamicsPageState extends State final DynamicsController _dynamicsController = Get.put(DynamicsController()); Future? _futureBuilderFuture; bool _isLoadingMore = false; - Box userInfoCache = GStrorage.userInfo; + Box user = GStrorage.user; @override bool get wantKeepAlive => true; @@ -166,7 +166,7 @@ class _DynamicsPageState extends State bottom: 0, child: Align( alignment: Alignment.center, - child: userInfoCache.get('userInfoCache') != null + child: user.get(UserBoxKey.userLogin) ? GestureDetector( onTap: () => showModalBottomSheet( context: context, @@ -181,7 +181,7 @@ class _DynamicsPageState extends State type: 'avatar', width: 30, height: 30, - src: userInfoCache.get('userInfoCache').face, + src: user.get(UserBoxKey.userFace), ), ) : IconButton( @@ -248,7 +248,7 @@ class _DynamicsPageState extends State } else { return HttpError( errMsg: data['msg'], - fn: () => _dynamicsController.queryFollowDynamic(), + fn: () => _dynamicsController.onRefresh(), ); } } else { diff --git a/lib/pages/home/widgets/app_bar.dart b/lib/pages/home/widgets/app_bar.dart index 6858e7bb..4991c655 100644 --- a/lib/pages/home/widgets/app_bar.dart +++ b/lib/pages/home/widgets/app_bar.dart @@ -8,7 +8,7 @@ import 'package:pilipala/common/widgets/network_img_layer.dart'; import 'package:pilipala/pages/mine/view.dart'; import 'package:pilipala/utils/storage.dart'; -Box userInfoCache = GStrorage.userInfo; +Box user = GStrorage.user; class HomeAppBar extends StatelessWidget { const HomeAppBar({super.key}); @@ -57,7 +57,7 @@ class HomeAppBar extends StatelessWidget { const SizedBox(width: 6), /// TODO - if (userInfoCache.get('userInfoCache') != null) ...[ + if (user.get(UserBoxKey.userLogin)) ...[ GestureDetector( onTap: () => showModalBottomSheet( context: context, @@ -72,7 +72,7 @@ class HomeAppBar extends StatelessWidget { type: 'avatar', width: 32, height: 32, - src: userInfoCache.get('userInfoCache').face, + src: user.get(UserBoxKey.userMid), ), ), const SizedBox(width: 10), diff --git a/lib/pages/webview/controller.dart b/lib/pages/webview/controller.dart index 9b0a1dd2..0186feb0 100644 --- a/lib/pages/webview/controller.dart +++ b/lib/pages/webview/controller.dart @@ -4,6 +4,7 @@ import 'package:hive/hive.dart'; import 'package:pilipala/http/constants.dart'; import 'package:pilipala/http/init.dart'; import 'package:pilipala/http/user.dart'; +import 'package:pilipala/pages/dynamics/index.dart'; import 'package:pilipala/pages/home/index.dart'; import 'package:pilipala/pages/mine/index.dart'; import 'package:pilipala/pages/rcmd/controller.dart'; @@ -68,11 +69,15 @@ class WebviewController extends GetxController { SmartDialog.showToast('登录成功'); Box user = GStrorage.user; user.put(UserBoxKey.userLogin, true); + user.put(UserBoxKey.userName, result['data'].uname); + user.put(UserBoxKey.userFace, result['data'].face); + user.put(UserBoxKey.userMid, result['data'].mid); Box userInfoCache = GStrorage.userInfo; userInfoCache.put('userInfoCache', result['data']); Get.find().userInfo.value = result['data']; Get.find().onInit(); Get.find().queryRcmdFeed('onRefresh'); + Get.find().queryFollowDynamic(); Get.back(); } } catch (e) {