fix: 收藏夹

lib/pages/fav/view.dart

@@ -79,56 +79,68 @@ class _FavPageState extends State<FavPage> {
           const SizedBox(width: 14),
         ],
       ),
-      body: FutureBuilder(
+      body: RefreshIndicator(
-        future: _futureBuilderFuture,
+        onRefresh: () async {
-        builder: (context, snapshot) {
+          _favController.hasMore.value = true;
-          if (snapshot.connectionState == ConnectionState.done) {
+          _favController.currentPage = 1;
-            Map? data = snapshot.data;
+          setState(() {
-            if (data != null && data['status']) {
+            _futureBuilderFuture = _favController.queryFavFolder(type: 'init');
-              return Obx(
+          });
-                () => ListView.builder(
-                  controller: scrollController,
-                  itemCount: _favController.favFolderList.length,
-                  itemBuilder: (context, index) {
-                    return FavItem(
-                      favFolderItem: _favController.favFolderList[index],
-                      isOwner: _favController.isOwner.value,
-                    );
-                  },
-                ),
-              );
-            } else {
-              return CustomScrollView(
-                physics: const NeverScrollableScrollPhysics(),
-                slivers: [
-                  HttpError(
-                    errMsg: data?['msg'] ?? '请求异常',
-                    btnText: data?['code'] == -101 ? '去登录' : null,
-                    fn: () {
-                      if (data?['code'] == -101) {
-                        RoutePush.loginRedirectPush();
-                      } else {
-                        setState(() {
-                          _futureBuilderFuture =
-                              _favController.queryFavFolder();
-                        });
-                      }
-                    },
-                  ),
-                ],
-              );
-            }
-          } else {
-            // 骨架屏
-            return ListView.builder(
-              itemBuilder: (context, index) {
-                return const VideoCardHSkeleton();
-              },
-              itemCount: 10,
-            );
-          }
         },
+        child: _buildBody(),
       ),
     );
   }
+
+  Widget _buildBody() {
+    return FutureBuilder(
+      future: _futureBuilderFuture,
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.done) {
+          Map? data = snapshot.data;
+          if (data != null && data['status']) {
+            return Obx(
+              () => ListView.builder(
+                controller: scrollController,
+                itemCount: _favController.favFolderList.length,
+                itemBuilder: (context, index) {
+                  return FavItem(
+                    favFolderItem: _favController.favFolderList[index],
+                    isOwner: _favController.isOwner.value,
+                  );
+                },
+              ),
+            );
+          } else {
+            return CustomScrollView(
+              physics: const NeverScrollableScrollPhysics(),
+              slivers: [
+                HttpError(
+                  errMsg: data?['msg'] ?? '请求异常',
+                  btnText: data?['code'] == -101 ? '去登录' : null,
+                  fn: () {
+                    if (data?['code'] == -101) {
+                      RoutePush.loginRedirectPush();
+                    } else {
+                      setState(() {
+                        _futureBuilderFuture = _favController.queryFavFolder();
+                      });
+                    }
+                  },
+                ),
+              ],
+            );
+          }
+        } else {
+          // 骨架屏
+          return ListView.builder(
+            itemBuilder: (context, index) {
+              return const VideoCardHSkeleton();
+            },
+            itemCount: 10,
+          );
+        }
+      },
+    );
+  }
 }

lib/pages/fav_detail/controller.dart

@@ -10,6 +10,7 @@ import 'package:pilipala/utils/utils.dart';
 
 class FavDetailController extends GetxController {
   FavFolderItemData? item;
+  RxString title = ''.obs;
 
   int? mediaId;
   late String heroTag;
@@ -24,6 +25,7 @@ class FavDetailController extends GetxController {
   @override
   void onInit() {
     item = Get.arguments;
+    title.value = item!.title!;
     if (Get.parameters.keys.isNotEmpty) {
       mediaId = int.parse(Get.parameters['mediaId']!);
       heroTag = Get.parameters['heroTag']!;
@@ -117,15 +119,17 @@ class FavDetailController extends GetxController {
   }
 
   onEditFavFolder() async {
-    Get.toNamed(
+    var res = await Get.toNamed(
       '/favEdit',
       arguments: {
         'mediaId': mediaId.toString(),
         'title': item!.title,
         'intro': item!.intro,
         'cover': item!.cover,
-        'privacy': item!.attr,
+        'privacy': [23, 1].contains(item!.attr) ? 1 : 0,
       },
     );
+    title.value = res['title'];
+    print(title);
   }
 }

lib/pages/fav_detail/view.dart

@@ -80,9 +80,11 @@ class _FavDetailPageState extends State<FavDetailPage> {
                       Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-                          Text(
+                          Obx(
-                            _favDetailController.item!.title!,
+                            () => Text(
-                            style: Theme.of(context).textTheme.titleMedium,
+                              _favDetailController.title.value,
+                              style: Theme.of(context).textTheme.titleMedium,
+                            ),
                           ),
                           Text(
                             '共${_favDetailController.mediaCount}条视频',
@@ -156,14 +158,16 @@ class _FavDetailPageState extends State<FavDetailPage> {
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
                             const SizedBox(height: 4),
-                            Text(
+                            Obx(
-                              _favDetailController.item!.title!,
+                              () => Text(
-                              style: TextStyle(
+                                _favDetailController.title.value,
-                                  fontSize: Theme.of(context)
+                                style: TextStyle(
-                                      .textTheme
+                                    fontSize: Theme.of(context)
-                                      .titleMedium!
+                                        .textTheme
-                                      .fontSize,
+                                        .titleMedium!
-                                  fontWeight: FontWeight.bold),
+                                        .fontSize,
+                                    fontWeight: FontWeight.bold),
+                              ),
                             ),
                             const SizedBox(height: 4),
                             Text(

lib/pages/fav_edit/controller.dart

@@ -56,7 +56,7 @@ class FavEditController extends GetxController {
     );
     if (res['status']) {
       SmartDialog.showToast('编辑成功');
-      Get.back();
+      Get.back(result: {'title': title});
     } else {
       SmartDialog.showToast(res['msg']);
     }