opt: 媒体库页面登录跳转

lib/http/dynamics.dart

@@ -41,6 +41,7 @@ class DynamicsHttp {
         'status': false,
         'data': [],
         'msg': res.data['message'],
+        'code': res.data['code'],
       };
     }
   }

lib/http/user.dart

@@ -62,7 +62,8 @@ class UserHttp {
       return {
         'status': false,
         'data': [],
-        'msg': res.data['message'] ?? '账号未登录'
+        'msg': res.data['message'],
+        'code': res.data['code'],
       };
     }
   }
@@ -111,7 +112,12 @@ class UserHttp {
         'data': {'list': list, 'count': res.data['data']['count']}
       };
     } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+        'code': res.data['code'],
+      };
     }
   }
 
@@ -126,7 +132,12 @@ class UserHttp {
     if (res.data['code'] == 0) {
       return {'status': true, 'data': HistoryData.fromJson(res.data['data'])};
     } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+        'code': res.data['code'],
+      };
     }
   }
 
@@ -326,7 +337,12 @@ class UserHttp {
         'data': SubFolderModelData.fromJson(res.data['data'])
       };
     } else {
-      return {'status': false, 'msg': res.data['message']};
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+        'code': res.data['code'],
+      };
     }
   }
 

lib/pages/dynamics/controller.dart

