opt: fav

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

lib/pages/bangumi/introduction/controller.dart

@@ -6,6 +6,7 @@ import 'package:PiliPlus/http/user.dart';
 import 'package:PiliPlus/pages/common/common_controller.dart';
 import 'package:PiliPlus/pages/video/detail/introduction/controller.dart';
 import 'package:PiliPlus/pages/video/detail/introduction/pay_coins_page.dart';
+import 'package:PiliPlus/utils/extension.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -59,8 +60,7 @@ class BangumiIntroController extends CommonController {
   dynamic videoTags;
   bool isLogin = false;
   Rx<FavFolderData> favFolderData = FavFolderData().obs;
-  List addMediaIdsNew = [];
+  List? favIds;
-  List delMediaIdsNew = [];
   dynamic userInfo;
 
   late final enableQuickFav =
@@ -314,14 +314,22 @@ class BangumiIntroController extends CommonController {
       });
       return;
     }
+
+    List addMediaIdsNew = [];
+    List delMediaIdsNew = [];
     try {
       for (var i in favFolderData.value.list!.toList()) {
+        bool isFaved = favIds?.contains(i.id) == true;
         if (i.favState == 1) {
+          if (isFaved.not) {
             addMediaIdsNew.add(i.id);
+          }
         } else {
+          if (isFaved) {
             delMediaIdsNew.add(i.id);
           }
         }
+      }
     } catch (_) {}
     var result = await VideoHttp.favVideo(
       aid: epId,
@@ -330,8 +338,6 @@ class BangumiIntroController extends CommonController {
       delIds: delMediaIdsNew.join(','),
     );
     if (result['status']) {
-      addMediaIdsNew = [];
-      delMediaIdsNew = [];
       SmartDialog.showToast('操作成功');
       Get.back();
       Future.delayed(const Duration(milliseconds: 255), () {
@@ -394,14 +400,10 @@ class BangumiIntroController extends CommonController {
   onChoose(bool checkValue, int index) {
     feedBack();
     List<FavFolderItemData> datalist = favFolderData.value.list!;
-    for (var i = 0; i < datalist.length; i++) {
+    datalist[index].favState = checkValue ? 1 : 0;
-      if (i == index) {
+    datalist[index].mediaCount = checkValue
-        datalist[i].favState = checkValue == true ? 1 : 0;
+        ? datalist[index].mediaCount! + 1
-        datalist[i].mediaCount = checkValue == true
+        : datalist[index].mediaCount! - 1;
-            ? datalist[i].mediaCount! + 1
-            : datalist[i].mediaCount! - 1;
-      }
-    }
     favFolderData.value.list = datalist;
     favFolderData.refresh();
   }
@@ -487,6 +489,7 @@ class BangumiIntroController extends CommonController {
   }
 
   Future queryVideoInFolder() async {
+    favIds = null;
     var result = await VideoHttp.videoInFolder(
       mid: userInfo.mid,
       rid: epId, // bangumi
@@ -494,6 +497,10 @@ class BangumiIntroController extends CommonController {
     );
     if (result['status']) {
       favFolderData.value = result['data'];
+      favIds = favFolderData.value.list
+          ?.where((item) => item.favState == 1)
+          .map((item) => item.id)
+          .toList();
     }
     return result;
   }

lib/pages/dynamics/widgets/forward_panel.dart

@@ -103,8 +103,8 @@ Widget forWard(item, context, source, callback, {floor = 1}) {
                 picsNodes(item.modules.moduleDynamic.major.opus.pics, callback),
                 // semanticsLabel: '动态图片',
               ),
-              if (item.modules.moduleDynamic.additional != null)
+              // if (item.modules.moduleDynamic.additional != null)
-                const SizedBox(height: 4),
+              //   const SizedBox(height: 4),
             ],
             const SizedBox(height: 4),
           ],

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

@@ -61,8 +61,7 @@ class VideoIntroController extends GetxController
   RxBool hasFav = false.obs;
   bool isLogin = false;
   Rx<FavFolderData> favFolderData = FavFolderData().obs;
-  List addMediaIdsNew = [];
+  List? favIds;
-  List delMediaIdsNew = [];
   // 关注状态 默认未关注
   RxMap followStatus = {}.obs;
 
@@ -414,14 +413,22 @@ class VideoIntroController extends GetxController
       });
       return;
     }
+
+    List addMediaIdsNew = [];
+    List delMediaIdsNew = [];
     try {
       for (var i in favFolderData.value.list!.toList()) {
+        bool isFaved = favIds?.contains(i.id) == true;
         if (i.favState == 1) {
+          if (isFaved.not) {
             addMediaIdsNew.add(i.id);
+          }
         } else {
+          if (isFaved) {
             delMediaIdsNew.add(i.id);
           }
         }
+      }
     } catch (e) {
       debugPrint(e.toString());
     }
@@ -433,8 +440,6 @@ class VideoIntroController extends GetxController
     );
     SmartDialog.dismiss();
     if (result['status']) {
-      addMediaIdsNew = [];
-      delMediaIdsNew = [];
       Get.back();
       // 重新获取收藏状态
       await queryHasFavVideo();
@@ -495,10 +500,15 @@ class VideoIntroController extends GetxController
   }
 
   Future queryVideoInFolder() async {
+    favIds = null;
     var result = await VideoHttp.videoInFolder(
         mid: userInfo.mid, rid: IdUtils.bv2av(bvid));
     if (result['status']) {
       favFolderData.value = result['data'];
+      favIds = favFolderData.value.list
+          ?.where((item) => item.favState == 1)
+          .map((item) => item.id)
+          .toList();
     }
     return result;
   }
@@ -507,14 +517,10 @@ class VideoIntroController extends GetxController
   onChoose(bool checkValue, int index) {
     feedBack();
     List<FavFolderItemData> datalist = favFolderData.value.list!;
-    for (var i = 0; i < datalist.length; i++) {
+    datalist[index].favState = checkValue ? 1 : 0;
-      if (i == index) {
+    datalist[index].mediaCount = checkValue
-        datalist[i].favState = checkValue == true ? 1 : 0;
+        ? datalist[index].mediaCount! + 1
-        datalist[i].mediaCount = checkValue == true
+        : datalist[index].mediaCount! - 1;
-            ? datalist[i].mediaCount! + 1
-            : datalist[i].mediaCount! - 1;
-      }
-    }
     favFolderData.value.list = datalist;
     favFolderData.refresh();
   }