feat: 优化跳过控制器,新增片尾倒计时模式选择,支持剩余时间和绝对时间模式

This commit is contained in:
katelya
2025-09-03 21:31:09 +08:00
parent 981137afe9
commit d6e14b2d00
4 changed files with 291 additions and 13 deletions
+85 -13
View File
@@ -43,7 +43,8 @@ export default function SkipController({
const [batchSettings, setBatchSettings] = useState({
openingStart: '0:00', // 片头开始时间(分:秒格式)
openingEnd: '1:30', // 片头结束时间(分:秒格式,90秒=1分30秒)
endingStart: '20:00', // 片尾开始时间(分:秒格式)
endingMode: 'remaining', // 片尾模式:'remaining'(剩余时间) 或 'absolute'(绝对时间)
endingStart: '2:00', // 片尾开始时间(剩余时间模式:还剩多少时间开始倒计时;绝对时间模式:从视频开始多长时间)
endingEnd: '', // 片尾结束时间(可选,空表示直接跳转下一集)
autoSkip: true, // 自动跳过开关
autoNextEpisode: true, // 自动下一集开关
@@ -300,30 +301,57 @@ export default function SkipController({
if (batchSettings.endingStart) {
const endingStartSeconds = timeToSeconds(batchSettings.endingStart);
// 根据模式计算实际的开始时间
let actualStartSeconds: number;
if (batchSettings.endingMode === 'remaining') {
// 剩余时间模式:从视频总长度减去剩余时间
actualStartSeconds = duration - endingStartSeconds;
} else {
// 绝对时间模式:使用输入的时间
actualStartSeconds = endingStartSeconds;
}
// 确保开始时间在有效范围内
if (actualStartSeconds < 0) {
actualStartSeconds = 0;
} else if (actualStartSeconds >= duration) {
alert(`片尾开始时间超出视频长度(总长:${secondsToTime(duration)}`);
return;
}
// 如果没有设置结束时间,则直接跳转到下一集
if (!batchSettings.endingEnd || batchSettings.endingEnd.trim() === '') {
// 直接从指定时间跳转下一集
segments.push({
start: endingStartSeconds,
start: actualStartSeconds,
end: duration, // 设置为视频总长度
type: 'ending',
title: '片尾跳转下一集',
title: batchSettings.endingMode === 'remaining'
? `剩余${batchSettings.endingStart}时跳转下一集`
: '片尾跳转下一集',
autoSkip: batchSettings.autoSkip,
autoNextEpisode: batchSettings.autoNextEpisode,
});
} else {
let actualEndSeconds: number;
const endingEndSeconds = timeToSeconds(batchSettings.endingEnd);
if (endingStartSeconds >= endingEndSeconds) {
if (batchSettings.endingMode === 'remaining') {
actualEndSeconds = duration - endingEndSeconds;
} else {
actualEndSeconds = endingEndSeconds;
}
if (actualStartSeconds >= actualEndSeconds) {
alert('片尾开始时间必须小于结束时间');
return;
}
segments.push({
start: endingStartSeconds,
end: endingEndSeconds,
start: actualStartSeconds,
end: actualEndSeconds,
type: 'ending',
title: '片尾',
title: batchSettings.endingMode === 'remaining' ? '片尾(剩余时间模式)' : '片尾',
autoSkip: batchSettings.autoSkip,
autoNextEpisode: batchSettings.autoNextEpisode,
});
@@ -352,7 +380,8 @@ export default function SkipController({
setBatchSettings({
openingStart: '0:00',
openingEnd: '1:30',
endingStart: '20:00',
endingMode: 'remaining',
endingStart: '2:00',
endingEnd: '',
autoSkip: true,
autoNextEpisode: true,
@@ -363,7 +392,7 @@ export default function SkipController({
console.error('保存跳过配置失败:', err);
alert('保存失败,请重试');
}
}, [batchSettings, duration, source, id, title, onSettingModeChange, timeToSeconds]);
}, [batchSettings, duration, source, id, title, onSettingModeChange, timeToSeconds, secondsToTime]);
// 删除跳过片段
const handleDeleteSegment = useCallback(
@@ -558,18 +587,60 @@ export default function SkipController({
🎭
</h4>
{/* 片尾模式选择 */}
<div>
<label className="block text-sm font-medium mb-2 text-gray-700 dark:text-gray-300">
</label>
<div className="flex gap-4">
<label className="flex items-center">
<input
type="radio"
name="endingMode"
value="remaining"
checked={batchSettings.endingMode === 'remaining'}
onChange={(e) => setBatchSettings({...batchSettings, endingMode: e.target.value})}
className="mr-2"
/>
</label>
<label className="flex items-center">
<input
type="radio"
name="endingMode"
value="absolute"
checked={batchSettings.endingMode === 'absolute'}
onChange={(e) => setBatchSettings({...batchSettings, endingMode: e.target.value})}
className="mr-2"
/>
</label>
</div>
<p className="text-xs text-gray-500 mt-1">
{batchSettings.endingMode === 'remaining'
? '基于剩余时间倒计时(如:还剩2分钟时开始)'
: '基于播放时间(如:播放到第20分钟时开始)'
}
</p>
</div>
<div>
<label className="block text-sm font-medium mb-1 text-gray-700 dark:text-gray-300">
(:)
{batchSettings.endingMode === 'remaining' ? '剩余时间 (分:秒)' : '开始时间 (分:秒)'}
</label>
<input
type="text"
value={batchSettings.endingStart}
onChange={(e) => setBatchSettings({...batchSettings, endingStart: e.target.value})}
className="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100"
placeholder="20:00"
placeholder={batchSettings.endingMode === 'remaining' ? '2:00' : '20:00'}
/>
<p className="text-xs text-gray-500 mt-1"></p>
<p className="text-xs text-gray-500 mt-1">
{batchSettings.endingMode === 'remaining'
? '当剩余时间达到此值时开始倒计时'
: '从视频开始播放此时间后开始检测片尾'
}
</p>
</div>
<div>
@@ -615,7 +686,8 @@ export default function SkipController({
setBatchSettings({
openingStart: '0:00',
openingEnd: '1:30',
endingStart: '20:00',
endingMode: 'remaining',
endingStart: '2:00',
endingEnd: '',
autoSkip: true,
autoNextEpisode: true,