feat: 我的订阅新增播单支持

lib/http/api.dart

@@ -517,8 +517,11 @@ class Api {
   /// 我的订阅
   static const userSubFolder = '/x/v3/fav/folder/collected/list';
 
-  /// 我的订阅详情
+  /// 我的订阅-合集详情
-  static const userSubFolderDetail = '/x/space/fav/season/list';
+  static const favSeasonList = '/x/space/fav/season/list';
+
+  /// 我的订阅-播单详情
+  static const favResourceList = '/x/v3/fav/resource/list';
 
   /// 发送私信
   static const String sendMsg = '${HttpString.tUrl}/web_im/v1/web_im/send_msg';
@@ -526,6 +529,9 @@ class Api {
   /// 排行榜
   static const String getRankApi = "/x/web-interface/ranking/v2";
 
-  /// 取消订阅
+  /// 取消订阅-合集
-  static const String cancelSub = '/x/v3/fav/season/unfav';
+  static const String unfavSeason = '/x/v3/fav/season/unfav';
+
+  /// 取消订阅-播单
+  static const String unfavFolder = '/x/v3/fav/folder/unfav';
 }

lib/http/user.dart

@@ -334,13 +334,33 @@ class UserHttp {
     }
   }
 
-  static Future userSubFolderDetail({
+  static Future favSeasonList({
-    required int seasonId,
+    required int id,
     required int pn,
     required int ps,
   }) async {
-    var res = await Request().get(Api.userSubFolderDetail, data: {
+    var res = await Request().get(Api.favSeasonList, data: {
-      'season_id': seasonId,
+      'season_id': id,
+      'ps': ps,
+      'pn': pn,
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': SubDetailModelData.fromJson(res.data['data'])
+      };
+    } else {
+      return {'status': false, 'msg': res.data['message']};
+    }
+  }
+
+  static Future favResourceList({
+    required int id,
+    required int pn,
+    required int ps,
+  }) async {
+    var res = await Request().get(Api.favResourceList, data: {
+      'media_id': id,
       'ps': ps,
       'pn': pn,
     });
@@ -355,15 +375,26 @@ class UserHttp {
   }
 
   // 取消订阅
-  static Future cancelSub({required int seasonId}) async {
+  static Future cancelSub({required int id, required int type}) async {
-    var res = await Request().post(
+    late dynamic res;
-      Api.cancelSub,
+    if (type == 11) {
-      queryParameters: {
+      res = await Request().post(
-        'platform': 'web',
+        Api.unfavFolder,
-        'season_id': seasonId,
+        queryParameters: {
-        'csrf': await Request.getCsrf(),
+          'media_id': id,
-      },
+          'csrf': await Request.getCsrf(),
-    );
+        },
+      );
+    } else {
+      res = await Request().post(
+        Api.unfavSeason,
+        queryParameters: {
+          'platform': 'web',
+          'season_id': id,
+          'csrf': await Request.getCsrf(),
+        },
+      );
+    }
     if (res.data['code'] == 0) {
       return {'status': true};
     } else {

lib/pages/subscription/controller.dart

@@ -66,7 +66,8 @@ class SubController extends GetxController {
           ),
           TextButton(
             onPressed: () async {
-              var res = await UserHttp.cancelSub(seasonId: subFolderItem.id!);
+              var res = await UserHttp.cancelSub(
+                  id: subFolderItem.id!, type: subFolderItem.type!);
               if (res['status']) {
                 subFolderData.value.list!.remove(subFolderItem);
                 subFolderData.update((val) {});

lib/pages/subscription/widgets/item.dart

@@ -24,7 +24,7 @@ class SubItem extends StatelessWidget {
         arguments: subFolderItem,
         parameters: {
           'heroTag': heroTag,
-          'seasonId': subFolderItem.id.toString(),
+          'id': subFolderItem.id.toString(),
         },
       ),
       child: Padding(
@@ -77,6 +77,14 @@ class VideoContent extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    // subFolderItem.type == 11：播单
+    // subFolderItem.type == 21：合集
+    // 其它：其它
+    String typeString = subFolderItem.type == 11
+        ? '播单'
+        : subFolderItem.type == 21
+            ? '合集'
+            : '其它:${subFolderItem.type}';
     return Expanded(
       child: Stack(
         children: [
@@ -95,7 +103,7 @@ class VideoContent extends StatelessWidget {
                 ),
                 const SizedBox(height: 2),
                 Text(
-                  '合集 UP主：${subFolderItem.upper!.name!}',
+                  '[$typeString] UP主：${subFolderItem.upper!.name!}',
                   textAlign: TextAlign.start,
                   style: TextStyle(
                     fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,

lib/pages/subscription_detail/controller.dart

@@ -7,7 +7,7 @@ import '../../models/user/sub_folder.dart';
 class SubDetailController extends GetxController {
   late SubFolderItemData item;
 
-  late int seasonId;
+  late int id;
   late String heroTag;
   int currentPage = 1;
   bool isLoadingMore = false;
@@ -15,12 +15,14 @@ class SubDetailController extends GetxController {
   RxList<SubDetailMediaItem> subList = <SubDetailMediaItem>[].obs;
   RxString loadingText = '加载中...'.obs;
   int mediaCount = 0;
+  RxInt playCount = 0.obs;
 
   @override
   void onInit() {
     item = Get.arguments;
+    if (playCount.value == 0) playCount.value = item.viewCount!;
     if (Get.parameters.keys.isNotEmpty) {
-      seasonId = int.parse(Get.parameters['seasonId']!);
+      id = int.parse(Get.parameters['id']!);
       heroTag = Get.parameters['heroTag']!;
     }
     super.onInit();
@@ -32,16 +34,28 @@ class SubDetailController extends GetxController {
       return;
     }
     isLoadingMore = true;
-    var res = await UserHttp.userSubFolderDetail(
+    late Map<String,dynamic> res;
-      seasonId: seasonId,
+    if (item.type! == 11) {
-      ps: 20,
+      res = await UserHttp.favResourceList(
-      pn: currentPage,
+        id: id,
-    );
+        ps: 20,
+        pn: currentPage,
+      );
+    } else {
+      res = await UserHttp.favSeasonList(// item.type! == 21
+        id: id,
+        ps: 20,
+        pn: currentPage,
+      );
+    }
     if (res['status']) {
       subInfo.value = res['data'].info;
       if (currentPage == 1 && type == 'init') {
         subList.value = res['data'].medias;
         mediaCount = res['data'].info.mediaCount;
+        if (item.type == 11) {
+          playCount.value = res['data'].info.cntInfo!['play'];
+        }
       } else if (type == 'onLoad') {
         subList.addAll(res['data'].medias);
       }

lib/pages/subscription_detail/view.dart

@@ -26,12 +26,12 @@ class _SubDetailPageState extends State<SubDetailPage> {
       Get.put(SubDetailController());
   late StreamController<bool> titleStreamC; // a
   late Future _futureBuilderFuture;
-  late String seasonId;
+  late String id;
 
   @override
   void initState() {
     super.initState();
-    seasonId = Get.parameters['seasonId']!;
+    id = Get.parameters['id']!;
     _futureBuilderFuture = _subDetailController.queryUserSubFolderDetail();
     titleStreamC = StreamController<bool>();
     _controller.addListener(
@@ -162,14 +162,17 @@ class _SubDetailPageState extends State<SubDetailPage> {
                               ),
                             ),
                             const SizedBox(height: 4),
-                            Text(
+                            Obx(
-                              '${Utils.numFormat(_subDetailController.item.viewCount)}次播放',
+                              () => Text(
-                              style: TextStyle(
+                                '${Utils.numFormat(_subDetailController.playCount.value)}次播放',
-                                  fontSize: Theme.of(context)
+                                style: TextStyle(
-                                      .textTheme
+                                    fontSize: Theme.of(context)
-                                      .labelSmall!
+                                        .textTheme
-                                      .fontSize,
+                                        .labelSmall!
-                                  color: Theme.of(context).colorScheme.outline),
+                                        .fontSize,
+                                    color:
+                                        Theme.of(context).colorScheme.outline),
+                              ),
                             ),
                           ],
                         ),