diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart index 129bfcfb..693e7abd 100644 --- a/lib/common/widgets/video_card_h.dart +++ b/lib/common/widgets/video_card_h.dart @@ -91,8 +91,8 @@ class VideoCardH extends StatelessWidget { seasonId: isSeason ? id : null, epId: isSeason ? null : id, ); + return; } - return; } try { final int cid = diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart index d38cc7b7..072ad4c1 100644 --- a/lib/common/widgets/video_card_v.dart +++ b/lib/common/widgets/video_card_v.dart @@ -39,8 +39,7 @@ class VideoCardV extends StatelessWidget { SmartDialog.showToast('暂不支持电影观看'); return; } - int epId = videoItem.param; - Utils.viewBangumi(epId: epId); + Utils.viewBangumi(epId: videoItem.param); // SmartDialog.showLoading(msg: '资源获取中'); // var result = await SearchHttp.bangumiInfo(seasonId: null, epId: epId); // SmartDialog.dismiss(); diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 2ccf4622..b6a8f296 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -1510,16 +1510,44 @@ class _VideoDetailPageState extends State Widget get seasonPanel => Column( children: [ if ((videoIntroController.videoDetail.value.pages?.length ?? 0) > 1) - Padding( - padding: const EdgeInsets.symmetric(horizontal: 14), - child: PagesPanel( - heroTag: heroTag, - videoIntroController: videoIntroController, - bvid: videoIntroController.bvid, - changeFuc: videoIntroController.changeSeasonOrbangu, - showEpisodes: showEpisodes, + if (videoIntroController.videoDetail.value.ugcSeason != null) + Padding( + padding: const EdgeInsets.symmetric(horizontal: 14), + child: PagesPanel( + heroTag: heroTag, + videoIntroController: videoIntroController, + bvid: videoIntroController.bvid, + changeFuc: videoIntroController.changeSeasonOrbangu, + showEpisodes: showEpisodes, + ), + ) + else + Expanded( + child: Obx( + () => ListSheetContent( + episodes: videoIntroController.videoDetail.value.pages, + bvid: videoDetailController.bvid, + aid: IdUtils.bv2av(videoDetailController.bvid), + currentCid: videoDetailController.cid.value, + isReversed: + videoIntroController.videoDetail.value.isPageReversed, + changeFucCall: videoDetailController.videoType == + SearchType.media_bangumi + ? bangumiIntroController.changeSeasonOrbangu + : videoIntroController.changeSeasonOrbangu, + showTitle: false, + isSupportReverse: videoDetailController.videoType != + SearchType.media_bangumi, + onReverse: () { + onReversePlay( + bvid: videoDetailController.bvid, + aid: IdUtils.bv2av(videoDetailController.bvid), + isSeason: false, + ); + }, + ), + ), ), - ), if (videoIntroController.videoDetail.value.ugcSeason != null) ...[ if ((videoIntroController.videoDetail.value.pages?.length ?? 0) > 1) ...[