@@ -71,7 +71,7 @@ class DynamicsController extends GetxController {
 
   Future queryFollowDynamic({type = 'init'}) async {
     if (!userLogin.value) {
-      return {'status': false, 'msg': '账号未登录'};
+      return {'status': false, 'msg': '账号未登录', 'code': -101};
     }
     if (type == 'init') {
       dynamicsList.clear();
@@ -229,7 +229,7 @@ class DynamicsController extends GetxController {
 
   Future queryFollowUp({type = 'init'}) async {
     if (!userLogin.value) {
-      return {'status': false, 'msg': '账号未登录'};
+      return {'status': false, 'msg': '账号未登录', 'code': -101};
     }
     if (type == 'init') {
       upData.value.upList = <UpItem>[];

lib/pages/dynamics/view.dart

@@ -11,6 +11,7 @@ import 'package:pilipala/common/widgets/no_data.dart';
 import 'package:pilipala/models/dynamics/result.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/main_stream.dart';
+import 'package:pilipala/utils/route_push.dart';
 import 'package:pilipala/utils/storage.dart';
 
 import '../mine/controller.dart';
@@ -224,8 +225,8 @@ class _DynamicsPageState extends State<DynamicsPage>
                   if (snapshot.data == null) {
                     return const SliverToBoxAdapter(child: SizedBox());
                   }
-                  Map data = snapshot.data;
+                  Map? data = snapshot.data;
-                  if (data['status']) {
+                  if (data != null && data['status']) {
                     List<DynamicItemModel> list =
                         _dynamicsController.dynamicsList;
                     return Obx(
@@ -248,24 +249,21 @@ class _DynamicsPageState extends State<DynamicsPage>
                         }
                       },
                     );
-                  } else if (data['msg'] == "账号未登录") {
-                    return HttpError(
-                      errMsg: data['msg'],
-                      btnText: "去登录",
-                      fn: () {
-                        mineController.onLogin();
-                      },
-                    );
                   } else {
                     return HttpError(
-                      errMsg: data['msg'],
+                      errMsg: data?['msg'] ?? '请求异常',
+                      btnText: data?['code'] == -101 ? '去登录' : null,
                       fn: () {
-                        setState(() {
+                        if (data?['code'] == -101) {
-                          _futureBuilderFuture =
+                          RoutePush.loginRedirectPush();
-                              _dynamicsController.queryFollowDynamic();
+                        } else {
-                          _futureBuilderFutureUp =
+                          setState(() {
-                              _dynamicsController.queryFollowUp();
+                            _futureBuilderFuture =
-                        });
+                                _dynamicsController.queryFollowDynamic();
+                            _futureBuilderFutureUp =
+                                _dynamicsController.queryFollowUp();
+                          });
+                        }
                       },
                     );
                   }

lib/pages/fav/controller.dart

@@ -17,10 +17,15 @@ class FavController extends GetxController {
   int pageSize = 60;
   RxBool hasMore = true.obs;
 
-  Future<dynamic> queryFavFolder({type = 'init'}) async {
+  @override
+  void onInit() {
     userInfo = userInfoCache.get('userInfoCache');
+    super.onInit();
+  }
+
+  Future<dynamic> queryFavFolder({type = 'init'}) async {
     if (userInfo == null) {
-      return {'status': false, 'msg': '账号未登录'};
+      return {'status': false, 'msg': '账号未登录', 'code': -101};
     }
     if (!hasMore.value) {
       return;

lib/pages/fav/view.dart

@@ -4,6 +4,7 @@ import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/pages/fav/index.dart';
 import 'package:pilipala/pages/fav/widgets/item.dart';
+import 'package:pilipala/utils/route_push.dart';
 
 class FavPage extends StatefulWidget {
   const FavPage({super.key});
@@ -57,8 +58,8 @@ class _FavPageState extends State<FavPage> {
         future: _futureBuilderFuture,
         builder: (context, snapshot) {
           if (snapshot.connectionState == ConnectionState.done) {
-            Map data = snapshot.data as Map;
+            Map? data = snapshot.data;
-            if (data['status']) {
+            if (data != null && data['status']) {
               return Obx(
                 () => ListView.builder(
                   controller: scrollController,
@@ -74,8 +75,18 @@ class _FavPageState extends State<FavPage> {
                 physics: const NeverScrollableScrollPhysics(),
                 slivers: [
                   HttpError(
-                    errMsg: data['msg'],
+                    errMsg: data?['msg'] ?? '请求异常',
-                    fn: () => setState(() {}),
+                    btnText: data?['code'] == -101 ? '去登录' : null,
+                    fn: () {
+                      if (data?['code'] == -101) {
+                        RoutePush.loginRedirectPush();
+                      } else {
+                        setState(() {
+                          _futureBuilderFuture =
+                              _favController.queryFavFolder();
+                        });
+                      }
+                    },
                   ),
                 ],
               );

lib/pages/history/controller.dart

@@ -4,6 +4,7 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/user/history.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class HistoryController extends GetxController {
@@ -15,14 +16,20 @@ class HistoryController extends GetxController {
   RxBool isLoading = false.obs;
   RxBool enableMultiple = false.obs;
   RxInt checkedCount = 0.obs;
+  Box userInfoCache = GStrorage.userInfo;
+  UserInfoData? userInfo;
 
   @override
   void onInit() {
     super.onInit();
     historyStatus();
+    userInfo = userInfoCache.get('userInfoCache');
   }
 
   Future queryHistoryList({type = 'init'}) async {
+    if (userInfo == null) {
+      return {'status': false, 'msg': '账号未登录', 'code': -101};
+    }
     int max = 0;
     int viewAt = 0;
     if (type == 'onload') {

lib/pages/history/view.dart

@@ -5,6 +5,7 @@ import 'package:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/no_data.dart';
 import 'package:pilipala/pages/history/index.dart';
+import 'package:pilipala/utils/route_push.dart';
 
 import 'widgets/item.dart';
 
@@ -183,8 +184,8 @@ class _HistoryPageState extends State<HistoryPage> {
                   if (snapshot.data == null) {
                     return const SliverToBoxAdapter(child: SizedBox());
                   }
-                  Map data = snapshot.data;
+                  Map? data = snapshot.data;
-                  if (data['status']) {
+                  if (data != null && data['status']) {
                     return Obx(
                       () => _historyController.historyList.isNotEmpty
                           ? SliverList(
@@ -209,8 +210,18 @@ class _HistoryPageState extends State<HistoryPage> {
                     );
                   } else {
                     return HttpError(
-                      errMsg: data['msg'],
+                      errMsg: data?['msg'] ?? '请求异常',
-                      fn: () => setState(() {}),
+                      btnText: data?['code'] == -101 ? '去登录' : null,
+                      fn: () {
+                        if (data?['code'] == -101) {
+                          RoutePush.loginRedirectPush();
+                        } else {
+                          setState(() {
+                            _futureBuilderFuture =
+                                _historyController.queryHistoryList();
+                          });
+                        }
+                      },
                     );
                   }
                 } else {

lib/pages/later/controller.dart

@@ -1,16 +1,30 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:hive/hive.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/model_hot_video_item.dart';
+import 'package:pilipala/models/user/info.dart';
+import 'package:pilipala/utils/storage.dart';
 
 class LaterController extends GetxController {
   final ScrollController scrollController = ScrollController();
   RxList<HotVideoItemModel> laterList = <HotVideoItemModel>[].obs;
   int count = 0;
   RxBool isLoading = false.obs;
+  Box userInfoCache = GStrorage.userInfo;
+  UserInfoData? userInfo;
+
+  @override
+  void onInit() {
+    super.onInit();
+    userInfo = userInfoCache.get('userInfoCache');
+  }
 
   Future queryLaterList() async {
+    if (userInfo == null) {
+      return {'status': false, 'msg': '账号未登录', 'code': -101};
+    }
     isLoading.value = true;
     var res = await UserHttp.seeYouLater();
     if (res['status']) {

lib/pages/later/view.dart

@@ -5,6 +5,7 @@ import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/no_data.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import 'package:pilipala/pages/later/index.dart';
+import 'package:pilipala/utils/route_push.dart';
 
 class LaterPage extends StatefulWidget {
   const LaterPage({super.key});
@@ -72,8 +73,8 @@ class _LaterPageState extends State<LaterPage> {
             future: _futureBuilderFuture,
             builder: (context, snapshot) {
               if (snapshot.connectionState == ConnectionState.done) {
-                Map data = snapshot.data as Map;
+                Map? data = snapshot.data;
-                if (data['status']) {
+                if (data != null && data['status']) {
                   return Obx(
                     () => _laterController.laterList.isNotEmpty &&
                             !_laterController.isLoading.value
@@ -96,10 +97,18 @@ class _LaterPageState extends State<LaterPage> {
                   );
                 } else {
                   return HttpError(
-                    errMsg: data['msg'],
+                    errMsg: data?['msg'] ?? '请求异常',
-                    fn: () => setState(() {
+                    btnText: data?['code'] == -101 ? '去登录' : null,
-                      _futureBuilderFuture = _laterController.queryLaterList();
+                    fn: () {
-                    }),
+                      if (data?['code'] == -101) {
+                        RoutePush.loginRedirectPush();
+                      } else {
+                        setState(() {
+                          _futureBuilderFuture =
+                              _laterController.queryLaterList();
+                        });
+                      }
+                    },
                   );
                 }
               } else {

lib/pages/mine/controller.dart

@@ -6,6 +6,7 @@ import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/common/theme_type.dart';
 import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/models/user/stat.dart';
+import 'package:pilipala/utils/route_push.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class MineController extends GetxController {
@@ -33,14 +34,7 @@ class MineController extends GetxController {
 
   onLogin() async {
     if (!userLogin.value) {
-      Get.toNamed(
+      RoutePush.loginPush();
-        '/webview',
-        parameters: {
-          'url': 'https://passport.bilibili.com/h5-app/passport/login',
-          'type': 'login',
-          'pageTitle': '登录bilibili',
-        },
-      );
       // Get.toNamed('/loginPage');
     } else {
       int mid = userInfo.value.mid!;

lib/pages/subscription/controller.dart

@@ -17,10 +17,15 @@ class SubController extends GetxController {
   int pageSize = 20;
   RxBool hasMore = true.obs;
 
-  Future<dynamic> querySubFolder({type = 'init'}) async {
+  @override
+  void onInit() {
+    super.onInit();
     userInfo = userInfoCache.get('userInfoCache');
+  }
+
+  Future<dynamic> querySubFolder({type = 'init'}) async {
     if (userInfo == null) {
-      return {'status': false, 'msg': '账号未登录'};
+      return {'status': false, 'msg': '账号未登录', 'code': -101};
     }
     var res = await UserHttp.userSubFolder(
       pn: currentPage,

lib/pages/subscription/view.dart

@@ -2,6 +2,7 @@ import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/utils/route_push.dart';
 import 'controller.dart';
 import 'widgets/item.dart';
 
@@ -68,8 +69,18 @@ class _SubPageState extends State<SubPage> {
                 physics: const NeverScrollableScrollPhysics(),
                 slivers: [
                   HttpError(
-                    errMsg: data?['msg'],
+                    errMsg: data?['msg'] ?? '请求异常',
-                    fn: () => setState(() {}),
+                    btnText: data?['code'] == -101 ? '去登录' : null,
+                    fn: () {
+                      if (data?['code'] == -101) {
+                        RoutePush.loginRedirectPush();
+                      } else {
+                        setState(() {
+                          _futureBuilderFuture =
+                              _subController.querySubFolder();
+                        });
+                      }
+                    },
                   ),
                 ],
               );

lib/utils/route_push.dart

@@ -41,4 +41,28 @@ class RoutePush {
       SmartDialog.showToast('番剧获取失败：$e');
     }
   }
+
+  // 登录跳转
+  static Future<void> loginPush() async {
+    await Get.toNamed(
+      '/webview',
+      parameters: {
+        'url': 'https://passport.bilibili.com/h5-app/passport/login',
+        'type': 'login',
+        'pageTitle': '登录bilibili',
+      },
+    );
+  }
+
+  // 登录跳转
+  static Future<void> loginRedirectPush() async {
+    await Get.offAndToNamed(
+      '/webview',
+      parameters: {
+        'url': 'https://passport.bilibili.com/h5-app/passport/login',
+        'type': 'login',
+        'pageTitle': '登录bilibili',
+      },
+    );
+  }
 }