fix(player): 优化加载指示器与锁定进度条
This commit is contained in:
1 parent
7b068e8eb4
commit
623c184243
13 files changed
+393
-33
No files matched your search
@@ -106,6 +106,7 @@ void main() {
|
||||
isFree: true,
|
||||
),
|
||||
controller: null,
|
||||
locked: false,
|
||||
liked: true,
|
||||
saved: false,
|
||||
visible: true,
|
||||
@@ -183,6 +184,80 @@ void main() {
|
||||
expect(find.byKey(const Key('home-feed-progress-thumb')), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('should_show_static_track_without_seek_when_feed_is_locked', (
|
||||
tester,
|
||||
) async {
|
||||
var scrubStarts = 0;
|
||||
var seeks = 0;
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
theme: AppTheme.light(),
|
||||
locale: const Locale('en'),
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
home: Builder(
|
||||
builder: (context) => Scaffold(
|
||||
body: HomeFeedOverlay(
|
||||
l10n: AppLocalizations.of(context)!,
|
||||
drama: const Drama(
|
||||
id: 'locked-feed',
|
||||
title: 'Locked Feed',
|
||||
synopsis: 'synopsis',
|
||||
posterUrl: '',
|
||||
),
|
||||
episode: const Episode(
|
||||
id: 'locked-feed-1',
|
||||
number: 1,
|
||||
title: 'Locked',
|
||||
isFree: false,
|
||||
locked: true,
|
||||
),
|
||||
controller: null,
|
||||
locked: true,
|
||||
liked: false,
|
||||
saved: false,
|
||||
visible: true,
|
||||
boosting: false,
|
||||
onTogglePlay: () {},
|
||||
onBoostStart: () {},
|
||||
onBoostEnd: () {},
|
||||
onLike: () {},
|
||||
onSave: () {},
|
||||
onComments: () {},
|
||||
onShare: () {},
|
||||
onDetail: () {},
|
||||
onOpenFullPlayer: () {},
|
||||
onMore: () {},
|
||||
onScrubStart: () => scrubStarts++,
|
||||
onSeek: (_) => seeks++,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
expect(find.byKey(const Key('progress-loading')), findsNothing);
|
||||
expect(find.byKey(const Key('progress-loading-highlight')), findsNothing);
|
||||
expect(
|
||||
find.byKey(const Key('home-feed-progress-inactive')),
|
||||
findsOneWidget,
|
||||
);
|
||||
expect(
|
||||
tester
|
||||
.getSize(find.byKey(const Key('home-feed-progress-inactive')))
|
||||
.height,
|
||||
2,
|
||||
);
|
||||
|
||||
await tester.drag(
|
||||
find.byKey(const Key('home-feed-progress')),
|
||||
const Offset(120, 0),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
expect(scrubStarts, 0);
|
||||
expect(seeks, 0);
|
||||
});
|
||||
|
||||
testWidgets('should_seek_and_open_player_from_feed_actions', (tester) async {
|
||||
var opened = 0;
|
||||
Duration? seeked;
|
||||
@@ -219,6 +294,7 @@ void main() {
|
||||
isFree: true,
|
||||
),
|
||||
controller: controller,
|
||||
locked: false,
|
||||
liked: false,
|
||||
saved: false,
|
||||
visible: true,
|
||||
@@ -355,6 +431,7 @@ void main() {
|
||||
isFree: true,
|
||||
),
|
||||
controller: controller,
|
||||
locked: false,
|
||||
liked: false,
|
||||
saved: false,
|
||||
visible: true,
|
||||
@@ -505,6 +582,7 @@ void main() {
|
||||
isFree: true,
|
||||
),
|
||||
controller: controller,
|
||||
locked: false,
|
||||
liked: false,
|
||||
saved: false,
|
||||
visible: false,
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:fruitshorts/core/theme/app_colors.dart';
|
||||
import 'package:fruitshorts/pages/player/widgets/seek_progress_bar.dart';
|
||||
import 'package:video_player/video_player.dart';
|
||||
|
||||
@@ -34,6 +35,47 @@ void main() {
|
||||
expect(find.byType(Slider), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('should_show_inactive_track_and_disable_seek_when_locked', (
|
||||
tester,
|
||||
) async {
|
||||
final video = ValueNotifier<VideoPlayerValue>(
|
||||
const VideoPlayerValue(
|
||||
duration: Duration(seconds: 12),
|
||||
position: Duration(seconds: 3),
|
||||
isInitialized: true,
|
||||
),
|
||||
);
|
||||
addTearDown(video.dispose);
|
||||
var seeks = 0;
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
home: Scaffold(
|
||||
body: SeekProgressBar(
|
||||
valueListenable: video,
|
||||
semanticsLabel: 'Seek video',
|
||||
locked: true,
|
||||
onSeek: (_) async => seeks++,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
expect(find.byKey(const Key('progress-loading')), findsNothing);
|
||||
expect(find.byKey(const Key('progress-loading-highlight')), findsNothing);
|
||||
expect(find.byType(Slider), findsNothing);
|
||||
final inactive = tester.widget<ColoredBox>(
|
||||
find.byKey(const Key('progress-inactive')),
|
||||
);
|
||||
expect(inactive.color, AppColors.border);
|
||||
|
||||
await tester.drag(
|
||||
find.byKey(const Key('progress-inactive')),
|
||||
const Offset(120, 0),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
expect(seeks, 0);
|
||||
});
|
||||
|
||||
testWidgets('should_debounce_buffering_before_showing_loading_track', (
|
||||
tester,
|
||||
) async {
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
import 'package:fruitshorts/core/theme/app_colors.dart';
|
||||
import 'package:fruitshorts/pages/player/widgets/loading_progress_track.dart';
|
||||
|
||||
void main() {
|
||||
@@ -37,7 +36,7 @@ void main() {
|
||||
find.byKey(const Key('progress-loading-highlight')),
|
||||
)
|
||||
.color,
|
||||
AppColors.blue,
|
||||
Colors.white,
|
||||
);
|
||||
|
||||
final initialLeft = tester
|
||||
|
||||
@@ -65,6 +65,53 @@ void main() {
|
||||
_expectPlayerNavigationBar(tester);
|
||||
});
|
||||
|
||||
testWidgets('should_render_player_loading_indicators_at_compact_size', (
|
||||
tester,
|
||||
) async {
|
||||
final playback = _PendingPlaybackRepository();
|
||||
final initialization = Completer<void>();
|
||||
await _pumpApp(
|
||||
tester,
|
||||
playback: playback,
|
||||
playerFactory: (_) => _GatedPlayer(initialization.future),
|
||||
settle: false,
|
||||
);
|
||||
await tester.pump();
|
||||
await tester.pump(const Duration(milliseconds: 100));
|
||||
|
||||
final ticketLoading = find.byKey(const Key('player-ticket-loading'));
|
||||
expect(ticketLoading, findsOneWidget);
|
||||
expect(tester.getSize(ticketLoading), const Size(24, 24));
|
||||
expect(
|
||||
tester.widget<CircularProgressIndicator>(ticketLoading).strokeWidth,
|
||||
2,
|
||||
);
|
||||
|
||||
playback.ticket.complete(
|
||||
const PlayTicket(
|
||||
episodeId: 'city-lights-demo-1',
|
||||
accessible: true,
|
||||
accessType: PlayTicket.free,
|
||||
playUrl: '/files/episode/fake-city.mp4?e=1&s=abc',
|
||||
qualities: ['AUTO'],
|
||||
),
|
||||
);
|
||||
await tester.pump();
|
||||
await tester.pump(const Duration(milliseconds: 100));
|
||||
|
||||
final sessionLoading = find.byKey(const Key('player-session-loading'));
|
||||
expect(sessionLoading, findsOneWidget);
|
||||
expect(tester.getSize(sessionLoading), const Size(24, 24));
|
||||
expect(
|
||||
tester.widget<CircularProgressIndicator>(sessionLoading).strokeWidth,
|
||||
2,
|
||||
);
|
||||
|
||||
initialization.complete();
|
||||
await tester.pumpWidget(const SizedBox.shrink());
|
||||
await tester.pump();
|
||||
});
|
||||
|
||||
testWidgets('should_pause_and_resume_player_when_page_route_covers_it', (
|
||||
tester,
|
||||
) async {
|
||||
@@ -956,6 +1003,16 @@ void main() {
|
||||
tester,
|
||||
cardKey: const Key('home-drama-card-locked-demo'),
|
||||
);
|
||||
expect(find.byKey(const Key('progress-loading')), findsNothing);
|
||||
expect(find.byKey(const Key('progress-loading-highlight')), findsNothing);
|
||||
expect(find.byKey(const Key('progress-inactive')), findsOneWidget);
|
||||
expect(find.byType(Slider), findsNothing);
|
||||
expect(
|
||||
tester
|
||||
.widget<SeekProgressBar>(find.byKey(const Key('player-progress')))
|
||||
.locked,
|
||||
isTrue,
|
||||
);
|
||||
await tester.tap(find.byKey(const Key('player-episodes')));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -1293,10 +1350,11 @@ Future<void> _pumpApp(
|
||||
WidgetTester tester, {
|
||||
Size size = const Size(390, 844),
|
||||
FakeCatalogRepository? catalog,
|
||||
FakePlaybackRepository? playback,
|
||||
PlaybackRepository? playback,
|
||||
FakeInteractionRepository? interactions,
|
||||
FakeCommentRepository? commentRepository,
|
||||
PlayerFactory? playerFactory,
|
||||
bool settle = true,
|
||||
}) async {
|
||||
tester.view.physicalSize = size;
|
||||
tester.view.devicePixelRatio = 1;
|
||||
@@ -1317,7 +1375,7 @@ Future<void> _pumpApp(
|
||||
haptics: FakeHaptics(),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
if (settle) await tester.pumpAndSettle();
|
||||
}
|
||||
|
||||
const _countingDrama = Drama(
|
||||
@@ -1361,6 +1419,35 @@ class _RecordingPlayer implements PlayerPort {
|
||||
Future<void> dispose() async {}
|
||||
}
|
||||
|
||||
class _PendingPlaybackRepository implements PlaybackRepository {
|
||||
final Completer<PlayTicket> ticket = Completer<PlayTicket>();
|
||||
|
||||
@override
|
||||
Future<PlayTicket> ticketFor(String episodeId, {bool forceRefresh = false}) =>
|
||||
ticket.future;
|
||||
|
||||
@override
|
||||
bool isFresh(String episodeId) => false;
|
||||
}
|
||||
|
||||
class _GatedPlayer implements PlayerPort {
|
||||
_GatedPlayer(this.initialization);
|
||||
|
||||
final Future<void> initialization;
|
||||
|
||||
@override
|
||||
Future<void> initialize() => initialization;
|
||||
|
||||
@override
|
||||
Future<void> play() async {}
|
||||
|
||||
@override
|
||||
Future<void> pause() async {}
|
||||
|
||||
@override
|
||||
Future<void> dispose() async {}
|
||||
}
|
||||
|
||||
const _lockedDrama = Drama(
|
||||
id: 'locked-demo',
|
||||
title: 'Locked Demo',
|
||||
|
||||
Reference in new issue
Block a user