refactor: fav

lib/http/user.dart

@@ -1,3 +1,4 @@
+import 'package:PiliPalaX/http/loading_state.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import '../common/constants.dart';
 import '../models/model_hot_video_item.dart';
@@ -42,6 +43,27 @@ class UserHttp {
   }
 
   // 收藏夹
+  static Future<LoadingState> userfavFolderNew({
+    required int pn,
+    required int ps,
+    required int mid,
+  }) async {
+    var res = await Request().get(Api.userFavFolder, data: {
+      'pn': pn,
+      'ps': ps,
+      'up_mid': mid,
+    });
+    if (res.data['code'] == 0) {
+      if (res.data['data'] != null) {
+        return LoadingState.success(FavFolderData.fromJson(res.data['data']));
+      } else {
+        return LoadingState.empty();
+      }
+    } else {
+      return LoadingState.error(res.data['message'] ?? '账号未登录');
+    }
+  }
+
   static Future<dynamic> userfavFolder({
     required int pn,
     required int ps,

lib/pages/fav/controller.dart

@@ -1,55 +1,50 @@
-import 'package:flutter/material.dart';
+import 'package:PiliPalaX/http/loading_state.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:PiliPalaX/pages/common/common_controller.dart';
-import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:PiliPalaX/http/user.dart';
-import 'package:PiliPalaX/models/user/fav_folder.dart';
 import 'package:PiliPalaX/models/user/info.dart';
 import 'package:PiliPalaX/utils/storage.dart';
 
-class FavController extends GetxController {
+class FavController extends CommonController {
-  final ScrollController scrollController = ScrollController();
-  Rx<FavFolderData> favFolderData = FavFolderData().obs;
   Box userInfoCache = GStorage.userInfo;
-  UserInfoData? userInfo;
+  late final UserInfoData? userInfo = userInfoCache.get('userInfoCache');
-  int currentPage = 1;
   int pageSize = 10;
-  RxBool hasMore = true.obs;
+  bool hasMore = true;
 
-  Future<dynamic> queryFavFolder({type = 'init'}) async {
+  @override
-    userInfo = userInfoCache.get('userInfoCache');
+  void onInit() {
+    super.onInit();
+    queryData();
+  }
+
+  @override
+  Future queryData([bool isRefresh = true]) {
     if (userInfo == null) {
-      return {'status': false, 'msg': '账号未登录'};
+      loadingState.value = LoadingState.error('账号未登录');
+      return Future.value();
     }
-    if (!hasMore.value) {
+    if (!hasMore) {
-      return;
+      return Future.value();
     }
-    var res = await UserHttp.userfavFolder(
+    return super.queryData(isRefresh);
+  }
+
+  @override
+  bool customHandleResponse(Success response) {
+    hasMore = response.response.hasMore;
+    List currentList = loadingState.value is Success
+        ? (loadingState.value as Success).response
+        : [];
+    loadingState.value = currentPage == 1
+        ? LoadingState.success(response.response.list)
+        : LoadingState.success(currentList + response.response.list);
+    return true;
+  }
+
+  @override
+  Future<LoadingState> customGetData() => UserHttp.userfavFolderNew(
         pn: currentPage,
         ps: pageSize,
         mid: userInfo!.mid!,
       );
-    if (res['status']) {
-      if (type == 'init') {
-        favFolderData.value = res['data'];
-      } else {
-        if (res['data'].list.isNotEmpty) {
-          favFolderData.value.list!.addAll(res['data'].list);
-          favFolderData.update((val) {});
-        }
-      }
-      hasMore.value = res['data'].hasMore;
-      currentPage++;
-      if (hasMore.value && type == 'init') {
-        queryFavFolder(type: 'onload');
-      }
-    } else {
-      SmartDialog.showToast(res['msg']);
-    }
-    return res;
-  }
-
-  Future onLoad() async {
-    queryFavFolder(type: 'onload');
-  }
 }

lib/pages/fav/view.dart

@@ -1,4 +1,5 @@
 import 'package:PiliPalaX/common/skeleton/video_card_h.dart';
+import 'package:PiliPalaX/http/loading_state.dart';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -18,20 +19,16 @@ class FavPage extends StatefulWidget {
 
 class _FavPageState extends State<FavPage> {
   final FavController _favController = Get.put(FavController());
-  late Future _futureBuilderFuture;
-  late ScrollController scrollController;
 
   @override
   void initState() {
     super.initState();
-    _futureBuilderFuture = _favController.queryFavFolder();
+    _favController.scrollController.addListener(
-    scrollController = _favController.scrollController;
-    scrollController.addListener(
       () {
-        if (scrollController.position.pixels >=
+        if (_favController.scrollController.position.pixels >=
-            scrollController.position.maxScrollExtent - 300) {
+            _favController.scrollController.position.maxScrollExtent - 300) {
           EasyThrottle.throttle('history', const Duration(seconds: 1), () {
-            _favController.onLoad();
+            _favController.onLoadMore();
           });
         }
       },
@@ -40,8 +37,7 @@ class _FavPageState extends State<FavPage> {
 
   @override
   void dispose() {
-    scrollController.removeListener(() {});
+    _favController.scrollController.removeListener(() {});
-    scrollController.dispose();
     super.dispose();
   }
 
@@ -57,25 +53,33 @@ class _FavPageState extends State<FavPage> {
         ),
         actions: [
           IconButton(
-            onPressed: () => Get.toNamed(
+            onPressed: () {
-                '/favSearch?searchType=1&mediaId=${_favController.favFolderData.value.list!.first.id}'),
+              if (_favController.loadingState.value is Success) {
+                Get.toNamed(
+                    '/favSearch?searchType=1&mediaId=${(_favController.loadingState.value as Success).response.first.id}');
+              }
+            },
             icon: const Icon(Icons.search_outlined),
             tooltip: '搜索',
           ),
           const SizedBox(width: 6),
         ],
       ),
-      body: FutureBuilder(
+      body: CustomScrollView(
-        future: _futureBuilderFuture,
+        controller: _favController.scrollController,
-        builder: (context, snapshot) {
-          if (snapshot.connectionState == ConnectionState.done) {
-            Map data = snapshot.data as Map;
-            if (data['status']) {
-              return Obx(() => CustomScrollView(
-                      controller: scrollController,
         physics: const AlwaysScrollableScrollPhysics(),
         slivers: [
-                        SliverGrid(
+          Obx(
+            () => _buildBody(_favController.loadingState.value),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildBody(LoadingState loadingState) {
+    return loadingState is Success
+        ? SliverGrid(
             gridDelegate: SliverGridDelegateWithExtentAndRatio(
                 mainAxisSpacing: StyleString.cardSpace,
                 crossAxisSpacing: StyleString.safeSpace,
@@ -83,33 +87,18 @@ class _FavPageState extends State<FavPage> {
                 childAspectRatio: StyleString.aspectRatio * 2.4,
                 mainAxisExtent: 0),
             delegate: SliverChildBuilderDelegate(
-                            childCount:
+              childCount: loadingState.response.length,
-                                _favController.favFolderData.value.list!.length,
               (BuildContext context, int index) {
-                              return FavItem(
+                return FavItem(favFolderItem: loadingState.response[index]);
-                                  favFolderItem: _favController
-                                      .favFolderData.value.list![index]);
               },
             ),
           )
-                      ]));
+        : loadingState is Error
-            } else {
+            ? HttpError(
-              return CustomScrollView(
+                errMsg: loadingState.errMsg,
-                physics: const NeverScrollableScrollPhysics(),
+                fn: _favController.onReload,
-                slivers: [
+              )
-                  HttpError(
+            : SliverGrid(
-                    errMsg: data['msg'],
-                    fn: () => setState(() {}),
-                  ),
-                ],
-              );
-            }
-          } else {
-            // 骨架屏
-            return CustomScrollView(
-              physics: const NeverScrollableScrollPhysics(),
-              slivers: [
-                SliverGrid(
                 gridDelegate: SliverGridDelegateWithExtentAndRatio(
                     mainAxisSpacing: StyleString.cardSpace,
                     crossAxisSpacing: StyleString.safeSpace,
@@ -122,12 +111,6 @@ class _FavPageState extends State<FavPage> {
                   },
                   childCount: 10,
                 ),
-                ),
-              ],
-            );
-          }
-        },
-      ),
               );
   }
 }

lib/pages/fav_detail/widget/fav_video_card.dart

@@ -157,7 +157,7 @@ class VideoContent extends StatelessWidget {
                   videoItem.title,
                   textAlign: TextAlign.start,
                   style: const TextStyle(
-                    fontWeight: FontWeight.w600,
+                    fontWeight: FontWeight.w400,
                     letterSpacing: 0.3,
                   ),
                   maxLines: 2,