HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-06 09:13:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt: episodes showing

Browse Source
This commit is contained in:
bggRGjQaUbCoE
2024-09-17 22:56:06 +08:00
parent c0db847a27
commit a398d1304c
8 changed files with 121 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/common/widgets/list_sheet.dart
View File

@@ -18,6 +18,7 @@ class ListSheet {
required this.currentCid,
required this.changeFucCall,
required this.context,
this.scaffoldState,
});
final dynamic episodes;
@@ -26,20 +27,27 @@ class ListSheet {
final int currentCid;
final Function changeFucCall;
final BuildContext context;
final ScaffoldState? scaffoldState;
late PersistentBottomSheetController bottomSheetController;
Widget get listSheetContent => ListSheetContent(
episodes: episodes,
bvid: bvid,
aid: aid,
currentCid: currentCid,
changeFucCall: changeFucCall,
onClose: bottomSheetController.close,
);
void buildShowBottomSheet() {
bottomSheetController = showBottomSheet(
context: context,
builder: (context) => ListSheetContent(
episodes: episodes,
bvid: bvid,
aid: aid,
currentCid: currentCid,
changeFucCall: changeFucCall,
onClose: bottomSheetController.close,
));
bottomSheetController = scaffoldState?.showBottomSheet(
(context) => listSheetContent,
) ??
showBottomSheet(
context: context,
builder: (context) => listSheetContent,
);
}
}
@@ -118,9 +126,9 @@ class _ListSheetContentState extends State<ListSheetContent> {
widget.changeFucCall(
episode.bvid, episode.cid, episode.aid, episode.cover);
} else if (episode.runtimeType.toString() == "EpisodeItem") {
widget.changeFucCall(episode.bvid, episode.cid, episode.aid);
widget.changeFucCall(episode.bvid, episode.cid, episode.aid, null);
} else {
widget.changeFucCall(widget.bvid!, episode.cid, widget.aid!);
widget.changeFucCall(widget.bvid!, episode.cid, widget.aid!, null);
}
},
dense: false,

8
lib/pages/bangumi/introduction/view.dart
View File

@@ -24,10 +24,13 @@ import 'widgets/intro_detail.dart';
class BangumiIntroPanel extends StatefulWidget {
final int? cid;
final String heroTag;
final Function showEpisodes;
const BangumiIntroPanel({
Key? key,
this.cid,
required this.heroTag,
required this.showEpisodes,
}) : super(key: key);
@override
@@ -72,6 +75,7 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
loadingStatus: false,
bangumiDetail: loadingState.response,
cid: cid,
showEpisodes: widget.showEpisodes,
)
: loadingState is Error
? HttpError(
@@ -82,6 +86,7 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
loadingStatus: true,
bangumiDetail: null,
cid: cid,
showEpisodes: widget.showEpisodes,
);
}
}
@@ -92,11 +97,13 @@ class BangumiInfo extends StatefulWidget {
this.loadingStatus = false,
this.bangumiDetail,
this.cid,
required this.showEpisodes,
});
final bool loadingStatus;
final BangumiInfoModel? bangumiDetail;
final int? cid;
final Function showEpisodes;
@override
State<BangumiInfo> createState() => _BangumiInfoState();
@@ -342,6 +349,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
? bangumiItem!.episodes!.first.cid
: widget.bangumiDetail!.episodes!.first.cid),
changeFuc: bangumiIntroController.changeSeasonOrbangu,
showEpisodes: widget.showEpisodes,
)
],
],

20
lib/pages/bangumi/widgets/bangumi_panel.dart
View File

