feat(app): 剧场页九宫格与极简我的页

lib/pages/home/home_logic.dart

@@ -7,12 +7,12 @@ import '../../core/data/models/drama.dart';
 import '../../core/data/services/catalog_controller.dart';
 import '../../core/data/services/download_controller.dart';
 import '../../core/data/services/wallet_controller.dart';
-import '../../core/data/repositories/catalog_repository.dart';
-import '../../l10n/app_localizations.dart';
-import '../discover/discover_logic.dart';
+import '../discover/discover_types.dart';
 import '../drama_detail/drama_detail_view.dart';
-import '../mine/mine_logic.dart';
+import '../favorites/favorites_page.dart';
+import '../mine/mine_types.dart';
 import '../player/player_view.dart';
+import '../watch_records/watch_records_page.dart';
 
 class HomeLogic extends ChangeNotifier {
   HomeLogic(List<Drama> dramas) : currentDrama = dramas.first;
@@ -21,34 +21,21 @@ class HomeLogic extends ChangeNotifier {
   Drama currentDrama;
   int tab = 0;
   int searchRequest = 0;
-  int sectionRequest = 0;
   int resumeRequest = 0;
   int backRequest = 0;
-  int mySection = 0;
   bool drawerOpen = false;
   bool detailOpen = false;
   bool videoImmersive = false;
-  bool profile = false;
   bool _disposed = false;
 
   void notify() {
     if (!_disposed) notifyListeners();
   }
 
-  void select(
-    int nextTab, {
-    bool search = false,
-    bool watchlist = false,
-    bool resume = false,
-    int? mySection,
-  }) {
+  void select(int nextTab, {bool search = false, bool resume = false}) {
     FocusManager.instance.primaryFocus?.unfocus();
     tab = nextTab;
     if (search) searchRequest++;
-    if (watchlist || mySection != null) {
-      this.mySection = mySection ?? 1;
-      sectionRequest++;
-    }
     if (resume) resumeRequest++;
     notify();
   }
@@ -59,11 +46,6 @@ class HomeLogic extends ChangeNotifier {
     notify();
   }
 
-  void selectFromMenu(int nextTab, {int? mySection}) {
-    drawerOpen = false;
-    select(nextTab, mySection: mySection);
-  }
-
   Future<void> openCurrentSeries(BuildContext context) async {
     detailOpen = true;
     notify();
@@ -87,20 +69,6 @@ class HomeLogic extends ChangeNotifier {
     );
   }
 
-  /// Resolves a banner link that is not in the loaded feed, then opens detail.
-  Future<void> openDramaById(BuildContext context, String dramaId) async {
-    try {
-      final drama = await context.read<CatalogRepository>().fetchDrama(dramaId);
-      if (context.mounted) openDrama(context, drama);
-    } catch (_) {
-      if (!context.mounted) return;
-      final message = AppLocalizations.of(context)!.detailLoadFailed;
-      ScaffoldMessenger.of(
-        context,
-      ).showSnackBar(SnackBar(content: Text(message)));
-    }
-  }
-
   Future<void> playDrama(BuildContext context, Drama drama) async {
     // 列表卡片只有一集预览，进入播放前补齐完整剧集，否则选集列表是空的。
     var playable = drama;
@@ -122,31 +90,29 @@ class HomeLogic extends ChangeNotifier {
     );
   }
 
-  void openProfile() {
-    profile = true;
-    select(2, mySection: 0);
-  }
+  void openProfile() => select(2);
 
-  void openLibrary({int section = 1}) {
-    profile = false;
-    select(2, mySection: section);
-  }
-
-  void discoverAction(BuildContext context, DiscoverPageAction action) {
+  void discoverAction(DiscoverPageAction action) {
     switch (action) {
       case DiscoverPageAction.home:
         select(0);
       case DiscoverPageAction.my:
         select(2);
-      case DiscoverPageAction.watchlist:
-        openLibrary();
-      case DiscoverPageAction.resume:
-        select(0, resume: true);
-      case DiscoverPageAction.detail:
-        openDrama(context, currentDrama);
     }
   }
 
+  void openFavorites(BuildContext context) {
+    Navigator.of(
+      context,
+    ).push(MaterialPageRoute<void>(builder: (_) => const FavoritesPage()));
+  }
+
+  void openHistory(BuildContext context) {
+    Navigator.of(
+      context,
+    ).push(MaterialPageRoute<void>(builder: (_) => const WatchRecordsPage()));
+  }
+
   void myAction(MyPageAction action) {
     switch (action) {
       case MyPageAction.home:

lib/pages/home/home_view.dart

@@ -6,8 +6,6 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 import '../../core/data/models/drama.dart';
-import '../../core/data/models/home_feed.dart';
-import '../../core/data/services/auth_controller.dart';
 import '../../core/data/services/catalog_controller.dart';
 import '../../core/data/services/download_controller.dart';
 import '../../core/data/services/wallet_controller.dart';
@@ -15,10 +13,11 @@ import '../../core/platform/haptics.dart';
 import '../../core/theme/app_colors.dart';
 import '../../core/theme/app_theme.dart';
 import '../../core/widgets/app_bottom_nav.dart';
-import '../../core/widgets/auth_gate.dart';
 import '../../core/widgets/empty_state.dart';
 import '../../l10n/app_localizations.dart';
+import '../discover/discover_types.dart';
 import '../discover/discover_view.dart';
+import '../mine/mine_types.dart';
 import '../splash/splash_page.dart';
 import '../mine/mine_view.dart';
 import '../player/player_view.dart';
@@ -74,7 +73,6 @@ class HomePage extends StatelessWidget {
     return _HomeTabs(
       key: ValueKey(catalog.dramas.first.id),
       dramas: catalog.dramas,
-      banners: catalog.banners,
     );
   }
 }
@@ -99,14 +97,9 @@ class HomeFailureView extends StatelessWidget {
 
 /// The three primary destinations share a single route and keep their state.
 class _HomeTabs extends StatefulWidget {
-  const _HomeTabs({
-    super.key,
-    required this.dramas,
-    required this.banners,
-  });
+  const _HomeTabs({super.key, required this.dramas});
 
   final List<Drama> dramas;
-  final List<FeedBanner> banners;
 
   @override
   State<_HomeTabs> createState() => _HomeTabsState();
@@ -137,8 +130,6 @@ class _HomeTabsState extends State<_HomeTabs> {
 
   Widget _scaffold(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
-    // 登录态统一从 AuthController 取（原来是 home_logic 里的本地演示开关）
-    final signedIn = context.watch<AuthController>().isSignedIn;
     return PopScope(
       canPop: false,
       onPopInvokedWithResult: (didPop, _) {
@@ -152,111 +143,113 @@ class _HomeTabsState extends State<_HomeTabs> {
       child: Scaffold(
         key: logic.scaffoldKey,
         backgroundColor: AppColors.ink,
-        body: IndexedStack(
-          index: logic.tab,
-          children: [
-            PlayerPage(
-              drama: widget.dramas.first,
-              feedDramas: widget.dramas,
-              onDramaChanged: logic.onDramaChanged,
-              initialIndex: 0,
-              homeMode: true,
-              embedded: true,
-              active: logic.tab == 0 && !logic.drawerOpen && !logic.detailOpen,
-              resumeRequest: logic.resumeRequest,
-              backRequest: logic.backRequest,
-              onDiscover: () => logic.select(1),
-              onMy: logic.openProfile,
-              onSearch: () => logic.select(1, search: true),
-              onMenu: () => _openMenu(context),
-              onImmersiveChanged: logic.onImmersiveChanged,
-              wallet: context.read<WalletController>(),
-              downloads: context.read<DownloadController>(),
-            ),
-            DiscoverPage(
-              drama: logic.currentDrama,
-              dramas: widget.dramas,
-              onDramaSelected: (drama) => logic.playDrama(context, drama),
-              duration: Duration.zero,
-              embedded: true,
-              active: logic.tab == 1,
-              searchRequest: logic.searchRequest,
-              signedIn: signedIn,
-              onSignIn: () => openAuthPage(context),
-              onCoins: logic.openProfile,
-              onRewards: logic.openProfile,
-              banners: widget.banners,
-              onBannerSelected: (banner) {
-                final dramaId = banner.dramaId;
-                if (dramaId != null) {
-                  unawaited(logic.openDramaById(context, dramaId));
-                }
-              },
-              onAction: (action) => logic.discoverAction(context, action),
-            ),
-            MyPage(
-              drama: logic.currentDrama,
-              dramas: widget.dramas,
-              onDramaSelected: (drama) => logic.openDrama(context, drama),
-              duration: Duration.zero,
-              initialSection: logic.mySection,
-              profile: logic.profile,
-              sectionRequest: logic.sectionRequest,
-              embedded: true,
-              active: logic.tab == 2,
-              onAction: logic.myAction,
-              signedIn: signedIn,
-              onSignIn: () => openAuthPage(context),
-              onSignOut: () => context.read<AuthController>().signOut(),
-              wallet: context.read<WalletController>(),
-            ),
-          ],
-        ),
-        bottomNavigationBar: logic.videoImmersive
-            ? null
-            : AppBottomNav(
-                barKey: const Key('home-tabs-bar'),
-                items: [
-                  AppBottomNavItem(
-                    tabKey: const Key('tab-home'),
-                    icon: Icons.play_circle_outline_rounded,
-                    selectedIcon: Icons.play_circle_fill_rounded,
-                    label: l10n.homeTab,
-                    selected: logic.tab == 0,
-                    onTap: () => _selectTab(context, 0),
-                  ),
-                  AppBottomNavItem(
-                    tabKey: const Key('tab-discover'),
-                    icon: Icons.explore_outlined,
-                    selectedIcon: Icons.explore_rounded,
-                    label: l10n.discoverTab,
-                    selected: logic.tab == 1,
-                    onTap: () => _selectTab(context, 1),
-                  ),
-                  AppBottomNavItem(
-                    tabKey: const Key('tab-my'),
-                    icon: Icons.video_library_outlined,
-                    selectedIcon: Icons.video_library_rounded,
-                    label: l10n.myTab,
-                    selected: logic.tab == 2,
-                    onTap: () => _selectTab(context, 2, myProfile: true),
-                  ),
-                ],
-              ),
+        body: _body(context),
+        bottomNavigationBar: logic.videoImmersive ? null : _nav(context, l10n),
       ),
     );
   }
 
-  void _selectTab(BuildContext context, int tab, {bool myProfile = false}) {
+  Widget _body(BuildContext context) {
+    return IndexedStack(
+      index: logic.tab,
+      children: [_player(context), _discover(context), _my(context)],
+    );
+  }
+
+  Widget _player(BuildContext context) {
+    return PlayerPage(
+      drama: widget.dramas.first,
+      feedDramas: widget.dramas,
+      onDramaChanged: logic.onDramaChanged,
+      initialIndex: 0,
+      homeMode: true,
+      embedded: true,
+      active: logic.tab == 0 && !logic.drawerOpen && !logic.detailOpen,
+      resumeRequest: logic.resumeRequest,
+      backRequest: logic.backRequest,
+      onDiscover: () => logic.select(1),
+      onMy: logic.openProfile,
+      onSearch: () => logic.select(1, search: true),
+      onMenu: () => _openMenu(context),
+      onImmersiveChanged: logic.onImmersiveChanged,
+      wallet: context.read<WalletController>(),
+      downloads: context.read<DownloadController>(),
+    );
+  }
+
+  Widget _discover(BuildContext context) {
+    return DiscoverPage(
+      active: logic.tab == 1,
+      searchRequest: logic.searchRequest,
+      callbacks: DiscoverPageCallbacks(
+        onAction: logic.discoverAction,
+        onDramaSelected: (drama) => logic.playDrama(context, drama),
+        onProfile: logic.openProfile,
+      ),
+    );
+  }
+
+  Widget _my(BuildContext context) {
+    return MyPage(
+      active: logic.tab == 2,
+      callbacks: MyPageCallbacks(
+        onAction: logic.myAction,
+        onDramaSelected: (drama) => logic.openDrama(context, drama),
+      ),
+    );
+  }
+
+  Widget _nav(BuildContext context, AppLocalizations l10n) {
+    return AppBottomNav(
+      barKey: const Key('home-tabs-bar'),
+      items: [
+        _navItem(context, l10n, 0),
+        _navItem(context, l10n, 1),
+        _navItem(context, l10n, 2),
+      ],
+    );
+  }
+
+  AppBottomNavItem _navItem(
+    BuildContext context,
+    AppLocalizations l10n,
+    int index,
+  ) {
+    final selected = logic.tab == index;
+    return switch (index) {
+      0 => AppBottomNavItem(
+        tabKey: const Key('tab-home'),
+        icon: Icons.play_circle_outline_rounded,
+        selectedIcon: Icons.play_circle_fill_rounded,
+        label: l10n.homeTab,
+        selected: selected,
+        onTap: () => _selectTab(context, index),
+      ),
+      1 => AppBottomNavItem(
+        tabKey: const Key('tab-discover'),
+        icon: Icons.explore_outlined,
+        selectedIcon: Icons.explore_rounded,
+        label: l10n.discoverTab,
+        selected: selected,
+        onTap: () => _selectTab(context, index),
+      ),
+      _ => AppBottomNavItem(
+        tabKey: const Key('tab-my'),
+        icon: Icons.video_library_outlined,
+        selectedIcon: Icons.video_library_rounded,
+        label: l10n.myTab,
+        selected: selected,
+        onTap: () => _selectTab(context, index),
+      ),
+    };
+  }
+
+  void _selectTab(BuildContext context, int tab) {
     final same = logic.tab == tab;
     if (!same) {
       unawaited(context.read<Haptics>().selectionClick());
     }
-    if (tab == 2) {
-      myProfile ? logic.openProfile() : logic.openLibrary();
-    } else {
-      logic.select(tab);
-    }
+    logic.select(tab);
   }
 
   Future<void> _openMenu(BuildContext context) async {
@@ -269,10 +262,9 @@ class _HomeTabsState extends State<_HomeTabs> {
       builder: (_) => HomeMenuSheet(
         drama: logic.currentDrama,
         onOpenSeries: () => logic.openCurrentSeries(context),
-        onDiscover: () => logic.selectFromMenu(1),
-        onHistory: () => logic.openLibrary(section: 0),
-        onWatchlist: logic.openLibrary,
-        onLiked: () => logic.selectFromMenu(2, mySection: 2),
+        onDiscover: () => logic.select(1),
+        onHistory: () => logic.openHistory(context),
+        onWatchlist: () => logic.openFavorites(context),
       ),
     );
     logic.setMenuOpen(false);

lib/pages/home/widgets/home_menu_sheet.dart

@@ -1,16 +1,14 @@
 // Author: fruit.com.cn
 
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 
-import '../../../core/config/locale_controller.dart';
 import '../../../core/data/models/drama.dart';
 import '../../../core/formatting/localized_content.dart';
 import '../../../core/theme/app_colors.dart';
 import '../../../core/widgets/remote_image.dart';
 import '../../../l10n/app_localizations.dart';
 
-/// Compact navigation menu opened from the preview home header.
+/// 播放页快捷菜单：当前剧、发现、追剧与历史。
 class HomeMenuSheet extends StatelessWidget {
   const HomeMenuSheet({
     super.key,
@@ -19,7 +17,6 @@ class HomeMenuSheet extends StatelessWidget {
     required this.onDiscover,
     required this.onHistory,
     required this.onWatchlist,
-    required this.onLiked,
   });
 
   final Drama drama;
@@ -27,12 +24,10 @@ class HomeMenuSheet extends StatelessWidget {
   final VoidCallback onDiscover;
   final VoidCallback onHistory;
   final VoidCallback onWatchlist;
-  final VoidCallback onLiked;
 
   @override
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
-    final languageCode = Localizations.localeOf(context).languageCode;
     void closeThen(VoidCallback action) {
       Navigator.pop(context);
       action();
@@ -45,160 +40,147 @@ class HomeMenuSheet extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           mainAxisSize: MainAxisSize.min,
           children: [
-            Container(
-              padding: const EdgeInsets.all(10),
-              decoration: BoxDecoration(
-                color: AppColors.cardAlt,
-                borderRadius: BorderRadius.circular(12),
-              ),
-              child: Row(
-                children: [
-                  ClipRRect(
-                    borderRadius: BorderRadius.circular(10),
-                    child: RemoteImage(drama.posterUrl, width: 64, height: 86),
-                  ),
-                  const SizedBox(width: 10),
-                  Expanded(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          localizedDramaTitle(l10n, drama),
-                          maxLines: 2,
-                          overflow: TextOverflow.ellipsis,
-                          style: const TextStyle(
-                            color: AppColors.onSurface,
-                            fontSize: 15,
-                            fontWeight: FontWeight.w800,
-                          ),
-                        ),
-                        const SizedBox(height: 4),
-                        Text(
-                          l10n.episodeCount(drama.episodeCount),
-                          style: const TextStyle(
-                            color: AppColors.muted,
-                            fontSize: 9,
-                          ),
-                        ),
-                        const SizedBox(height: 8),
-                        SizedBox(
-                          height: 34,
-                          child: FilledButton.icon(
-                            key: const Key('drawer-open-series'),
-                            onPressed: () => closeThen(onOpenSeries),
-                            style: FilledButton.styleFrom(
-                              backgroundColor: AppColors.blue,
-                              foregroundColor: AppColors.onPrimary,
-                              shape: RoundedRectangleBorder(
-                                borderRadius: BorderRadius.circular(9),
-                              ),
-                              textStyle: const TextStyle(fontSize: 11),
-                            ),
-                            icon: const Icon(
-                              Icons.play_arrow_rounded,
-                              size: 15,
-                            ),
-                            label: Text(l10n.exploreSeries),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
+            _DramaSummary(
+              drama: drama,
+              l10n: l10n,
+              onOpenSeries: () => closeThen(onOpenSeries),
             ),
             const SizedBox(height: 14),
-            Text(
-              l10n.quickAccess,
-              style: const TextStyle(
-                color: AppColors.onSurface,
-                fontSize: 13,
-                fontWeight: FontWeight.w800,
-              ),
+            _quickAccess(l10n, closeThen),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _quickAccess(
+    AppLocalizations l10n,
+    void Function(VoidCallback) closeThen,
+  ) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          l10n.quickAccess,
+          style: const TextStyle(
+            color: AppColors.onSurface,
+            fontSize: 13,
+            fontWeight: FontWeight.w800,
+          ),
+        ),
+        const SizedBox(height: 8),
+        Row(
+          children: [
+            _item(
+              key: const Key('drawer-discover'),
+              icon: Icons.explore_outlined,
+              label: l10n.discoverTab,
+              onTap: () => closeThen(onDiscover),
             ),
-            const SizedBox(height: 8),
-            Row(
-              children: [
-                Expanded(
-                  child: _MenuTile(
-                    key: const Key('drawer-discover'),
-                    icon: Icons.explore_outlined,
-                    label: l10n.discoverTab,
-                    onTap: () => closeThen(onDiscover),
-                  ),
-                ),
-                const SizedBox(width: 8),
-                Expanded(
-                  child: _MenuTile(
-                    key: const Key('drawer-history'),
-                    icon: Icons.history_rounded,
-                    label: l10n.history,
-                    onTap: () => closeThen(onHistory),
-                  ),
-                ),
-              ],
+            _item(
+              key: const Key('drawer-watchlist'),
+              icon: Icons.bookmark_border_rounded,
+              label: l10n.watchlist,
+              onTap: () => closeThen(onWatchlist),
             ),
-            const SizedBox(height: 8),
-            Row(
-              children: [
-                Expanded(
-                  child: _MenuTile(
-                    key: const Key('drawer-watchlist'),
-                    icon: Icons.bookmark_border_rounded,
-                    label: l10n.watchlist,
-                    onTap: () => closeThen(onWatchlist),
-                  ),
-                ),
-                const SizedBox(width: 8),
-                Expanded(
-                  child: _MenuTile(
-                    key: const Key('drawer-liked'),
-                    icon: Icons.favorite_border_rounded,
-                    label: l10n.likedTab,
-                    onTap: () => closeThen(onLiked),
-                  ),
-                ),
-              ],
-            ),
-            const SizedBox(height: 14),
-            Text(
-              l10n.appLanguage,
-              style: const TextStyle(
-                color: AppColors.onSurface,
-                fontSize: 13,
-                fontWeight: FontWeight.w800,
-              ),
-            ),
-            const SizedBox(height: 8),
-            Wrap(
-              spacing: 8,
-              runSpacing: 8,
-              children: [
-                for (final (code, label) in [
-                  ('en', l10n.english),
-                  ('zh', l10n.simplifiedChinese),
-                  ('id', l10n.bahasaIndonesia),
-                ])
-                  ChoiceChip(
-                    label: Text(label),
-                    selected: languageCode == code,
-                    onSelected: (_) =>
-                        context.read<LocaleController>().select(code),
-                    backgroundColor: AppColors.input,
-                    selectedColor: AppColors.blue,
-                    labelStyle: TextStyle(
-                      color: languageCode == code
-                          ? AppColors.onPrimary
-                          : AppColors.muted,
-                      fontSize: 10,
-                    ),
-                    side: BorderSide.none,
-                    showCheckmark: false,
-                  ),
-              ],
+            _item(
+              key: const Key('drawer-history'),
+              icon: Icons.history_rounded,
+              label: l10n.history,
+              onTap: () => closeThen(onHistory),
             ),
           ],
         ),
+      ],
+    );
+  }
+
+  Widget _item({
+    required Key key,
+    required IconData icon,
+    required String label,
+    required VoidCallback onTap,
+  }) {
+    return Expanded(
+      child: Padding(
+        padding: const EdgeInsets.only(right: 8),
+        child: _MenuTile(key: key, icon: icon, label: label, onTap: onTap),
+      ),
+    );
+  }
+}
+
+class _DramaSummary extends StatelessWidget {
+  const _DramaSummary({
+    required this.drama,
+    required this.l10n,
+    required this.onOpenSeries,
+  });
+
+  final Drama drama;
+  final AppLocalizations l10n;
+  final VoidCallback onOpenSeries;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(10),
+      decoration: BoxDecoration(
+        color: AppColors.cardAlt,
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Row(
+        children: [
+          ClipRRect(
+            borderRadius: BorderRadius.circular(10),
+            child: RemoteImage(drama.posterUrl, width: 64, height: 86),
+          ),
+          const SizedBox(width: 10),
+          Expanded(child: _details()),
+        ],
+      ),
+    );
+  }
+
+  Widget _details() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          localizedDramaTitle(l10n, drama),
+          maxLines: 2,
+          overflow: TextOverflow.ellipsis,
+          style: const TextStyle(
+            color: AppColors.onSurface,
+            fontSize: 15,
+            fontWeight: FontWeight.w800,
+          ),
+        ),
+        const SizedBox(height: 4),
+        Text(
+          l10n.episodeCount(drama.episodeCount),
+          style: const TextStyle(color: AppColors.muted, fontSize: 9),
+        ),
+        const SizedBox(height: 8),
+        _button(),
+      ],
+    );
+  }
+
+  Widget _button() {
+    return SizedBox(
+      height: 34,
+      child: FilledButton.icon(
+        key: const Key('drawer-open-series'),
+        onPressed: onOpenSeries,
+        style: FilledButton.styleFrom(
+          backgroundColor: AppColors.blue,
+          foregroundColor: AppColors.onPrimary,
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(9)),
+          textStyle: const TextStyle(fontSize: 11),
+        ),
+        icon: const Icon(Icons.play_arrow_rounded, size: 15),
+        label: Text(l10n.exploreSeries),
       ),
     );
   }