opt handle res

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

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

@@ -6,8 +6,9 @@ import 'package:PiliPlus/grpc/view.dart';
 import 'package:PiliPlus/http/constants.dart';
 import 'package:PiliPlus/http/user.dart';
 import 'package:PiliPlus/http/video.dart';
-import 'package:PiliPlus/models/bangumi/info.dart';
+import 'package:PiliPlus/models/pgc/info.dart';
 import 'package:PiliPlus/models/user/fav_folder.dart';
+import 'package:PiliPlus/models/video_tag/data.dart';
 import 'package:PiliPlus/pages/dynamics_repost/view.dart';
 import 'package:PiliPlus/pages/video/controller.dart';
 import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart';
@@ -50,7 +51,7 @@ class BangumiIntroController extends GetxController {
   // 是否收藏
   RxBool hasFav = false.obs;
 
-  dynamic videoTags;
+  List<VideoTagItem>? videoTags;
 
   List? favIds;
   Rx<FavFolderData> favFolderData = FavFolderData().obs;

lib/pages/video/introduction/pgc/view.dart

@@ -5,8 +5,8 @@ import 'package:PiliPlus/common/widgets/badge.dart';
 import 'package:PiliPlus/common/widgets/dialog/dialog.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
-import 'package:PiliPlus/models/bangumi/info.dart';
 import 'package:PiliPlus/models/common/image_preview_type.dart';
+import 'package:PiliPlus/models/pgc/info.dart';
 import 'package:PiliPlus/pages/video/controller.dart';
 import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart';
 import 'package:PiliPlus/pages/video/introduction/pgc/widgets/bangumi_panel.dart';

lib/pages/video/introduction/pgc/widgets/bangumi_panel.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:PiliPlus/models/bangumi/info.dart';
+import 'package:PiliPlus/models/pgc/info.dart';
 import 'package:PiliPlus/pages/video/controller.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/utils.dart';

lib/pages/video/introduction/pgc/widgets/intro_detail.dart

@@ -1,18 +1,21 @@
 import 'package:PiliPlus/common/widgets/button/icon_button.dart';
+import 'package:PiliPlus/common/widgets/keep_alive_wrapper.dart';
 import 'package:PiliPlus/common/widgets/page/tabs.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
-import 'package:PiliPlus/models/bangumi/info.dart';
+import 'package:PiliPlus/models/pgc/info.dart';
+import 'package:PiliPlus/models/video_tag/data.dart';
 import 'package:PiliPlus/pages/common/common_collapse_slide_page.dart';
 import 'package:PiliPlus/pages/pgc_review/view.dart';
 import 'package:PiliPlus/pages/search/widgets/search_text.dart';
+import 'package:PiliPlus/utils/extension.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:flutter/material.dart' hide TabBarView;
 import 'package:get/get.dart';
 
 class IntroDetail extends CommonCollapseSlidePage {
   final BangumiInfoModel bangumiDetail;
-  final dynamic videoTags;
+  final List<VideoTagItem>? videoTags;
 
   const IntroDetail({
     super.key,
@@ -27,10 +30,12 @@ class IntroDetail extends CommonCollapseSlidePage {
 
 class _IntroDetailState extends CommonCollapseSlidePageState<IntroDetail> {
   late final _tabController = TabController(length: 2, vsync: this);
+  final _controller = ScrollController();
 
   @override
   void dispose() {
     _tabController.dispose();
+    _controller.dispose();
     super.dispose();
   }
 
@@ -50,6 +55,13 @@ class _IntroDetailState extends CommonCollapseSlidePageState<IntroDetail> {
               tabAlignment: TabAlignment.start,
               dividerColor: Colors.transparent,
               tabs: const [Tab(text: '详情'), Tab(text: '点评')],
+              onTap: (index) {
+                if (!_tabController.indexIsChanging) {
+                  if (index == 0) {
+                    _controller.animToTop();
+                  }
+                }
+              },
             ),
           ),
           iconButton(
@@ -63,7 +75,7 @@ class _IntroDetailState extends CommonCollapseSlidePageState<IntroDetail> {
         ],
       ),
       children: [
-        buildList(theme),
+        KeepAliveWrapper(builder: (context) => buildList(theme)),
         PgcReviewPage(
           name: widget.bangumiDetail.title!,
           mediaId: widget.bangumiDetail.mediaId,
@@ -79,7 +91,7 @@ class _IntroDetailState extends CommonCollapseSlidePageState<IntroDetail> {
       color: theme.colorScheme.onSurface,
     );
     return ListView(
-      controller: ScrollController(),
+      controller: _controller,
       physics: const AlwaysScrollableScrollPhysics(),
       padding: EdgeInsets.only(
         left: 14,
@@ -90,9 +102,7 @@ class _IntroDetailState extends CommonCollapseSlidePageState<IntroDetail> {
       children: [
         SelectableText(
           widget.bangumiDetail.title!,
-          style: const TextStyle(
-            fontSize: 16,
-          ),
+          style: const TextStyle(fontSize: 16),
         ),
         const SizedBox(height: 4),
         Row(
@@ -149,23 +159,21 @@ class _IntroDetailState extends CommonCollapseSlidePageState<IntroDetail> {
           widget.bangumiDetail.actors!,
           style: smallTitle.copyWith(fontSize: 14),
         ),
-        if (widget.videoTags is List && widget.videoTags.isNotEmpty) ...[
+        if (widget.videoTags?.isNotEmpty == true) ...[
           const SizedBox(height: 10),
           Wrap(
             spacing: 8,
             runSpacing: 8,
-            children: (widget.videoTags as List)
+            children: widget.videoTags!
                 .map(
                   (item) => SearchText(
                     fontSize: 13,
-                    text: item['tag_name'],
-                    onTap: (_) => Get.toNamed(
+                    text: item.tagName!,
+                    onTap: (tagName) => Get.toNamed(
                       '/searchResult',
-                      parameters: {
-                        'keyword': item['tag_name'],
-                      },
+                      parameters: {'keyword': tagName},
                     ),
-                    onLongPress: (_) => Utils.copyText(item['tag_name']),
+                    onLongPress: (tagName) => Utils.copyText(tagName),
                   ),
                 )
                 .toList(),

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

@@ -11,6 +11,7 @@ import 'package:PiliPlus/http/video.dart';
 import 'package:PiliPlus/models/user/fav_folder.dart';
 import 'package:PiliPlus/models/video/ai.dart';
 import 'package:PiliPlus/models/video_detail_res.dart';
+import 'package:PiliPlus/models/video_tag/data.dart';
 import 'package:PiliPlus/pages/dynamics_repost/view.dart';
 import 'package:PiliPlus/pages/video/controller.dart';
 import 'package:PiliPlus/pages/video/pay_coins/view.dart';
@@ -50,7 +51,7 @@ class VideoIntroController extends GetxController {
   // up主粉丝数
   RxMap<String, dynamic> userStat = RxMap<String, dynamic>({'follower': '-'});
 
-  dynamic videoTags;
+  List<VideoTagItem>? videoTags;
 
   // 是否点赞
   RxBool hasLike = false.obs;
@@ -187,6 +188,7 @@ class VideoIntroController extends GetxController {
   }
 
   Future<void> queryVideoTags() async {
+    videoTags = null;
     var result = await UserHttp.videoTags(bvid: bvid);
     if (result['status']) {
       videoTags = result['data'];

lib/pages/video/introduction/ugc/view.dart

@@ -697,8 +697,8 @@ class _VideoInfoState extends State<VideoInfo> {
                             ),
                           ),
                         ],
-                        if (videoIntroController.videoTags is List &&
-                            videoIntroController.videoTags.isNotEmpty) ...[
+                        if (videoIntroController.videoTags?.isNotEmpty ==
+                            true) ...[
                           GestureDetector(
                             onTap: () {},
                             behavior: HitTestBehavior.opaque,
@@ -708,20 +708,17 @@ class _VideoInfoState extends State<VideoInfo> {
                               child: Wrap(
                                 spacing: 8,
                                 runSpacing: 8,
-                                children: (videoIntroController.videoTags
-                                        as List)
+                                children: videoIntroController.videoTags!
                                     .map(
                                       (item) => SearchText(
                                         fontSize: 13,
-                                        text: item['tag_name'],
-                                        onTap: (_) => Get.toNamed(
+                                        text: item.tagName!,
+                                        onTap: (tagName) => Get.toNamed(
                                           '/searchResult',
-                                          parameters: {
-                                            'keyword': item['tag_name']
-                                          },
+                                          parameters: {'keyword': tagName},
                                         ),
-                                        onLongPress: (_) =>
-                                            Utils.copyText(item['tag_name']),
+                                        onLongPress: (tagName) =>
+                                            Utils.copyText(tagName),
                                       ),
                                     )
                                     .toList(),