@@ -6,7 +6,6 @@ import 'package:PiliPalaX/models/bangumi/info.dart';
import 'package:PiliPalaX/pages/video/detail/index.dart';
import 'package:PiliPalaX/utils/storage.dart';
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
import 'package:PiliPalaX/common/widgets/list_sheet.dart';
class BangumiPanel extends StatefulWidget {
const BangumiPanel({
@@ -14,11 +13,13 @@ class BangumiPanel extends StatefulWidget {
required this.pages,
this.cid,
required this.changeFuc,
required this.showEpisodes,
});
final List<EpisodeItem> pages;
final int? cid;
final Function changeFuc;
final Function showEpisodes;
@override
State<BangumiPanel> createState() => _BangumiPanelState();
@@ -113,18 +114,13 @@ class _BangumiPanelState extends State<BangumiPanel> {
height: 34,
child: TextButton(
style: ButtonStyle(
padding: MaterialStateProperty.all(EdgeInsets.zero),
padding: WidgetStateProperty.all(EdgeInsets.zero),
),
onPressed: () {
ListSheet(
episodes: widget.pages,
bvid: widget.pages[currentIndex].bvid!,
aid: widget.pages[currentIndex].aid!,
currentCid: cid,
changeFucCall: widget.changeFuc,
context: context)
.buildShowBottomSheet();
},
onPressed: () => widget.showEpisodes(
widget.pages,
widget.pages[currentIndex].bvid,
widget.pages[currentIndex].aid,
cid),
child: Text(
'全${widget.pages.length}话',
style: const TextStyle(fontSize: 13),

9
lib/pages/video/detail/introduction/controller.dart
View File

@@ -467,13 +467,16 @@ class VideoIntroController extends GetxController {
}
// 修改分P或番剧分集
Future changeSeasonOrbangu(bvid, cid, aid) async {
Future changeSeasonOrbangu(bvid, cid, aid, cover) async {
// 重新获取视频资源
final VideoDetailController videoDetailCtr =
Get.find<VideoDetailController>(tag: heroTag);
videoDetailCtr.bvid = bvid;
videoDetailCtr.oid.value = aid ?? IdUtils.bv2av(bvid);
videoDetailCtr.cid.value = cid;
if (cover is String && cover.isNotEmpty) {
videoItem!['pic'] = cover;
}
videoDetailCtr.danmakuCid.value = cid;
videoDetailCtr.queryVideoUrl();
// 重新请求相关视频
@@ -559,7 +562,7 @@ class VideoIntroController extends GetxController {
final int cid = episodes[prevIndex].cid!;
final String rBvid = isPages ? bvid : episodes[prevIndex].bvid;
final int rAid = isPages ? IdUtils.bv2av(bvid) : episodes[prevIndex].aid!;
changeSeasonOrbangu(rBvid, cid, rAid);
changeSeasonOrbangu(rBvid, cid, rAid, null);
return true;
}
@@ -607,7 +610,7 @@ class VideoIntroController extends GetxController {
final int cid = episodes[nextIndex].cid!;
final String rBvid = isPages ? bvid : episodes[nextIndex].bvid;
final int rAid = isPages ? IdUtils.bv2av(bvid) : episodes[nextIndex].aid!;
changeSeasonOrbangu(rBvid, cid, rAid);
changeSeasonOrbangu(rBvid, cid, rAid, null);
return true;
}

9
lib/pages/video/detail/introduction/view.dart
View File

@@ -20,7 +20,6 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
import 'widgets/action_item.dart';
import 'widgets/action_row_item.dart';
import 'widgets/fav_panel.dart';
import 'widgets/intro_detail.dart';
import 'widgets/page.dart';
import 'widgets/season.dart';
@@ -30,10 +29,12 @@ class VideoIntroPanel extends StatefulWidget {
required this.heroTag,
required this.showAiBottomSheet,
required this.showIntroDetail,
required this.showEpisodes,
});
final String heroTag;
final Function showAiBottomSheet;
final Function showIntroDetail;
final Function showEpisodes;
@override
State<VideoIntroPanel> createState() => _VideoIntroPanelState();
@@ -82,6 +83,7 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
heroTag: heroTag,
showAiBottomSheet: widget.showAiBottomSheet,
showIntroDetail: widget.showIntroDetail,
showEpisodes: widget.showEpisodes,
)
: VideoInfo(
//key:herotag
@@ -91,6 +93,7 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
heroTag: heroTag,
showAiBottomSheet: widget.showAiBottomSheet,
showIntroDetail: widget.showIntroDetail,
showEpisodes: widget.showEpisodes,
));
}
}
@@ -101,6 +104,7 @@ class VideoInfo extends StatefulWidget {
final String? heroTag;
final Function showAiBottomSheet;
final Function showIntroDetail;
final Function showEpisodes;
const VideoInfo({
Key? key,
@@ -109,6 +113,7 @@ class VideoInfo extends StatefulWidget {
this.heroTag,
required this.showAiBottomSheet,
required this.showIntroDetail,
required this.showEpisodes,
}) : super(key: key);
@override
@@ -433,6 +438,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
? videoIntroController.lastPlayCid.value
: widget.videoDetail!.pages!.first.cid,
changeFuc: videoIntroController.changeSeasonOrbangu,
showEpisodes: widget.showEpisodes,
),
)
],
@@ -445,6 +451,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
cid: videoIntroController.lastPlayCid.value,
bvid: videoIntroController.bvid,
changeFuc: videoIntroController.changeSeasonOrbangu,
showEpisodes: widget.showEpisodes,
))
],
],

