opt account

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

lib/pages/video/introduction/pgc/controller.dart

@@ -20,6 +20,7 @@ import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart';
 import 'package:PiliPlus/pages/video/pay_coins/view.dart';
 import 'package:PiliPlus/pages/video/reply/controller.dart';
 import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart';
+import 'package:PiliPlus/services/account_service.dart';
 import 'package:PiliPlus/utils/feed_back.dart';
 import 'package:PiliPlus/utils/global_data.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
@@ -60,8 +61,7 @@ class PgcIntroController extends GetxController {
   List? favIds;
   Rx<FavVideoData> favFolderData = FavVideoData().obs;
 
-  bool isLogin = Accounts.main.isLogin;
-  int mid = Accounts.main.mid;
+  AccountService accountService = Get.find<AccountService>();
 
   late final enableQuickFav =
       GStorage.setting.get(SettingBoxKey.enableQuickFav, defaultValue: false);
@@ -69,7 +69,7 @@ class PgcIntroController extends GetxController {
   @override
   void onInit() {
     super.onInit();
-    if (isLogin) {
+    if (accountService.isLogin.value) {
       if (seasonId != null) {
         queryIsFollowed();
       }
@@ -134,7 +134,7 @@ class PgcIntroController extends GetxController {
 
   // 投币
   void actionCoinVideo() {
-    if (!isLogin) {
+    if (!accountService.isLogin.value) {
       SmartDialog.showToast('账号未登录');
       return;
     }
@@ -388,7 +388,7 @@ class PgcIntroController extends GetxController {
       } catch (_) {}
     }
 
-    if (isLogin) {
+    if (accountService.isLogin.value) {
       queryPgcLikeCoinFav();
     }
 
@@ -434,7 +434,7 @@ class PgcIntroController extends GetxController {
   Future queryVideoInFolder() async {
     favIds = null;
     var result = await FavHttp.videoInFolder(
-      mid: mid,
+      mid: accountService.mid,
       rid: epId, // pgc
       type: 24, // pgc
     );
@@ -508,7 +508,7 @@ class PgcIntroController extends GetxController {
   // 一键三连
   Future<void> actionOneThree() async {
     feedBack();
-    if (!isLogin) {
+    if (!accountService.isLogin.value) {
       SmartDialog.showToast('账号未登录');
       return;
     }
@@ -562,7 +562,7 @@ class PgcIntroController extends GetxController {
 
   // 收藏
   void showFavBottomSheet(BuildContext context, {type = 'tap'}) {
-    if (!isLogin) {
+    if (!accountService.isLogin.value) {
       SmartDialog.showToast('账号未登录');
       return;
     }

lib/pages/video/introduction/pgc/widgets/pgc_panel.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:PiliPlus/models/user/info.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_info_model/episode.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_info_model/new_ep.dart';
 import 'package:PiliPlus/pages/video/controller.dart';
@@ -34,9 +35,8 @@ class PgcPanel extends StatefulWidget {
 class _PgcPanelState extends State<PgcPanel> {
   late int currentIndex;
   final ScrollController listViewScrollCtr = ScrollController();
-  dynamic userInfo;
   // 默认未开通
-  int vipStatus = 0;
+  late int vipStatus;
   late int cid;
   late final VideoDetailController videoDetailCtr;
   StreamSubscription? _listener;
@@ -47,10 +47,10 @@ class _PgcPanelState extends State<PgcPanel> {
     cid = widget.cid!;
     currentIndex = widget.pages.indexWhere((e) => e.cid == cid);
     scrollToIndex();
-    userInfo = GStorage.userInfo.get('userInfoCache');
-    if (userInfo != null) {
-      vipStatus = userInfo.vipStatus;
-    }
+
+    UserInfoData? userInfo = GStorage.userInfo.get('userInfoCache');
+    vipStatus = userInfo?.vipStatus ?? 0;
+
     videoDetailCtr = Get.find<VideoDetailController>(tag: widget.heroTag);
 
     _listener = videoDetailCtr.cid.listen((int p0) {

lib/pages/video/introduction/ugc/controller.dart

@@ -28,6 +28,7 @@ import 'package:PiliPlus/pages/video/pay_coins/view.dart';
 import 'package:PiliPlus/pages/video/related/controller.dart';
 import 'package:PiliPlus/pages/video/reply/controller.dart';
 import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart';
+import 'package:PiliPlus/services/account_service.dart';
 import 'package:PiliPlus/services/service_locator.dart';
 import 'package:PiliPlus/utils/extension.dart';
 import 'package:PiliPlus/utils/feed_back.dart';
@@ -77,14 +78,12 @@ class VideoIntroController extends GetxController {
   RxBool hasFav = false.obs;
   // 是否稍后再看
   RxBool hasLater = false.obs;
-  bool isLogin = false;
   Rx<FavVideoData> favFolderData = FavVideoData().obs;
   Set? favIds;
   // 关注状态 默认未关注
   RxMap followStatus = {}.obs;
 
   RxInt lastPlayCid = 0.obs;
-  dynamic userInfo;
 
   // 同时观看
   bool isShowOnlineTotal = false;
@@ -103,10 +102,11 @@ class VideoIntroController extends GetxController {
   late final enableQuickFav =
       GStorage.setting.get(SettingBoxKey.enableQuickFav, defaultValue: false);
 
+  AccountService accountService = Get.find<AccountService>();
+
   @override
   void onInit() {
     super.onInit();
-    userInfo = GStorage.userInfo.get('userInfoCache');
     try {
       if (heroTag.isEmpty) {
         heroTag = Get.arguments['heroTag'];
@@ -139,7 +139,6 @@ class VideoIntroController extends GetxController {
         videoItem['owner'] = keys.contains('owner') ? args.owner : null;
       }
     }
-    isLogin = userInfo != null;
     lastPlayCid.value = int.parse(Get.parameters['cid']!);
     isShowOnlineTotal = GStorage.setting
         .get(SettingBoxKey.enableOnlineTotal, defaultValue: false);
@@ -194,7 +193,7 @@ class VideoIntroController extends GetxController {
           "${result['code']} ${result['msg']} ${result['data']}");
     }
     queryVideoIntroData.addAll(result);
-    if (isLogin) {
+    if (accountService.isLogin.value) {
       queryAllStatus();
       queryFollowStatus();
     }
@@ -252,7 +251,7 @@ class VideoIntroController extends GetxController {
   // 一键三连
   Future<void> actionOneThree() async {
     feedBack();
-    if (userInfo == null) {
+    if (!accountService.isLogin.value) {
       SmartDialog.showToast('账号未登录');
       return;
     }
@@ -278,7 +277,7 @@ class VideoIntroController extends GetxController {
 
   // （取消）点赞
   Future<void> actionLikeVideo() async {
-    if (userInfo == null) {
+    if (!accountService.isLogin.value) {
       SmartDialog.showToast('账号未登录');
       return;
     }
@@ -303,7 +302,7 @@ class VideoIntroController extends GetxController {
   }
 
   Future<void> actionDislikeVideo() async {
-    if (userInfo == null) {
+    if (!accountService.isLogin.value) {
       SmartDialog.showToast('账号未登录');
       return;
     }
@@ -357,7 +356,7 @@ class VideoIntroController extends GetxController {
 
   // 投币
   Future<void> actionCoinVideo() async {
-    if (userInfo == null) {
+    if (!accountService.isLogin.value) {
       SmartDialog.showToast('账号未登录');
       return;
     }
@@ -550,7 +549,9 @@ class VideoIntroController extends GetxController {
   Future queryVideoInFolder() async {
     favIds = null;
     var result = await FavHttp.videoInFolder(
-        mid: userInfo.mid, rid: IdUtils.bv2av(bvid));
+      mid: accountService.mid,
+      rid: IdUtils.bv2av(bvid),
+    );
     if (result['status']) {
       favFolderData.value = result['data'];
       favIds = favFolderData.value.list
@@ -586,7 +587,7 @@ class VideoIntroController extends GetxController {
 
   // 关注/取关up
   Future<void> actionRelationMod(BuildContext context) async {
-    if (userInfo == null) {
+    if (!accountService.isLogin.value) {
       SmartDialog.showToast('账号未登录');
       return;
     }
@@ -927,7 +928,7 @@ class VideoIntroController extends GetxController {
 
   // 收藏
   void showFavBottomSheet(BuildContext context, {type = 'tap'}) {
-    if (userInfo == null) {
+    if (!accountService.isLogin.value) {
       SmartDialog.showToast('账号未登录');
       return;
     }

lib/pages/video/member/view.dart

@@ -14,11 +14,11 @@ import 'package:PiliPlus/pages/member_video/widgets/video_card_h_member_video.da
 import 'package:PiliPlus/pages/video/controller.dart';
 import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart';
 import 'package:PiliPlus/pages/video/member/controller.dart';
+import 'package:PiliPlus/services/account_service.dart';
 import 'package:PiliPlus/utils/extension.dart';
 import 'package:PiliPlus/utils/grid.dart';
 import 'package:PiliPlus/utils/id_utils.dart';
 import 'package:PiliPlus/utils/request_utils.dart';
-import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -42,7 +42,7 @@ class HorizontalMemberPage extends StatefulWidget {
 
 class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
   late final HorizontalMemberPageController _controller;
-  int? _ownerMid;
+  AccountService accountService = Get.find<AccountService>();
   dynamic _bvid;
 
   @override
@@ -56,7 +56,6 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
       tag: widget.videoDetailController.heroTag,
     );
     _bvid = widget.videoDetailController.bvid;
-    _ownerMid = Accounts.main.mid;
   }
 
   @override
@@ -320,10 +319,10 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
                     visualDensity: const VisualDensity(vertical: -2),
                   ),
                   onPressed: () {
-                    if (widget.mid == _ownerMid) {
+                    if (widget.mid == accountService.mid) {
                       Get.toNamed('/editProfile');
                     } else {
-                      if (_ownerMid == null) {
+                      if (!accountService.isLogin.value) {
                         SmartDialog.showToast('账号未登录');
                         return;
                       }
@@ -340,7 +339,7 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {
                     }
                   },
                   child: Text(
-                    widget.mid == _ownerMid
+                    widget.mid == accountService.mid
                         ? '编辑资料'
                         : memberInfoModel.isFollowed == true
                             ? '已关注'

lib/pages/video/send_danmaku/view.dart

@@ -4,6 +4,7 @@ import 'package:PiliPlus/common/widgets/button/icon_button.dart';
 import 'package:PiliPlus/http/danmaku.dart';
 import 'package:PiliPlus/main.dart';
 import 'package:PiliPlus/models/common/publish_panel_type.dart';
+import 'package:PiliPlus/models/user/info.dart';
 import 'package:PiliPlus/pages/common/common_publish_page.dart';
 import 'package:PiliPlus/pages/setting/slide_color_picker.dart';
 import 'package:PiliPlus/utils/storage.dart';
@@ -71,12 +72,10 @@ class _SendDanmakuPanelState extends CommonPublishPageState<SendDanmakuPanel> {
     _mode = (widget.dmConfig?.mode ?? 1).obs;
     _fontsize = (widget.dmConfig?.fontsize ?? 25).obs;
     _color = (widget.dmConfig?.color ?? Colors.white).obs;
-    try {
-      final userInfo = GStorage.userInfo.get('userInfoCache');
-      if (userInfo?.vipStatus == 1) {
-        _colorList.add(Colors.transparent);
-      }
-    } catch (_) {}
+    UserInfoData? userInfo = GStorage.userInfo.get('userInfoCache');
+    if (userInfo?.vipStatus == 1) {
+      _colorList.add(Colors.transparent);
+    }
   }
 
   @override