From 3ccc7ef69d489b33dcd9ea835ed420047444c56d Mon Sep 17 00:00:00 2001 From: bggRGjQaUbCoE Date: Mon, 31 Mar 2025 16:59:44 +0800 Subject: [PATCH] fix: bangumi mid Signed-off-by: bggRGjQaUbCoE --- lib/pages/bangumi/controller.dart | 2 +- lib/pages/dynamics/create_dyn_panel.dart | 2 +- lib/pages/dynamics/repost_dyn_panel.dart | 2 +- lib/pages/dynamics/widgets/author_panel.dart | 3 +-- lib/pages/dynamics/widgets/author_panel_grpc.dart | 3 +-- lib/pages/fav/video/controller.dart | 2 +- lib/pages/fav_detail/controller.dart | 2 +- lib/pages/later/controller.dart | 2 +- lib/pages/live_room/controller.dart | 2 +- lib/pages/media/controller.dart | 4 ++-- lib/pages/member/new/controller.dart | 2 +- lib/pages/subscription/controller.dart | 2 +- lib/pages/video/detail/member/horizontal_member_page.dart | 2 +- lib/pages/whisper_detail/controller.dart | 4 ++-- lib/utils/login.dart | 5 +++++ 15 files changed, 21 insertions(+), 18 deletions(-) diff --git a/lib/pages/bangumi/controller.dart b/lib/pages/bangumi/controller.dart index 056fd330..d4c4eea7 100644 --- a/lib/pages/bangumi/controller.dart +++ b/lib/pages/bangumi/controller.dart @@ -18,7 +18,7 @@ class BangumiController extends CommonController { @override void onInit() { super.onInit(); - mid = GStorage.userInfo.get('userInfoCache')?.mid; + mid = Accounts.main.mid; isLogin.value = mid != null; queryData(); diff --git a/lib/pages/dynamics/create_dyn_panel.dart b/lib/pages/dynamics/create_dyn_panel.dart index 115432ad..cec69434 100644 --- a/lib/pages/dynamics/create_dyn_panel.dart +++ b/lib/pages/dynamics/create_dyn_panel.dart @@ -475,7 +475,7 @@ class _CreateDynPanelState extends CommonPublishPageState { Future onCustomPublish({required String message, List? pictures}) async { SmartDialog.showLoading(msg: '正在发布'); dynamic result = await MsgHttp.createDynamic( - mid: GStorage.userInfo.get('userInfoCache')?.mid, + mid: Accounts.main.mid, rawText: editController.text, pics: pictures, publishTime: _publishTime != null diff --git a/lib/pages/dynamics/repost_dyn_panel.dart b/lib/pages/dynamics/repost_dyn_panel.dart index 8d6c3ce2..beb06246 100644 --- a/lib/pages/dynamics/repost_dyn_panel.dart +++ b/lib/pages/dynamics/repost_dyn_panel.dart @@ -376,7 +376,7 @@ class _RepostPanelState extends CommonPublishPageState { @override Future onCustomPublish({required String message, List? pictures}) async { dynamic result = await MsgHttp.createDynamic( - mid: GStorage.userInfo.get('userInfoCache')?.mid, + mid: Accounts.main.mid, dynIdStr: widget.item?.idStr, rid: widget.rid, dynType: widget.dynType, diff --git a/lib/pages/dynamics/widgets/author_panel.dart b/lib/pages/dynamics/widgets/author_panel.dart index 707ce20d..e7bbe06b 100644 --- a/lib/pages/dynamics/widgets/author_panel.dart +++ b/lib/pages/dynamics/widgets/author_panel.dart @@ -359,8 +359,7 @@ class AuthorPanel extends StatelessWidget { }, minLeadingWidth: 0, ), - if (item.modules.moduleAuthor.mid == - GStorage.userInfo.get('userInfoCache')?.mid && + if (item.modules.moduleAuthor.mid == Accounts.main.mid && onRemove != null) ListTile( onTap: () async { diff --git a/lib/pages/dynamics/widgets/author_panel_grpc.dart b/lib/pages/dynamics/widgets/author_panel_grpc.dart index 5a4b39d6..0b2aedb0 100644 --- a/lib/pages/dynamics/widgets/author_panel_grpc.dart +++ b/lib/pages/dynamics/widgets/author_panel_grpc.dart @@ -234,8 +234,7 @@ class MorePanel extends StatelessWidget { }, minLeadingWidth: 0, ), - if (item.modules.moduleAuthor.mid == - GStorage.userInfo.get('userInfoCache')?.mid) + if (item.modules.moduleAuthor.mid == Accounts.main.mid) ListTile( onTap: () async { Get.back(); diff --git a/lib/pages/fav/video/controller.dart b/lib/pages/fav/video/controller.dart index f40f2625..a2ff3d47 100644 --- a/lib/pages/fav/video/controller.dart +++ b/lib/pages/fav/video/controller.dart @@ -6,7 +6,7 @@ import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/storage.dart'; class FavController extends CommonController { - late final dynamic mid = GStorage.userInfo.get('userInfoCache')?.mid; + late final dynamic mid = Accounts.main.mid; @override void onInit() { diff --git a/lib/pages/fav_detail/controller.dart b/lib/pages/fav_detail/controller.dart index 810a3ffe..3710ce31 100644 --- a/lib/pages/fav_detail/controller.dart +++ b/lib/pages/fav_detail/controller.dart @@ -29,7 +29,7 @@ class FavDetailController extends MultiSelectController { } super.onInit(); - mid = GStorage.userInfo.get('userInfoCache')?.mid; + mid = Accounts.main.mid; queryData(); } diff --git a/lib/pages/later/controller.dart b/lib/pages/later/controller.dart index 6a7d814d..c297e370 100644 --- a/lib/pages/later/controller.dart +++ b/lib/pages/later/controller.dart @@ -17,7 +17,7 @@ class LaterController extends MultiSelectController { @override void onInit() { super.onInit(); - mid = GStorage.userInfo.get('userInfoCache')?.mid; + mid = Accounts.main.mid; queryData(); } diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart index 3f41781d..8b2f2679 100644 --- a/lib/pages/live_room/controller.dart +++ b/lib/pages/live_room/controller.dart @@ -166,7 +166,7 @@ class LiveRoomController extends GetxController { msgStream = LiveMessageStream( streamToken: info.data.token, roomId: roomId, - uid: GStorage.userInfo.get('userInfoCache')?.mid ?? 0, + uid: Accounts.main.mid, servers: servers, ); msgStream?.addEventListener((obj) { diff --git a/lib/pages/media/controller.dart b/lib/pages/media/controller.dart index 47b179ee..98ce8b89 100644 --- a/lib/pages/media/controller.dart +++ b/lib/pages/media/controller.dart @@ -45,7 +45,7 @@ class MediaController extends CommonController { @override void onInit() { super.onInit(); - mid = GStorage.userInfo.get('userInfoCache')?.mid; + mid = Accounts.main.mid; if (mid != null) { queryData(); } @@ -60,7 +60,7 @@ class MediaController extends CommonController { @override Future customGetData() { - mid ??= GStorage.userInfo.get('userInfoCache')?.mid; + mid ??= Accounts.main.mid; return UserHttp.userfavFolder( pn: 1, ps: 5, diff --git a/lib/pages/member/new/controller.dart b/lib/pages/member/new/controller.dart index 8b7315c8..27c2c1dc 100644 --- a/lib/pages/member/new/controller.dart +++ b/lib/pages/member/new/controller.dart @@ -40,7 +40,7 @@ class MemberControllerNew extends CommonController @override void onInit() { super.onInit(); - ownerMid = GStorage.userInfo.get('userInfoCache')?.mid; + ownerMid = Accounts.main.mid; queryData(); } diff --git a/lib/pages/subscription/controller.dart b/lib/pages/subscription/controller.dart index f99bc460..469fb2b1 100644 --- a/lib/pages/subscription/controller.dart +++ b/lib/pages/subscription/controller.dart @@ -14,7 +14,7 @@ class SubController extends CommonController { @override void onInit() { super.onInit(); - mid = GStorage.userInfo.get('userInfoCache')?.mid; + mid = Accounts.main.mid; queryData(); } diff --git a/lib/pages/video/detail/member/horizontal_member_page.dart b/lib/pages/video/detail/member/horizontal_member_page.dart index 3c36a834..74cfdd79 100644 --- a/lib/pages/video/detail/member/horizontal_member_page.dart +++ b/lib/pages/video/detail/member/horizontal_member_page.dart @@ -54,7 +54,7 @@ class _HorizontalMemberPageState extends State { tag: widget.videoDetailController.heroTag, ); _bvid = widget.videoDetailController.bvid; - _ownerMid = GStorage.userInfo.get('userInfoCache')?.mid; + _ownerMid = Accounts.main.mid; if (_controller.hasPrev) { _controller.scrollController.addListener(listener); } diff --git a/lib/pages/whisper_detail/controller.dart b/lib/pages/whisper_detail/controller.dart index 74afc708..695e3b81 100644 --- a/lib/pages/whisper_detail/controller.dart +++ b/lib/pages/whisper_detail/controller.dart @@ -65,7 +65,7 @@ class WhisperDetailController extends GetxController { } } - late final ownerMid = GStorage.userInfo.get('userInfoCache')?.mid; + late final ownerMid = Accounts.main.mid; Future sendMsg({ required String message, @@ -75,7 +75,7 @@ class WhisperDetailController extends GetxController { int? index, }) async { feedBack(); - if (ownerMid == null) { + if (ownerMid == 0) { SmartDialog.dismiss(); SmartDialog.showToast('请先登录'); return; diff --git a/lib/utils/login.dart b/lib/utils/login.dart index 27855f6b..c25abf04 100644 --- a/lib/utils/login.dart +++ b/lib/utils/login.dart @@ -95,12 +95,14 @@ class LoginUtils { try { Get.find(tag: TabType.bangumi.name) ..isLogin.value = true + ..mid = data.mid ..queryBangumiFollow(); } catch (_) {} try { Get.find(tag: TabType.cinema.name) ..isLogin.value = true + ..mid = data.mid ..queryBangumiFollow(); } catch (_) {} } else { @@ -138,6 +140,7 @@ class LoginUtils { try { Get.find() + ..ownerMid = null ..isLogin.value = false ..onRefresh(); } catch (_) {} @@ -162,12 +165,14 @@ class LoginUtils { try { Get.find(tag: TabType.bangumi.name) + ..mid = null ..isLogin.value = false ..followState.value = LoadingState.loading(); } catch (_) {} try { Get.find(tag: TabType.cinema.name) + ..mid = null ..isLogin.value = false ..followState.value = LoadingState.loading(); } catch (_) {}