merge: 合并首页轮播与观看历史真机修复

lib/app.dart

@@ -181,6 +181,7 @@ class _LumaDramaAppState extends State<LumaDramaApp> {
       providers: [
         Provider(create: (_) => PlaybackCoordinator()),
         Provider<PlayerFactory>(create: (_) => widget.playerFactory),
+        Provider<CatalogRepository>.value(value: _catalogRepository),
         Provider<PlaybackRepository>.value(value: _playback),
         Provider<WatchHistoryRepository>.value(value: _watchHistory),
         Provider<FavoriteRepository>.value(value: _favorites),

lib/pages/discover/discover_view.dart

@@ -7,6 +7,7 @@ import 'package:provider/provider.dart';
 import '../../core/data/models/drama.dart';
 import '../../core/data/models/home_feed.dart';
 import '../../core/data/repositories/watch_history_repository.dart';
+import '../../core/data/services/catalog_controller.dart';
 import '../../core/data/services/category_controller.dart';
 import '../../core/theme/app_colors.dart';
 import '../../core/theme/app_theme.dart';
@@ -98,6 +99,7 @@ class _DiscoverPageState extends State<DiscoverPage> {
   Widget _page(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     final categories = context.watch<CategoryController>();
+    final homeBanners = context.watch<CatalogController>().feed.banners;
     final allDramas = [...?widget.dramas, ...categories.visibleDramas];
     final cards = _cardsFor(categories.visibleDramas, '');
     final content = SafeArea(
@@ -114,7 +116,7 @@ class _DiscoverPageState extends State<DiscoverPage> {
                   padding: const EdgeInsets.fromLTRB(16, 4, 16, 0),
                   child: ClipRRect(
                     borderRadius: BorderRadius.circular(18),
-                    child: _carousel(l10n, categories.feed.banners, allDramas),
+                    child: _carousel(l10n, homeBanners, allDramas),
                   ),
                 ),
                 Padding(

test/discover/home_banner_source_test.dart

@@ -0,0 +1,100 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/app.dart';
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/models/home_feed.dart';
+import 'package:fruitshorts/core/data/repositories/catalog_repository.dart';
+import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
+import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
+import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:fruitshorts/pages/discover/widgets/cover_carousel.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+
+import '../support/fake_catalog.dart';
+import '../support/fake_category.dart';
+import '../support/fake_interaction_repositories.dart';
+import '../support/fake_notice_repository.dart';
+import '../support/widget_player.dart';
+
+void main() {
+  testWidgets(
+    'should_render_home_feed_banners_when_discover_banners_are_empty',
+    (tester) async {
+      SharedPreferencesAsyncPlatform.instance =
+          InMemorySharedPreferencesAsync.empty();
+      final catalog = _HomeBannerCatalogRepository();
+      await tester.pumpWidget(
+        LumaDramaApp(
+          playerFactory: createWidgetPlayer,
+          catalogRepository: catalog,
+          categoryRepository: FakeCategoryRepository(catalog: catalog),
+          watchHistoryRepository: InMemoryWatchHistoryRepository(),
+          favoriteRepository: InMemoryFavoriteRepository(),
+          playbackRepository: FakePlaybackRepository(),
+          commentRepository: FakeCommentRepository(),
+          interactionRepository: FakeInteractionRepository(),
+          noticeRepository: FakeNoticeRepository(),
+        ),
+      );
+      await tester.pumpAndSettle();
+      await tester.tap(find.byKey(const Key('tab-discover')));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(CoverCarousel), findsOneWidget);
+      expect(find.byKey(const Key('carousel-dot-0')), findsOneWidget);
+      expect(find.byKey(const Key('carousel-dot-1')), findsOneWidget);
+      expect(
+        find.descendant(
+          of: find.byType(CoverCarousel),
+          matching: find.text('The Signal'),
+        ),
+        findsOneWidget,
+      );
+
+      await tester.pump(const Duration(milliseconds: 4500));
+      await tester.pump(const Duration(milliseconds: 500));
+      expect(
+        find.descendant(
+          of: find.byType(CoverCarousel),
+          matching: find.text('City Lights & Velvet Nights'),
+        ),
+        findsOneWidget,
+      );
+      await tester.pumpWidget(const SizedBox.shrink());
+    },
+  );
+}
+
+class _HomeBannerCatalogRepository implements CatalogRepository {
+  final _delegate = FakeCatalogRepository();
+
+  @override
+  Future<HomeFeed> fetchHomeFeed() async => HomeFeed(
+    banners: const [
+      FeedBanner(
+        id: 'banner-1',
+        imageUrl: '/files/banner-1.png',
+        linkType: 'DRAMA',
+        linkValue: 'the-signal-demo',
+      ),
+      FeedBanner(
+        id: 'banner-2',
+        imageUrl: '/files/banner-2.png',
+        linkType: 'DRAMA',
+        linkValue: 'city-lights-demo',
+      ),
+    ],
+    sections: [FeedSection(code: 'hot', title: 'Hot', dramas: demoDramas)],
+  );
+
+  @override
+  Future<HomeFeed> fetchDiscoverFeed() async => HomeFeed(
+    sections: [FeedSection(code: 'hot', title: 'Hot', dramas: demoDramas)],
+  );
+
+  @override
+  Future<Drama> fetchDrama(String dramaId) => _delegate.fetchDrama(dramaId);
+}

test/watch/watch_history_provider_test.dart

@@ -0,0 +1,52 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/app.dart';
+import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
+import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
+import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
+import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
+
+import '../support/fake_catalog.dart';
+import '../support/fake_category.dart';
+import '../support/fake_interaction_repositories.dart';
+import '../support/fake_notice_repository.dart';
+import '../support/widget_player.dart';
+
+void main() {
+  testWidgets('should_open_watch_history_with_catalog_provider_registered', (
+    tester,
+  ) async {
+    SharedPreferencesAsyncPlatform.instance =
+        InMemorySharedPreferencesAsync.withData({
+          'auth.accessToken': 'test-access',
+          'auth.refreshToken': 'test-refresh',
+          'auth.user': '{"uid":"1","nickname":"Viewer","avatarUrl":""}',
+        });
+    final catalog = FakeCatalogRepository();
+    await tester.pumpWidget(
+      LumaDramaApp(
+        playerFactory: createWidgetPlayer,
+        catalogRepository: catalog,
+        categoryRepository: FakeCategoryRepository(catalog: catalog),
+        watchHistoryRepository: InMemoryWatchHistoryRepository(),
+        favoriteRepository: InMemoryFavoriteRepository(),
+        playbackRepository: FakePlaybackRepository(),
+        commentRepository: FakeCommentRepository(),
+        interactionRepository: FakeInteractionRepository(),
+        noticeRepository: FakeNoticeRepository(),
+      ),
+    );
+    await tester.pumpAndSettle();
+    await tester.tap(find.byKey(const Key('tab-my')));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Watch History'));
+    await tester.pumpAndSettle();
+
+    expect(tester.takeException(), isNull);
+    expect(find.byKey(const Key('watch-records-page')), findsOneWidget);
+    expect(find.text('No watch history yet.'), findsOneWidget);
+  });
+}