EchoZenith/PiliPlus
1
0
Fork 0
mirror of https://github.com/bggRGjQaUbCoE/PiliPlus.git synced 2026-04-22 03:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: millisecond skip (#869)

Browse Source 
* feat: millisecond skip

* fix: formatDuration

* fix: post segment
This commit is contained in:
My-Responsitories
2025-06-11 09:39:26 +08:00
committed by GitHub
parent bc2de4828b
commit 3655c31a48
6 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/pages/video/controller.dart
View File

@@ -611,7 +611,7 @@ class VideoDetailController extends GetxController
),
contentPadding: const EdgeInsets.only(left: 16, right: 8),
subtitle: Text(
'${Utils.formatDuration(item.segment.first)} 至 ${Utils.formatDuration(item.segment.second)}',
'${Utils.formatDuration(item.segment.first / 1000)} 至 ${Utils.formatDuration(item.segment.second / 1000)}',
style: const TextStyle(fontSize: 13),
),
trailing: Row(
@@ -696,7 +696,8 @@ class VideoDetailController extends GetxController
void handleSBData(List<SegmentItemModel> list) {
if (list.isNotEmpty) {
try {
double duration = list.first.videoDuration;
final duration = list.first.videoDuration ??
plPlayerController.duration.value.inMilliseconds;
// segmentList
segmentList.addAll(list
.where((item) =>
@@ -704,13 +705,12 @@ class VideoDetailController extends GetxController
item.segment[1] >= item.segment[0])
.map(
(item) {
SegmentType segmentType = SegmentType
.values[plPlayerController.segmentTypes.indexOf(item.category)];
final segmentType = SegmentType.values.byName(item.category);
if (item.segment[0] == 0 && item.segment[1] == 0) {
videoLabel.value +=
'${videoLabel.value.isNotEmpty ? '/' : ''}${segmentType.title}';
}
SkipType skipType =
var skipType =
plPlayerController.blockSettings[segmentType.index].second;
if (skipType != SkipType.showOnly) {
if (item.segment[1] == item.segment[0] ||
@@ -733,7 +733,7 @@ class VideoDetailController extends GetxController
if (positionSubscription == null &&
!isShowCover.value &&
plPlayerController.videoPlayerController != null) {
final currPost = plPlayerController.position.value.inSeconds;
final currPost = plPlayerController.position.value.inMilliseconds;
if (currPost > segmentModel.segment.first &&
currPost < segmentModel.segment.second) {
if (segmentModel.skipType == SkipType.alwaysSkip) {
@@ -760,8 +760,7 @@ class VideoDetailController extends GetxController
).toList());
// _segmentProgressList
segmentProgressList ??= <Segment>[];
segmentProgressList!.addAll(segmentList.map((e) {
(segmentProgressList ??= <Segment>[]).addAll(segmentList.map((e) {
double start = (e.segment.first / duration).clamp(0.0, 1.0);
double end = (e.segment.second / duration).clamp(0.0, 1.0);
return Segment(start, end, _getColor(e.segmentType));
@@ -790,16 +789,18 @@ class VideoDetailController extends GetxController
int currentPos = position.inSeconds;
if (currentPos != _lastPos) {
_lastPos = currentPos;
final msPos = currentPos * 1000;
for (SegmentModel item in segmentList) {
// if (kDebugMode) {
// debugPrint(
// '${position.inSeconds},,${item.segment.first},,${item.segment.second},,${item.skipType.name},,${item.hasSkipped}');
// }
if (item.segment.first == position.inSeconds) {
if (msPos <= item.segment.first &&
item.segment.first <= msPos + 1000) {
if (item.skipType == SkipType.alwaysSkip) {
onSkip(item);
} else if (item.skipType == SkipType.skipOnce &&
item.hasSkipped != true) {
item.hasSkipped) {
item.hasSkipped = true;
onSkip(item);
} else if (item.skipType == SkipType.skipManually) {
@@ -905,7 +906,7 @@ class VideoDetailController extends GetxController
try {
plPlayerController.danmakuController?.clear();
await plPlayerController.videoPlayerController
?.seek(Duration(seconds: item.segment.second));
?.seek(Duration(milliseconds: item.segment.second));
if (isSkip) {
if (GStorage.blockToast) {
_showBlockToast('已跳过${item.segmentType.shortTitle}片段');