15
lib/pages/video/detail/introduction/widgets/page.dart
View File

@@ -1,6 +1,5 @@
import 'dart:math';
import 'package:PiliPalaX/common/widgets/list_sheet.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:PiliPalaX/models/video_detail_res.dart';
@@ -16,12 +15,14 @@ class PagesPanel extends StatefulWidget {
required this.bvid,
required this.changeFuc,
required this.heroTag,
required this.showEpisodes,
});
final List<Part> pages;
final int? cid;
final String bvid;
final Function changeFuc;
final String heroTag;
final Function showEpisodes;
@override
State<PagesPanel> createState() => _PagesPanelState();
@@ -94,16 +95,8 @@ class _PagesPanelState extends State<PagesPanel> {
style: ButtonStyle(
padding: WidgetStateProperty.all(EdgeInsets.zero),
),
onPressed: () {
ListSheet(
episodes: episodes,
bvid: widget.bvid,
aid: IdUtils.bv2av(widget.bvid),
currentCid: cid,
changeFucCall: widget.changeFuc,
context: context,
).buildShowBottomSheet();
},
onPressed: () => widget.showEpisodes(
episodes, widget.bvid, IdUtils.bv2av(widget.bvid), cid),
child: Text(
'共${widget.pages.length}集',
style: const TextStyle(fontSize: 13),

14
lib/pages/video/detail/introduction/widgets/season.dart
View File

@@ -1,4 +1,3 @@
import 'package:PiliPalaX/common/widgets/list_sheet.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:PiliPalaX/models/video_detail_res.dart';
@@ -11,11 +10,13 @@ class SeasonPanel extends StatefulWidget {
this.cid,
required this.changeFuc,
required this.heroTag,
required this.showEpisodes,
});
final UgcSeason ugcSeason;
final int? cid;
final Function changeFuc;
final String heroTag;
final Function showEpisodes;
@override
State<SeasonPanel> createState() => _SeasonPanelState();
@@ -102,16 +103,7 @@ class _SeasonPanelState extends State<SeasonPanel> {
borderRadius: BorderRadius.circular(6),
clipBehavior: Clip.hardEdge,
child: InkWell(
onTap: () {
ListSheet(
episodes: episodes,
// bvid: IdUtils.av2bv(episodes!.first.aid!),
// aid: episodes!.first.aid!,
currentCid: cid,
changeFucCall: widget.changeFuc,
context: context)
.buildShowBottomSheet();
},
onTap: () => widget.showEpisodes(episodes, null, null, cid),
child: Padding(
padding: const EdgeInsets.fromLTRB(8, 12, 8, 12),
child: Row(

80
lib/pages/video/detail/view.dart
View File

@@ -3,6 +3,7 @@ import 'dart:io';
import 'dart:math';
import 'package:PiliPalaX/common/constants.dart';
import 'package:PiliPalaX/common/widgets/list_sheet.dart';
import 'package:PiliPalaX/http/loading_state.dart';
import 'package:PiliPalaX/models/common/reply_type.dart';
import 'package:PiliPalaX/pages/video/detail/introduction/widgets/intro_detail.dart';
@@ -420,6 +421,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
Widget tabbarBuild([
bool needIndicator = true,
String introText = '简介',
bool isSingle = false,
]) {
return Container(
width: double.infinity,
@@ -439,6 +441,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
flex: 1,
child: Obx(
() => TabBar(
labelColor: needIndicator
? null
: Theme.of(context).colorScheme.onSurface,
indicatorColor: needIndicator ? null : Colors.transparent,
padding: EdgeInsets.zero,
controller: videoDetailController.tabCtr,
@@ -447,7 +452,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
horizontal: 10.0), // 设置每个标签的宽度
dividerColor: Colors.transparent,
onTap: (value) {
if (!needIndicator ||
if (isSingle) {
_videoReplyController.animateToTop();
} else if (!needIndicator ||
!videoDetailController.tabCtr.indexIsChanging) {
if (value == 0) {
_introController.animToTop();
@@ -457,7 +464,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
}
},
tabs: [
Tab(text: introText),
if (!isSingle) Tab(text: introText),
Tab(
text:
'评论${_videoReplyController.count.value == -1 ? '' : ' ${_videoReplyController.count.value}'}',
@@ -718,14 +725,17 @@ class _VideoDetailPageState extends State<VideoDetailPage>
heroTag: heroTag,
showAiBottomSheet: showAiBottomSheet,
showIntroDetail: showIntroDetail,
showEpisodes: showEpisodes,
),
] else if (videoDetailController
.videoType ==
SearchType.media_bangumi) ...[
Obx(() => BangumiIntroPanel(
heroTag: heroTag,
cid:
videoDetailController.cid.value)),
heroTag: heroTag,
cid:
videoDetailController.cid.value,
showEpisodes: showEpisodes,
)),
],
SliverToBoxAdapter(
child: Padding(
@@ -837,12 +847,15 @@ class _VideoDetailPageState extends State<VideoDetailPage>
heroTag: heroTag,
showAiBottomSheet: showAiBottomSheet,
showIntroDetail: showIntroDetail,
showEpisodes: showEpisodes,
),
] else if (videoDetailController.videoType ==
SearchType.media_bangumi) ...[
Obx(() => BangumiIntroPanel(
heroTag: heroTag,
cid: videoDetailController.cid.value)),
heroTag: heroTag,
cid: videoDetailController.cid.value,
showEpisodes: showEpisodes,
)),
],
SliverToBoxAdapter(
child: Padding(
@@ -948,13 +961,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
heroTag: heroTag,
showAiBottomSheet: showAiBottomSheet,
showIntroDetail: showIntroDetail,
showEpisodes: showEpisodes,
),
RelatedVideoPanel(heroTag: heroTag),
] else if (videoDetailController.videoType ==
SearchType.media_bangumi) ...[
Obx(() => BangumiIntroPanel(
heroTag: heroTag,
cid: videoDetailController.cid.value)),
heroTag: heroTag,
cid: videoDetailController.cid.value,
showEpisodes: showEpisodes,
)),
]
],
)),
@@ -988,12 +1004,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
heroTag: heroTag,
showAiBottomSheet: showAiBottomSheet,
showIntroDetail: showIntroDetail,
showEpisodes: showEpisodes,
),
RelatedVideoPanel(heroTag: heroTag),
] else if (videoDetailController.videoType ==
SearchType.media_bangumi) ...[
Obx(() => BangumiIntroPanel(
heroTag: heroTag, cid: videoDetailController.cid.value)),
heroTag: heroTag,
cid: videoDetailController.cid.value,
showEpisodes: showEpisodes,
)),
]
],
)),
@@ -1046,9 +1066,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
),
),
Expanded(
child: Scaffold(
key: scaffoldKey,
body: videoReplyPanel,
child: Expanded(
child: Scaffold(
key: scaffoldKey,
body: Column(
children: [
tabbarBuild(false, '', true),
Expanded(child: videoReplyPanel),
],
),
),
),
),
// Expanded(
@@ -1164,13 +1191,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
heroTag: heroTag,
showAiBottomSheet: showAiBottomSheet,
showIntroDetail: showIntroDetail,
showEpisodes: showEpisodes,
),
// RelatedVideoPanel(heroTag: heroTag),
] else if (videoDetailController.videoType ==
SearchType.media_bangumi) ...[
Obx(() => BangumiIntroPanel(
heroTag: heroTag,
cid: videoDetailController.cid.value)),
heroTag: heroTag,
cid: videoDetailController.cid.value,
showEpisodes: showEpisodes,
)),
]
],
),
@@ -1193,7 +1223,13 @@ class _VideoDetailPageState extends State<VideoDetailPage>
key: scaffoldKey,
body: Column(
children: [
tabbarBuild(true, '相关视频'),
tabbarBuild(
videoDetailController.videoType !=
SearchType.media_bangumi,
'相关视频',
videoDetailController.videoType ==
SearchType.media_bangumi,
),
Expanded(
child: TabBarView(
physics: const BouncingScrollPhysics(),
@@ -1408,4 +1444,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
scaffoldKey.currentState?.showBottomSheet(
enableDrag: true, (context) => IntroDetail(videoDetail: videoDetail));
}
showEpisodes(episodes, bvid, aid, cid) {
ListSheet(
episodes: episodes,
bvid: bvid,
aid: aid,
currentCid: cid,
changeFucCall: videoIntroController.changeSeasonOrbangu,
context: context,
scaffoldState: scaffoldKey.currentState,
).buildShowBottomSheet();
}
}