Merge branch 'design'

lib/pages/video/detail/controller.dart

@@ -119,6 +119,7 @@ class VideoDetailController extends GetxController
   List<MediaVideoItemModel> mediaList = <MediaVideoItemModel>[];
   RxBool isWatchLaterVisible = false.obs;
   RxString watchLaterTitle = ''.obs;
+  RxInt watchLaterCount = 0.obs;
 
   @override
   void onInit() {
@@ -170,7 +171,7 @@ class VideoDetailController extends GetxController
 
     sourceType.value = argMap['sourceType'] ?? 'normal';
     isWatchLaterVisible.value =
-        sourceType.value == 'watchLater' || sourceType.value == 'fav';
+        ['watchLater', 'fav', 'up_archive'].contains(sourceType.value);
     if (sourceType.value == 'watchLater') {
       watchLaterTitle.value = '稍后再看';
       fetchMediaList();
@@ -179,6 +180,11 @@ class VideoDetailController extends GetxController
       watchLaterTitle.value = argMap['favTitle'];
       queryFavVideoList();
     }
+    if (sourceType.value == 'up_archive') {
+      watchLaterTitle.value = argMap['favTitle'];
+      watchLaterCount.value = argMap['count'];
+      queryArchiveVideoList();
+    }
     tabCtr.addListener(() {
       onTabChanged();
     });
@@ -585,7 +591,9 @@ class VideoDetailController extends GetxController
   }
 
   void toggeleWatchLaterVisible(bool val) {
-    if (sourceType.value == 'watchLater' || sourceType.value == 'fav') {
+    if (sourceType.value == 'watchLater' ||
+        sourceType.value == 'fav' ||
+        sourceType.value == 'up_archive') {
       isWatchLaterVisible.value = !isWatchLaterVisible.value;
     }
   }
@@ -616,8 +624,19 @@ class VideoDetailController extends GetxController
         changeMediaList: changeMediaList,
         panelTitle: watchLaterTitle.value,
         bvid: bvid,
-        mediaId: Get.arguments['mediaId'],
+        mediaId: [
+          'watchLater',
+          'fav',
+        ].contains(sourceType.value)
+            ? Get.arguments['mediaId']
+            : Get.arguments['favInfo'].owner.mid,
         hasMore: mediaList.length != Get.arguments['count'],
+        type: [
+          'watchLater',
+          'fav',
+        ].contains(sourceType.value)
+            ? 3
+            : 1,
       );
     });
     replyReplyBottomSheetCtr?.closed.then((value) {
@@ -667,6 +686,21 @@ class VideoDetailController extends GetxController
     }
   }
 
+  Future queryArchiveVideoList() async {
+    final Map argMap = Get.arguments;
+    var favInfo = argMap['favInfo'];
+    var sortField = argMap['sortField'];
+    var res = await UserHttp.parseUpArchiveVideo(
+      mid: favInfo.owner.mid,
+      oid: oid.value,
+      bvid: bvid,
+      sortField: sortField,
+    );
+    if (res['status']) {
+      mediaList = res['data'];
+    }
+  }
+
   // 监听tabBarView切换
   void onTabChanged() {
     isWatchLaterVisible.value = tabCtr.index == 0;

lib/pages/video/detail/introduction/widgets/fav_panel.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
-import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/logic_utils.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class FavPanel extends StatefulWidget {
@@ -67,14 +67,13 @@ class _FavPanelState extends State<FavPanel> {
                             onTap: () =>
                                 widget.ctr!.onChoose(item.favState != 1, index),
                             dense: true,
-                            leading: Icon(
-                                Constants.publicFavFolder.contains(item.attr)
-                                    ? Icons.folder_outlined
-                                    : Icons.lock_outline),
+                            leading: Icon(LogicUtils.isPublic(item.attr)
+                                ? Icons.folder_outlined
+                                : Icons.lock_outline),
                             minLeadingWidth: 0,
                             title: Text(item.title!),
                             subtitle: Text(
-                              '${item.mediaCount}个内容 - ${Constants.publicFavFolder.contains(item.attr) ? '公开' : '私密'}',
+                              '${item.mediaCount}个内容 - ${LogicUtils.isPublic(item.attr) ? '公开' : '私密'}',
                             ),
                             trailing: Transform.scale(
                               scale: 0.9,

lib/pages/video/detail/view.dart

@@ -783,7 +783,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
           Obx(
             () => Visibility(
               visible: vdCtr.sourceType.value == 'watchLater' ||
-                  vdCtr.sourceType.value == 'fav',
+                  vdCtr.sourceType.value == 'fav' ||
+                  vdCtr.sourceType.value == 'up_archive',
               child: AnimatedPositioned(
                 duration: const Duration(milliseconds: 400),
                 curve: Curves.easeInOut,
@@ -815,17 +816,21 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                       child: Row(children: [
                         const Icon(Icons.playlist_play, size: 24),
                         const SizedBox(width: 10),
-                        Text(
-                          vdCtr.watchLaterTitle.value,
-                          style: TextStyle(
-                            color: Theme.of(context)
-                                .colorScheme
-                                .onSecondaryContainer,
-                            fontWeight: FontWeight.bold,
-                            letterSpacing: 0.2,
+                        Expanded(
+                          child: Text(
+                            vdCtr.watchLaterTitle.value,
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: TextStyle(
+                              color: Theme.of(context)
+                                  .colorScheme
+                                  .onSecondaryContainer,
+                              fontWeight: FontWeight.bold,
+                              letterSpacing: 0.2,
+                            ),
                           ),
                         ),
-                        const Spacer(),
+                        const SizedBox(width: 50),
                         const Icon(Icons.keyboard_arrow_up_rounded, size: 26),
                       ]),
                     ),

lib/pages/video/detail/widgets/watch_later_list.dart

@@ -19,8 +19,9 @@ class MediaListPanel extends StatefulWidget {
     this.changeMediaList,
     this.panelTitle,
     this.bvid,
-    this.mediaId,
+    required this.mediaId,
     this.hasMore = false,
+    required this.type,
     super.key,
   });
 
@@ -29,8 +30,9 @@ class MediaListPanel extends StatefulWidget {
   final Function? changeMediaList;
   final String? panelTitle;
   final String? bvid;
-  final int? mediaId;
+  final int mediaId;
   final bool hasMore;
+  final int type;
 
   @override
   State<MediaListPanel> createState() => _MediaListPanelState();
@@ -59,8 +61,8 @@ class _MediaListPanelState extends State<MediaListPanel> {
 
   void loadMore() async {
     var res = await UserHttp.getMediaList(
-      type: 3,
-      bizId: widget.mediaId!,
+      type: widget.type,
+      bizId: widget.mediaId,
       ps: 20,
       oid: mediaList.last.id,
     );