opt handle res

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
2026-08-05 02:00:13 +08:00 · 2025-05-25 11:16:35 +08:00
parent f29385ccef
commit fd55383778
91 changed files with 957 additions and 387 deletions
--- a/lib/pages/video/controller.dart
+++ b/lib/pages/video/controller.dart
@@ -23,6 +23,7 @@ import 'package:PiliPlus/models/common/video/video_quality.dart';
 import 'package:PiliPlus/models/video/later.dart';
 import 'package:PiliPlus/models/video/play/url.dart';
 import 'package:PiliPlus/models/video_detail_res.dart';
+import 'package:PiliPlus/models/video_pbp/data.dart';
 import 'package:PiliPlus/pages/search/widgets/search_text.dart';
 import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart';
 import 'package:PiliPlus/pages/video/medialist/view.dart';
@@ -1596,12 +1597,12 @@ class VideoDetailController extends GetxController
    showSteinEdgeInfo.value = false;
  }

-  List? dmTrend;
+  List<double>? dmTrend;

  Future<void> _getDmTrend() async {
-    dmTrend = [];
+    dmTrend = null;
    try {
-      dynamic res = await Request().get(
+      var res = await Request().get(
        'https://bvc.bilivideo.com/pbp/data',
        queryParameters: {
          'bvid': bvid,
@@ -1609,12 +1610,12 @@ class VideoDetailController extends GetxController
        },
      );

-      int stepSec = (res.data['step_sec'] as num?)?.toInt() ?? 0;
-      late List events = (res.data['events']['default'] as List?) ?? [];
-      if (stepSec != 0 && events.isNotEmpty) {
-        dmTrend = events;
+      PbpData data = PbpData.fromJson(res.data);
+      int stepSec = data.stepSec ?? 0;
+      if (stepSec != 0 && data.events?.eDefault?.isNotEmpty == true) {
+        dmTrend = data.events?.eDefault;
        if (plPlayerController.dmTrend.isEmpty) {
-          plPlayerController.dmTrend.value = events;
+          plPlayerController.dmTrend.value = dmTrend!;
        }
      }
    } catch (e) {
--- a/lib/pages/video/introduction/pgc/controller.dart
+++ b/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;
--- a/lib/pages/video/introduction/pgc/view.dart
+++ b/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';
--- a/lib/pages/video/introduction/pgc/widgets/bangumi_panel.dart
+++ b/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';
--- a/lib/pages/video/introduction/pgc/widgets/intro_detail.dart
+++ b/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(),
--- a/lib/pages/video/introduction/ugc/controller.dart
+++ b/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'];
--- a/lib/pages/video/introduction/ugc/view.dart
+++ b/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(),
--- a/lib/pages/video/note/controller.dart
+++ b/lib/pages/video/note/controller.dart
@@ -1,9 +1,12 @@
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/video.dart';
+import 'package:PiliPlus/models/video/note_list/data.dart';
+import 'package:PiliPlus/models/video/note_list/list.dart';
 import 'package:PiliPlus/pages/common/common_list_controller.dart';
 import 'package:get/get.dart';

-class NoteListPageCtr extends CommonListController {
+class NoteListPageCtr
+    extends CommonListController<NoteListData, NoteListItemModel> {
  NoteListPageCtr({this.oid, this.upperMid});
  final dynamic oid;
  final dynamic upperMid;
@@ -17,8 +20,9 @@ class NoteListPageCtr extends CommonListController {
  }

  @override
-  List? getDataList(response) {
-    return response['list'];
+  List<NoteListItemModel>? getDataList(NoteListData response) {
+    count.value = response.page?.total ?? -1;
+    return response.list;
  }

  @override
@@ -29,14 +33,8 @@ class NoteListPageCtr extends CommonListController {
  }

  @override
-  bool customHandleResponse(bool isRefresh, Success response) {
-    dynamic data = response.response;
-    count.value = data['page']?['total'] ?? -1;
-    return false;
-  }
-
-  @override
-  Future<LoadingState> customGetData() => VideoHttp.getVideoNoteList(
+  Future<LoadingState<NoteListData>> customGetData() =>
+      VideoHttp.getVideoNoteList(
        oid: oid,
        uperMid: upperMid,
        page: page,
--- a/lib/pages/video/note/view.dart
+++ b/lib/pages/video/note/view.dart
@@ -5,10 +5,10 @@ import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
 import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/models/common/image_type.dart';
+import 'package:PiliPlus/models/video/note_list/list.dart';
 import 'package:PiliPlus/pages/common/common_slide_page.dart';
 import 'package:PiliPlus/pages/video/note/controller.dart';
 import 'package:PiliPlus/pages/webview/view.dart';
-import 'package:PiliPlus/utils/app_scheme.dart';
 import 'package:PiliPlus/utils/extension.dart';
 import 'package:PiliPlus/utils/storage.dart' show Accounts;
 import 'package:flutter/material.dart';
@@ -156,7 +156,7 @@ class _NoteListPageState extends CommonSlidePageState<NoteListPage> {
  }

  Widget _buildBody(
-      ThemeData theme, LoadingState<List<dynamic>?> loadingState) {
+      ThemeData theme, LoadingState<List<NoteListItemModel>?> loadingState) {
    return switch (loadingState) {
      Loading() => SliverToBoxAdapter(
          child: ListView.builder(
@@ -190,24 +190,26 @@ class _NoteListPageState extends CommonSlidePageState<NoteListPage> {
    };
  }

-  Widget _itemWidget(ThemeData theme, dynamic item) {
+  Widget _itemWidget(ThemeData theme, NoteListItemModel item) {
    return InkWell(
-      onTap: () {
-        if (item['web_url'] != null && item['web_url'] != '') {
-          PiliScheme.routePushFromUrl(item['web_url']);
-        }
-      },
+      onTap: () => Get.toNamed(
+        '/articlePage',
+        parameters: {
+          'id': item.cvid!.toString(),
+          'type': 'read',
+        },
+      ),
      child: Padding(
        padding: const EdgeInsets.all(12),
        child: Row(
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
            GestureDetector(
-              onTap: () => Get.toNamed('/member?mid=${item['author']['mid']}'),
+              onTap: () => Get.toNamed('/member?mid=${item.author!.mid}'),
              child: NetworkImgLayer(
                height: 34,
                width: 34,
-                src: item['author']['face'],
+                src: item.author!.face,
                type: ImageType.avatar,
              ),
            ),
@@ -218,17 +220,15 @@ class _NoteListPageState extends CommonSlidePageState<NoteListPage> {
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
                  GestureDetector(
-                    onTap: () =>
-                        Get.toNamed('/member?mid=${item['author']['mid']}'),
+                    onTap: () => Get.toNamed('/member?mid=${item.author!.mid}'),
                    child: Row(
                      children: [
                        Text(
-                          item['author']['name'],
+                          item.author!.name!,
                          style: TextStyle(
-                            color: (item['author']?['vip_info']?['status'] ??
-                                            0) >
-                                        0 &&
-                                    item['author']?['vip_info']?['type'] == 2
+                            color: item.author?.vipInfo?.status != null &&
+                                    item.author!.vipInfo!.status > 0 &&
+                                    item.author!.vipInfo!.type == 2
                                ? context.vipColor
                                : theme.colorScheme.outline,
                            fontSize: 13,
@@ -236,38 +236,38 @@ class _NoteListPageState extends CommonSlidePageState<NoteListPage> {
                        ),
                        const SizedBox(width: 6),
                        Image.asset(
-                          'assets/images/lv/lv${item['author']['level']}.png',
+                          'assets/images/lv/lv${item.author!.isSeniorMember == 1 ? '6_s' : item.author!.level}.png',
                          height: 11,
                        ),
                      ],
                    ),
                  ),
                  const SizedBox(height: 4),
-                  Text(
-                    item['pubtime'],
-                    style: TextStyle(
-                      color: theme.colorScheme.outline,
-                      fontSize: 12,
+                  if (item.pubtime != null)
+                    Text(
+                      item.pubtime!,
+                      style: TextStyle(
+                        color: theme.colorScheme.outline,
+                        fontSize: 12,
+                      ),
                    ),
-                  ),
-                  if (item['summary'] != null) ...[
+                  if (item.summary != null) ...[
                    const SizedBox(height: 5),
                    Text(
-                      item['summary'],
+                      item.summary!,
                      style: TextStyle(
                        height: 1.75,
                        fontSize: theme.textTheme.bodyMedium!.fontSize,
                      ),
                    ),
-                    if (item['web_url'] != null && item['web_url'] != '')
-                      Text(
-                        '查看全部',
-                        style: TextStyle(
-                          color: theme.colorScheme.primary,
-                          height: 1.75,
-                          fontSize: theme.textTheme.bodyMedium!.fontSize,
-                        ),
+                    Text(
+                      '查看全部',
+                      style: TextStyle(
+                        color: theme.colorScheme.primary,
+                        height: 1.75,
+                        fontSize: theme.textTheme.bodyMedium!.fontSize,
                      ),
+                    ),
                  ],
                ],
              ),
--- a/lib/pages/video/view.dart
+++ b/lib/pages/video/view.dart
@@ -10,10 +10,11 @@ import 'package:PiliPlus/grpc/bilibili/main/community/reply/v1.pb.dart'
    show ReplyInfo;
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/main.dart';
-import 'package:PiliPlus/models/bangumi/info.dart' as bangumi;
 import 'package:PiliPlus/models/common/episode_panel_type.dart';
 import 'package:PiliPlus/models/common/search_type.dart';
+import 'package:PiliPlus/models/pgc/info.dart' as bangumi;
 import 'package:PiliPlus/models/video_detail_res.dart' as video;
+import 'package:PiliPlus/models/video_tag/data.dart';
 import 'package:PiliPlus/pages/danmaku/view.dart';
 import 'package:PiliPlus/pages/episode_panel/view.dart';
 import 'package:PiliPlus/pages/video/ai/view.dart';
@@ -2077,7 +2078,8 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
    );
  }

-  void showIntroDetail(bangumi.BangumiInfoModel videoDetail, videoTags) {
+  void showIntroDetail(
+      bangumi.BangumiInfoModel videoDetail, List<VideoTagItem>? videoTags) {
    videoDetailController.childKey.currentState?.showBottomSheet(
      backgroundColor: Colors.transparent,
      (context) => bangumi.IntroDetail(