代码优化

lib/main.dart

@@ -187,8 +187,6 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
 
   @override
   Widget build(BuildContext context) {
-    final iconName = UserPrefs().appIconName;
-
     return MultiProvider(
       providers: [
         ChangeNotifierProvider.value(value: widget.appProvider),
@@ -221,9 +219,6 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
             navigatorKey: _navigatorKey,
             navigatorObservers: [routeObserver],
             onGenerateRoute: AppRouter.generateRoute,
-            builder: (context, child) {
-              return _AppIconWrapper(iconName: iconName, child: child!);
-            },
           );
           },
         );
@@ -232,19 +227,3 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
     );
   }
 }
-
-class _AppIconWrapper extends StatefulWidget {
-  final Widget child;
-  final String iconName;
-  const _AppIconWrapper({required this.child, required this.iconName});
-
-  @override
-  State<_AppIconWrapper> createState() => _AppIconWrapperState();
-}
-
-class _AppIconWrapperState extends State<_AppIconWrapper> {
-  @override
-  Widget build(BuildContext context) {
-    return widget.child;
-  }
-}

lib/models/data_models.dart

@@ -10,7 +10,7 @@ const _copyWithNull = _CopyWithNullSentinel();
 /// 安全解析日期字符串，失败时返回 fallback
 DateTime? _safeParseDate(String? str, {DateTime? fallback}) {
   if (str == null || str.isEmpty) return fallback;
-  return DateTime.tryParse(str) ?? fallback;
+  return DateTime.tryParse(str)?.toLocal() ?? fallback;
 }
 
 /// 解析字符串列表（通用工具函数，不限于 Movie）

lib/models/note_plus_models.dart

@@ -241,10 +241,10 @@ class NotePlusDocument {
       tags: _parseStringList(json['tags'] as String?),
       images: _parseStringList(json['images'] as String?),
       createdAt: json['created_at'] != null
-          ? DateTime.tryParse(json['created_at'] as String) ?? DateTime.now()
+          ? (DateTime.tryParse(json['created_at'] as String)?.toLocal() ?? DateTime.now())
           : DateTime.now(),
       updatedAt: json['updated_at'] != null
-          ? DateTime.tryParse(json['updated_at'] as String) ?? DateTime.now()
+          ? (DateTime.tryParse(json['updated_at'] as String)?.toLocal() ?? DateTime.now())
           : DateTime.now(),
       isDeleted: (json['is_deleted'] as int?) == 1,
     );

lib/pages/book/book_detail_page.dart

@@ -4,8 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import '../../widgets/fade_in_local_image.dart';
-import 'package:share_plus/share_plus.dart';
-import 'package:cross_file/cross_file.dart';
 import '../../providers/app_provider.dart';
 import '../../models/data_models.dart';
 import '../../utils/toast_util.dart';
@@ -335,27 +333,25 @@ class _BookDetailPageState extends State<BookDetailPage> {
     required Color backgroundColor,
     required Color foregroundColor,
   }) {
-    return Material(
+    return Tooltip(
-      color: Colors.transparent,
+      message: tooltip,
-      child: Ink(
+      child: GestureDetector(
-        width: 40,
+        onTap: onPressed,
-        height: 40,
+        child: Container(
-        decoration: BoxDecoration(
+          width: 40,
-          color: backgroundColor,
+          height: 40,
-          shape: BoxShape.circle,
+          decoration: BoxDecoration(
-          boxShadow: [
+            color: backgroundColor,
-            BoxShadow(
+            shape: BoxShape.circle,
-              color: backgroundColor.withValues(alpha: 0.3),
+            boxShadow: [
-              blurRadius: 8,
+              BoxShadow(
-              offset: const Offset(0, 2),
+                color: backgroundColor.withValues(alpha: 0.3),
-            ),
+                blurRadius: 8,
-          ],
+                offset: const Offset(0, 2),
-        ),
+              ),
-        child: IconButton(
+            ],
-          icon: Icon(icon, size: 18, color: foregroundColor),
+          ),
-          onPressed: onPressed,
+          child: Icon(icon, size: 18, color: foregroundColor),
-          padding: EdgeInsets.zero,
-          tooltip: tooltip,
         ),
       ),
     );
@@ -1252,35 +1248,8 @@ class _BookDetailPageState extends State<BookDetailPage> {
     );
   }
 
-  Future<void> _downloadCover(Book book) async {
-    if (book.coverPath == null || book.coverPath!.isEmpty) {
-      ToastUtil.show(context, '没有可下载的封面');
-      return;
-    }
 
-    try {
-      final sourceFile = File(book.coverPath!);
-      if (!await sourceFile.exists()) {
-        ToastUtil.show(context, '封面文件不存在');
-        return;
-      }
 
-      final timestamp = DateTime.now().millisecondsSinceEpoch;
-      final fileName = '${book.title}_${timestamp}_封面.jpg';
-
-      final tempDir = await Directory.systemTemp.createTemp();
-      final tempFile = File('${tempDir.path}/$fileName');
-      await sourceFile.copy(tempFile.path);
-
-      await Share.shareXFiles(
-        [XFile(tempFile.path)],
-        subject: '${book.title} 封面',
-        text: '下载自 MookNote',
-      );
-    } catch (e) {
-      ToastUtil.show(context, '下载失败: $e');
-    }
-  }
 
   void _showSharePoster(Book book) {
     Navigator.push(

lib/pages/book/book_reviews_page.dart

@@ -291,18 +291,6 @@ class _BookReviewsPageState extends State<BookReviewsPage> {
     ).then((_) => _loadReviews());
   }
 
-  void _navigateToEditReview(BookReview review) {
-    Navigator.push(
-      context,
-      MaterialPageRoute(
-        builder: (context) => BookReviewFormPage(
-          bookId: widget.book.id,
-          review: review,
-        ),
-      ),
-    ).then((_) => _loadReviews());
-  }
-
   void _navigateToReviewDetail(BookReview review) {
     Navigator.push(
       context,

lib/pages/epub_reader/reader_screen.dart

@@ -10,7 +10,6 @@ import '../../utils/epub/epub_stream_service.dart';
 import '../../utils/epub/epub_parser.dart';
 import '../../utils/epub/reader_settings.dart';
 import '../../utils/epub/reader_models.dart';
-import '../../utils/epub/volume_control_service.dart';
 import '../../utils/epub/reader_dao.dart';
 import '../../utils/toast_util.dart';
 import 'book_session.dart';
@@ -125,7 +124,6 @@ class _ReaderScreenState extends State<ReaderScreen>
 
   final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey<ScaffoldState>();
 
-  StreamSubscription<String>? volumeSubscription;
   bool tocDrawerOpen = false;
   bool styleDrawerOpen = false;
   AppLifecycleState? lastLifecycleState = AppLifecycleState.resumed;
@@ -195,9 +193,6 @@ class _ReaderScreenState extends State<ReaderScreen>
     progressDebouncer?.cancel();
     removeFootnoteOverlay(animate: false);
     restoreSystemUI();
-    volumeSubscription?.cancel();
-    VolumeControlService.disableInterception();
-    // 立即保存进度（同步写入，不被 dispose 打断）
     bookSession.flushProgress(
       currentChapterIndex: currentSpineItemIndex,
       currentPageInChapter: currentPageInChapter,
@@ -221,31 +216,8 @@ class _ReaderScreenState extends State<ReaderScreen>
   }
 
   void setupVolumeControl() {
-    final resume = readerSettings.volumeKeyTurnsPage &&
+    // VolumeControlService removed — native implementation never existed.
-        !tocDrawerOpen &&
+    // TODO: reimplement if native volume-key interception is added.
-        !styleDrawerOpen &&
-        lastLifecycleState == AppLifecycleState.resumed;
-
-    if (resume) {
-      VolumeControlService.enableInterception();
-      volumeSubscription ??= VolumeControlService.volumeKeyEvents.listen((
-        event,
-      ) {
-        if (readerSettings.volumeKeyTurnsPage) {
-          if (footnoteOverlayEntry != null) {
-            removeFootnoteOverlay();
-            return;
-          }
-          if (event == 'up') {
-            rendererController.performPreviousPageTurn();
-          } else if (event == 'down') {
-            rendererController.performNextPageTurn();
-          }
-        }
-      });
-    } else {
-      VolumeControlService.disableInterception();
-    }
   }
 
   void hideBottomNavigationBar() {

lib/pages/main_content_page.dart

@@ -3,7 +3,6 @@ import 'package:provider/provider.dart';
 import '../providers/app_provider.dart';
 import '../utils/user_prefs.dart';
 import '../utils/sync/webdav_service.dart';
-import '../utils/toast_util.dart';
 import 'movies/movie_tab_page.dart';
 import 'book/book_tab_page.dart';
 import 'note/note_tab_page.dart';

lib/pages/movies/douban_webview_page.dart

@@ -15,7 +15,6 @@ class DoubanWebViewPage extends StatefulWidget {
 class _DoubanWebViewPageState extends State<DoubanWebViewPage> {
   late WebViewController _controller;
   bool _isLoading = true;
-  bool _canExtract = false;
   bool _isExtracting = false; // 防止重复提取
 
   @override
@@ -47,7 +46,6 @@ class _DoubanWebViewPageState extends State<DoubanWebViewPage> {
             if (mounted) {
               setState(() {
                 _isLoading = false;
-                _canExtract = url.contains('douban.com/subject');
               });
             }
           },

lib/pages/movies/movie_detail_page.dart

@@ -3,16 +3,11 @@ import 'dart:ui' as ui;
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:path/path.dart' as path;
 import '../../widgets/fade_in_local_image.dart';
-import 'package:share_plus/share_plus.dart';
-import 'package:cross_file/cross_file.dart';
-import 'package:permission_handler/permission_handler.dart';
 import '../../providers/app_provider.dart';
 import '../../models/data_models.dart';
-import '../../utils/toast_util.dart';
 import '../../utils/user_prefs.dart';
+import '../../utils/toast_util.dart';
 import 'movie_reviews_page.dart';
 import 'movie_posters_page.dart';
 import 'movie_share_page.dart';
@@ -113,7 +108,7 @@ class _MovieDetailPageState extends State<MovieDetailPage> {
               ),
             ),
           ),
-          // 导航栏
+          // 详情页面的标准顶部导航栏
           Positioned(
             top: 0, left: 0, right: 0,
             child: Container(
@@ -387,27 +382,25 @@ class _MovieDetailPageState extends State<MovieDetailPage> {
     required Color backgroundColor,
     required Color foregroundColor,
   }) {
-    return Material(
+    return Tooltip(
-      color: Colors.transparent,
+      message: tooltip,
-      child: Ink(
+      child: GestureDetector(
-        width: 40,
+        onTap: onPressed,
-        height: 40,
+        child: Container(
-        decoration: BoxDecoration(
+          width: 40,
-          color: backgroundColor,
+          height: 40,
-          shape: BoxShape.circle,
+          decoration: BoxDecoration(
-          boxShadow: [
+            color: backgroundColor,
-            BoxShadow(
+            shape: BoxShape.circle,
-              color: backgroundColor.withValues(alpha: 0.3),
+            boxShadow: [
-              blurRadius: 8,
+              BoxShadow(
-              offset: const Offset(0, 2),
+                color: backgroundColor.withValues(alpha: 0.3),
-            ),
+                blurRadius: 8,
-          ],
+                offset: const Offset(0, 2),
-        ),
+              ),
-        child: IconButton(
+            ],
-          icon: Icon(icon, size: 18, color: foregroundColor),
+          ),
-          onPressed: onPressed,
+          child: Icon(icon, size: 18, color: foregroundColor),
-          padding: EdgeInsets.zero,
-          tooltip: tooltip,
         ),
       ),
     );
@@ -1184,11 +1177,15 @@ class _MovieDetailPageState extends State<MovieDetailPage> {
           ),
           ElevatedButton(
             onPressed: () async {
-              await context.read<AppProvider>().removeMovie(widget.movie.id);
+              final provider = context.read<AppProvider>();
+              await provider.removeMovie(widget.movie.id);
               if (!mounted) return;
-              Navigator.pop(context);
+              final navigator = Navigator.of(context);
-              Navigator.pop(context);
+              navigator.pop();
-              ToastUtil.show(context, '已删除');
+              navigator.pop();
+              if (mounted) {
+                ToastUtil.show(context, '已删除');
+              }
             },
             style: ElevatedButton.styleFrom(
               backgroundColor: colors.error,
@@ -1207,27 +1204,6 @@ class _MovieDetailPageState extends State<MovieDetailPage> {
     );
   }
 
-  Future<bool> _requestStoragePermission() async {
-    if (Platform.isAndroid) {
-      final sdkInt = await _getAndroidSdkInt();
-      if (sdkInt >= 33) {
-        final status = await Permission.photos.request();
-        return status.isGranted;
-      } else {
-        var status = await Permission.storage.request();
-        if (status.isDenied) {
-          status = await Permission.storage.request();
-        }
-        return status.isGranted;
-      }
-    }
-    return true;
-  }
-
-  Future<int> _getAndroidSdkInt() async {
-    return 30;
-  }
-
   void _showSharePoster(Movie movie) {
     Navigator.push(
       context,

lib/pages/movies/movie_form_page.dart

@@ -3,7 +3,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:path_provider/path_provider.dart';
 import 'package:path/path.dart' as p;
 import 'package:provider/provider.dart';
 import 'package:http/http.dart' as http;

lib/pages/movies/movie_posters_page.dart

@@ -1,8 +1,6 @@
 import 'dart:io';
-import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:path_provider/path_provider.dart';
 import 'package:path/path.dart' as p;
 import 'package:provider/provider.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
@@ -133,7 +131,6 @@ class _MoviePostersPageState extends State<MoviePostersPage> {
   }
 
   Widget _buildPosterItem(MoviePoster poster, int index) {
-    final colors = Theme.of(context).colorScheme;
     // 根据索引生成不同的高度，实现瀑布流效果
     final heights = [180.0, 220.0, 160.0, 200.0, 240.0, 190.0];
     final height = heights[index % heights.length];

lib/pages/movies/movie_review_detail_page.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../../models/data_models.dart';

lib/pages/movies/movie_review_form_page.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../../providers/app_provider.dart';

lib/pages/movies/movie_reviews_page.dart

@@ -291,18 +291,6 @@ class _MovieReviewsPageState extends State<MovieReviewsPage> {
     ).then((_) => _loadReviews());
   }
 
-  void _navigateToEditReview(MovieReview review) {
-    Navigator.push(
-      context,
-      MaterialPageRoute(
-        builder: (context) => MovieReviewFormPage(
-          movieId: widget.movie.id,
-          review: review,
-        ),
-      ),
-    ).then((_) => _loadReviews());
-  }
-
   void _navigateToReviewDetail(MovieReview review) {
     Navigator.push(
       context,

lib/pages/movies/movie_tab_page.dart

@@ -80,8 +80,6 @@ class _MovieTabPageState extends State<MovieTabPage> {
     }
   }
 
-  String get _currentStatus => _statusMap[context.read<AppProvider>().movieStatusIndex] ?? 'watched';
-
   Future<void> _loadFirst() async {
     final provider = context.read<AppProvider>();
     final statusIdx = provider.movieStatusIndex;

lib/pages/movies/poster_gallery_page.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:flutter/material.dart';
 import '../../models/data_models.dart';
 import '../../widgets/fade_in_local_image.dart';

lib/pages/note/note_detail_page.dart

@@ -335,27 +335,25 @@ class _NoteDetailPageState extends State<NoteDetailPage> {
     required Color backgroundColor,
     required Color foregroundColor,
   }) {
-    return Material(
+    return Tooltip(
-      color: Colors.transparent,
+      message: tooltip,
-      child: Ink(
+      child: GestureDetector(
-        width: 40,
+        onTap: onPressed,
-        height: 40,
+        child: Container(
-        decoration: BoxDecoration(
+          width: 40,
-          color: backgroundColor,
+          height: 40,
-          shape: BoxShape.circle,
+          decoration: BoxDecoration(
-          boxShadow: [
+            color: backgroundColor,
-            BoxShadow(
+            shape: BoxShape.circle,
-              color: backgroundColor.withValues(alpha: 0.3),
+            boxShadow: [
-              blurRadius: 8,
+              BoxShadow(
-              offset: const Offset(0, 2),
+                color: backgroundColor.withValues(alpha: 0.3),
-            ),
+                blurRadius: 8,
-          ],
+                offset: const Offset(0, 2),
-        ),
+              ),
-        child: IconButton(
+            ],
-          icon: Icon(icon, size: 18, color: foregroundColor),
+          ),
-          onPressed: onPressed,
+          child: Icon(icon, size: 18, color: foregroundColor),
-          padding: EdgeInsets.zero,
-          tooltip: tooltip,
         ),
       ),
     );

lib/pages/note/note_share_page.dart

@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'dart:typed_data';
 import 'dart:ui' as ui;
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';

lib/pages/note/note_tab_page.dart

@@ -209,20 +209,17 @@ class _NoteTabPageState extends State<NoteTabPage> {
       '${date.year}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')} ${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
 
   Widget _buildWaterfallView() {
-    final colors = Theme.of(context).colorScheme;
     final leftItems = <Note>[];
     final rightItems = <Note>[];
     for (int i = 0; i < _items.length; i++) {
       (i % 2 == 0 ? leftItems : rightItems).add(_items[i]);
     }
-    return RefreshIndicator(onRefresh: _refresh, color: colors.primary, backgroundColor: colors.surface,
+    return SingleChildScrollView(controller: _scrollController, padding: const EdgeInsets.fromLTRB(12, 8, 12, 80),
-      child: SingleChildScrollView(controller: _scrollController, padding: const EdgeInsets.fromLTRB(12, 8, 12, 100),
+      child: Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
-        child: Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
+        Expanded(child: Column(children: leftItems.map(_buildWaterfallCard).toList())),
-          Expanded(child: Column(children: [...leftItems.map(_buildWaterfallCard), if (_hasMore) _buildLoadMore()])),
+        const SizedBox(width: 8),
-          const SizedBox(width: 8),
+        Expanded(child: Column(children: rightItems.map(_buildWaterfallCard).toList())),
-          Expanded(child: Column(children: rightItems.map(_buildWaterfallCard).toList())),
+      ]),
-        ]),
-      ),
     );
   }
 
@@ -313,9 +310,10 @@ class _NoteTabPageState extends State<NoteTabPage> {
             title: Text(note.isPinned ? '取消置顶' : '置顶', style: TextStyle(fontSize: 13, fontWeight: FontWeight.w500, color: colors.onSurface)),
             subtitle: Text(note.isPinned ? '取消置顶后按时间排序' : '置顶后始终显示在最前', style: TextStyle(fontSize: 11, color: colors.onSurface.withValues(alpha: 0.4))),
             trailing: Icon(Icons.chevron_right, color: colors.onSurface.withValues(alpha: 0.25)),
-            onTap: () {
+            onTap: () async {
               Navigator.pop(ctx);
-              context.read<AppProvider>().toggleNotePin(note.id, !note.isPinned);
+              await context.read<AppProvider>().toggleNotePin(note.id, !note.isPinned);
+              _loadFirst();
             },
           ),
           Divider(height: 0.5, color: colors.outlineVariant),

lib/pages/online_search/search_page.dart

@@ -201,7 +201,6 @@ class _SearchPageState extends State<SearchPage> {
   }
 
   Widget _buildFilterRow() {
-    final colors = Theme.of(context).colorScheme;
     final keyword = _searchController.text.trim();
     final provider = context.read<AppProvider>();
     int movieCount = 0, bookCount = 0, noteCount = 0;

lib/pages/recycle_bin_page.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../providers/app_provider.dart';
 import '../models/data_models.dart';
+import '../models/note_plus_models.dart';
 import '../utils/toast_util.dart';
 
 /// 回收站页面
@@ -12,7 +13,7 @@ class RecycleBinPage extends StatefulWidget {
   State<RecycleBinPage> createState() => _RecycleBinPageState();
 }
 
-enum _ItemType { movie, book, note, movieReview, bookReview }
+enum _ItemType { movie, book, note, movieReview, bookReview, bookExcerpt, notePlus }
 
 class _DeletedItem {
   final _ItemType type;
@@ -61,6 +62,22 @@ class _DeletedItem {
         subtitle = '删除于 ${r.updatedAt.year}.${r.updatedAt.month.toString().padLeft(2, '0')}.${r.updatedAt.day.toString().padLeft(2, '0')}',
         icon = Icons.rate_review_outlined,
         typeLabel = '书评';
+
+  _DeletedItem.bookExcerpt(BookExcerpt e)
+      : type = _ItemType.bookExcerpt,
+        id = e.id,
+        title = e.content.isNotEmpty ? e.content : '摘抄',
+        subtitle = '删除于 ${e.updatedAt.year}.${e.updatedAt.month.toString().padLeft(2, '0')}.${e.updatedAt.day.toString().padLeft(2, '0')}',
+        icon = Icons.format_quote_outlined,
+        typeLabel = '书摘';
+
+  _DeletedItem.notePlus(NotePlusDocument d)
+      : type = _ItemType.notePlus,
+        id = d.id,
+        title = d.title.isNotEmpty ? d.title : '未命名文档',
+        subtitle = '删除于 ${d.updatedAt.year}.${d.updatedAt.month.toString().padLeft(2, '0')}.${d.updatedAt.day.toString().padLeft(2, '0')}',
+        icon = Icons.edit_note_outlined,
+        typeLabel = '高级笔记';
 }
 
 class _RecycleBinPageState extends State<RecycleBinPage> {
@@ -85,6 +102,8 @@ class _RecycleBinPageState extends State<RecycleBinPage> {
     final notes = await provider.getDeletedNotes();
     final movieReviews = await provider.getDeletedMovieReviews();
     final bookReviews = await provider.getDeletedBookReviews();
+    final bookExcerpts = await provider.getDeletedBookExcerpts();
+    final notePlusDocs = await provider.getDeletedNotePlusDocs();
     if (!mounted) return;
     setState(() {
       _allItems = [
@@ -93,6 +112,8 @@ class _RecycleBinPageState extends State<RecycleBinPage> {
         for (final n in notes) _DeletedItem.note(n),
         for (final r in movieReviews) _DeletedItem.movieReview(r),
         for (final r in bookReviews) _DeletedItem.bookReview(r),
+        for (final e in bookExcerpts) _DeletedItem.bookExcerpt(e),
+        for (final d in notePlusDocs) _DeletedItem.notePlus(d),
       ];
       _isLoading = false;
     });
@@ -166,6 +187,8 @@ class _RecycleBinPageState extends State<RecycleBinPage> {
           _filterChip('笔记', _ItemType.note),
           _filterChip('影评', _ItemType.movieReview),
           _filterChip('书评', _ItemType.bookReview),
+          _filterChip('书摘', _ItemType.bookExcerpt),
+          _filterChip('高级笔记', _ItemType.notePlus),
         ],
       ),
     );
@@ -356,6 +379,12 @@ class _RecycleBinPageState extends State<RecycleBinPage> {
       case _ItemType.bookReview:
         await provider.restoreBookReview(item.id);
         if (mounted) ToastUtil.show(context, '书评已恢复');
+      case _ItemType.bookExcerpt:
+        await provider.restoreBookExcerpt(item.id);
+        if (mounted) ToastUtil.show(context, '书摘已恢复');
+      case _ItemType.notePlus:
+        await provider.restoreNotePlusDoc(item.id);
+        if (mounted) ToastUtil.show(context, '高级笔记已恢复');
     }
     _loadDeletedItems();
   }
@@ -375,6 +404,10 @@ class _RecycleBinPageState extends State<RecycleBinPage> {
         await provider.permanentDeleteMovieReview(item.id);
       case _ItemType.bookReview:
         await provider.permanentDeleteBookReview(item.id);
+      case _ItemType.bookExcerpt:
+        await provider.permanentDeleteBookExcerpt(item.id);
+      case _ItemType.notePlus:
+        await provider.permanentDeleteNotePlusDoc(item.id);
     }
     _loadDeletedItems();
     if (mounted) ToastUtil.show(context, '已彻底删除');

lib/providers/app_provider.dart

@@ -1,6 +1,7 @@
 import 'dart:collection';
 import 'package:flutter/material.dart';
 import '../models/data_models.dart';
+import '../models/note_plus_models.dart';
 import '../utils/movie/movie_dao.dart';
 import '../utils/book/book_dao.dart';
 import '../utils/note/note_dao.dart';
@@ -8,6 +9,7 @@ import '../utils/movie/movie_review_dao.dart';
 import '../utils/movie/movie_poster_dao.dart';
 import '../utils/book/book_review_dao.dart';
 import '../utils/book/book_excerpt_dao.dart';
+import '../utils/note_plus/note_plus_dao.dart';
 import '../utils/tag/tag_dao.dart';
 import '../utils/database_helper.dart';
 import '../utils/image_path_helper.dart';
@@ -24,6 +26,7 @@ class AppProvider extends ChangeNotifier {
   final MoviePosterDao _posterDao = MoviePosterDao();
   final BookReviewDao _bookReviewDao = BookReviewDao();
   final BookExcerptDao _bookExcerptDao = BookExcerptDao();
+  final NotePlusDao _notePlusDao = NotePlusDao();
   final TagDao _tagDao = TagDao();
   // 数据列表
   List<Movie> _movies = [];
@@ -325,6 +328,7 @@ class AppProvider extends ChangeNotifier {
   Future<void> toggleNotePin(String id, bool isPinned) async {
     await _noteDao.togglePin(id, isPinned);
     await loadNotes();
+    notifyListeners();
   }
   
   // ========== 影评相关方法 ==========
@@ -494,6 +498,8 @@ class AppProvider extends ChangeNotifier {
     final deletedNotes = await getDeletedNotes();
     final deletedMovieReviews = await getDeletedMovieReviews();
     final deletedBookReviews = await getDeletedBookReviews();
+    final deletedBookExcerpts = await getDeletedBookExcerpts();
+    final deletedNotePlusDocs = await _notePlusDao.getDeleted();
 
     for (final movie in deletedMovies) {
       await permanentDeleteMovie(movie.id);
@@ -510,6 +516,12 @@ class AppProvider extends ChangeNotifier {
     for (final review in deletedBookReviews) {
       await _bookReviewDao.permanentDeleteReview(review.id);
     }
+    for (final excerpt in deletedBookExcerpts) {
+      await _bookExcerptDao.permanentDeleteExcerpt(excerpt.id);
+    }
+    for (final doc in deletedNotePlusDocs) {
+      await _notePlusDao.permanentDelete(doc.id);
+    }
 
     await loadMovies();
     await loadBooks();
@@ -542,6 +554,34 @@ class AppProvider extends ChangeNotifier {
     await _bookReviewDao.permanentDeleteReview(id);
   }
 
+  // ========== 摘抄回收站方法 ==========
+
+  Future<List<BookExcerpt>> getDeletedBookExcerpts() async {
+    return await _bookExcerptDao.getDeletedExcerpts();
+  }
+
+  Future<void> restoreBookExcerpt(String id) async {
+    await _bookExcerptDao.restoreExcerpt(id);
+  }
+
+  Future<void> permanentDeleteBookExcerpt(String id) async {
+    await _bookExcerptDao.permanentDeleteExcerpt(id);
+  }
+
+  // ========== Note Plus 回收站 ==========
+
+  Future<List<NotePlusDocument>> getDeletedNotePlusDocs() async {
+    return await _notePlusDao.getDeleted();
+  }
+
+  Future<void> restoreNotePlusDoc(String id) async {
+    await _notePlusDao.restore(id);
+  }
+
+  Future<void> permanentDeleteNotePlusDoc(String id) async {
+    await _notePlusDao.permanentDelete(id);
+  }
+
   // ========== 标签管理方法 ==========
 
   Future<List<Map<String, dynamic>>> getTags(String type, {bool excludeHidden = false}) async {

lib/providers/note_plus_provider.dart

@@ -201,16 +201,6 @@ class NotePlusProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  /// 更新文档所属文件夹
-  Future<void> updateDocumentFolder(String id, String folder) async {
-    final idx = _documents.indexWhere((d) => d.id == id);
-    if (idx < 0) return;
-    final doc = _documents[idx].copyWith(parentId: folder, updatedAt: DateTime.now());
-    await _dao.update(doc);
-    _documents[idx] = doc;
-    notifyListeners();
-  }
-
   // ========== Block 操作 ==========
 
   void setFocusedBlock(int index) {

lib/utils/database_helper.dart

@@ -580,11 +580,6 @@ class DatabaseHelper {
 
   // 创建数据库表
   Future<void> _createDB(Database db, int version) async {
-    const idType = 'INTEGER PRIMARY KEY AUTOINCREMENT';
-    const textType = 'TEXT NOT NULL';
-    const integerType = 'INTEGER NOT NULL';
-    const booleanType = 'INTEGER NOT NULL';
-
     // 影视表
     await db.execute('''
       CREATE TABLE movies (
@@ -783,9 +778,4 @@ class DatabaseHelper {
     }
   }
 
-  // 重新打开（关闭后重新初始化）
-  Future reopen() async {
-    await close();
-    await database;
-  }
 }

lib/utils/epub/volume_control_service.dart

@@ -1,50 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-import 'package:flutter/services.dart';
-
-/// 音量键翻页服务
-/// 注意：需要原生 Android 实现才能工作，当前为空操作
-class VolumeControlService {
-  static const MethodChannel _methodChannel = MethodChannel(
-    'mooknote/volume_control',
-  );
-
-  static bool _available = false;
-  static bool _checked = false;
-
-  static Future<void> enableInterception() async {
-    if (!Platform.isAndroid) return;
-    if (!_checked) await _checkAvailable();
-    if (!_available) return;
-    try {
-      await _methodChannel.invokeMethod('enableInterception');
-    } catch (_) {}
-  }
-
-  static Future<void> disableInterception() async {
-    if (!Platform.isAndroid) return;
-    if (!_available) return;
-    try {
-      await _methodChannel.invokeMethod('disableInterception');
-    } catch (_) {}
-  }
-
-  static Stream<String> get volumeKeyEvents {
-    if (!Platform.isAndroid || !_available) return const Stream.empty();
-    // 需要原生 EventChannel 实现，当前返回空流
-    return const Stream.empty();
-  }
-
-  /// 检查原生端是否实现了该 channel
-  static Future<void> _checkAvailable() async {
-    _checked = true;
-    try {
-      await _methodChannel.invokeMethod('enableInterception');
-      _available = true;
-    } on MissingPluginException {
-      _available = false;
-    } catch (_) {
-      _available = false;
-    }
-  }
-}

lib/utils/user_prefs.dart

@@ -35,7 +35,7 @@ class UserPrefs {
   /// 首次使用日期
   DateTime get firstUseDate {
     final str = prefs.getString('firstUseDate');
-    if (str != null) return DateTime.tryParse(str) ?? DateTime.now();
+    if (str != null) return DateTime.tryParse(str)?.toLocal() ?? DateTime.now();
     return DateTime.now();
   }
 

lib/widgets/book_list_item.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../models/data_models.dart';

lib/widgets/custom_drawer.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -11,7 +10,6 @@ import '../pages/person_list_page.dart';
 import '../pages/markdown_reader/md_reader_tab_page.dart';
 import '../pages/epub_reader/epub_library_page.dart';
 import '../pages/tag_management_page.dart';
-import '../pages/profile_page.dart';
 import '../pages/movies/movie_detail_page.dart';
 import '../pages/book/book_detail_page.dart';
 import '../pages/note/note_detail_page.dart';

lib/widgets/movie_list_item.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../models/data_models.dart';

lib/widgets/note_list_item.dart

@@ -2,9 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../providers/app_provider.dart';
 import '../models/data_models.dart';
-import 'fade_in_local_image.dart';
 
-/// 笔记列表项组件 - 极简主义设计
+/// 笔记列表项组件 - 卡片式设计，内容展示在卡片内
 class NoteListItem extends StatelessWidget {
   final Note note;
 
@@ -26,7 +25,9 @@ class _NoteListItemContent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final colors = Theme.of(context).colorScheme;
-    return InkWell(
+    final previewText = _getPreviewText(note);
+
+    return GestureDetector(
       onTap: () async {
         final provider = context.read<AppProvider>();
         await Navigator.pushNamed(context, '/note-detail', arguments: note);
@@ -35,123 +36,95 @@ class _NoteListItemContent extends StatelessWidget {
       onLongPress: () => _showActions(context),
       child: Container(
         margin: const EdgeInsets.only(bottom: 8),
-        padding: const EdgeInsets.fromLTRB(12, 10, 12, 10),
+        padding: const EdgeInsets.all(14),
         decoration: BoxDecoration(
           color: colors.surfaceContainerHigh,
-          borderRadius: BorderRadius.circular(8),
+          borderRadius: BorderRadius.circular(12),
         ),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           mainAxisSize: MainAxisSize.min,
           children: [
-            // 日期行
+            // 标题（带置顶图标）
-            Row(
-              children: [
-                Text(
-                  _formatDate(note.createdAt),
-                  style: TextStyle(
-                    fontSize: 11,
-                    color: colors.onSurface.withValues(alpha: 0.4),
-                  ),
-                ),
-                const SizedBox(width: 8),
-                Container(
-                  padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 1),
-                  decoration: BoxDecoration(
-                    color: colors.surface,
-                    borderRadius: BorderRadius.circular(3),
-                  ),
-                  child: Text(
-                    'MD',
-                    style: TextStyle(
-                      fontSize: 9,
-                      fontWeight: FontWeight.w600,
-                      color: colors.onSurface.withValues(alpha: 0.4),
-                    ),
-                  ),
-                ),
-                if (note.isPinned) ...[
-                  const SizedBox(width: 6),
-                  Icon(Icons.push_pin, size: 12, color: colors.primary),
-                ],
-              ],
-            ),
-
-            const SizedBox(height: 6),
-
             if (note.title.isNotEmpty) ...[
-              Text(
+              const SizedBox(height: 6),
-                note.title,
-                style: TextStyle(
-                  fontSize: 15,
-                  fontWeight: FontWeight.w600,
-                  color: colors.onSurface,
-                  height: 1.4,
-                ),
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-              ),
-              const SizedBox(height: 4),
-            ],
-
-            if (_collapseBlankLines(_cleanMarkdown(note.content).trim()).isNotEmpty)
-              Text(
-                _collapseBlankLines(_cleanMarkdown(note.content).trim()),
-                style: TextStyle(
-                  fontSize: 13,
-                  color: colors.onSurface.withValues(alpha: 0.6),
-                  height: 1.5,
-                ),
-                maxLines: 2,
-                overflow: TextOverflow.ellipsis,
-              ),
-
-            // 图片缩略图（最多3张，超出显示 +N）
-            if (note.images.isNotEmpty) ...[
-              const SizedBox(height: 8),
               Row(
                 children: [
-                  for (int i = 0; i < note.images.length.clamp(0, 3); i++) ...[
+                  if (note.isPinned)
-                    if (i > 0) const SizedBox(width: 6),
+                    Padding(
-                    ClipRRect(
+                      padding: const EdgeInsets.only(right: 4),
-                      borderRadius: BorderRadius.circular(6),
+                      child: Icon(Icons.push_pin, size: 14, color: colors.primary),
-                      child: Stack(
+                    ),
-                        children: [
+                  Expanded(
-                          FadeInLocalImage(
+                    child: Text(
-                            path: note.images[i],
+                      note.title,
-                            width: 56, height: 56,
+                      style: TextStyle(
-                            fit: BoxFit.cover,
+                        fontSize: 15,
-                            errorWidget: Container(width: 56, height: 56, color: colors.surfaceContainerHighest),
+                        fontWeight: FontWeight.w600,
-                          ),
+                        color: colors.onSurface,
-                          // 第3张且有更多时显示 +N
+                        height: 1.3,
-                          if (i == 2 && note.images.length > 3)
+                      ),
-                            Positioned.fill(
+                      maxLines: 1,
-                              child: Container(
+                      overflow: TextOverflow.ellipsis,
-                                decoration: BoxDecoration(
+                    ),
-                                  color: Colors.black.withValues(alpha: 0.45),
+                  ),
-                                  borderRadius: BorderRadius.circular(6),
+                  const SizedBox(width: 12),
-                                ),
+                  Text(
-                                alignment: Alignment.center,
+                    _formatDate(note.createdAt),
-                                child: Text('+${note.images.length - 3}',
+                    style: TextStyle(
-                                    style: const TextStyle(fontSize: 13, color: Colors.white, fontWeight: FontWeight.w600)),
+                      fontSize: 11,
-                              ),
+                      color: colors.onSurface.withValues(alpha: 0.35),
-                            ),
+                    ),
-                        ],
+                  ),
+                ],
+              ),
+            ],
+
+            // 内容预览（无标题时才显示置顶和时间，替换原本只有置顶的逻辑）
+            if (previewText.isNotEmpty) ...[
+              const SizedBox(height: 6),
+              if (note.title.isEmpty)
+                Row(
+                  children: [
+                    if (note.isPinned)
+                      Padding(
+                        padding: const EdgeInsets.only(right: 4),
+                        child: Icon(Icons.push_pin, size: 14, color: colors.primary),
+                      ),
+                    const Spacer(),
+                    Text(
+                      _formatDate(note.createdAt),
+                      style: TextStyle(
+                        fontSize: 11,
+                        color: colors.onSurface.withValues(alpha: 0.35),
                       ),
                     ),
                   ],
-                ],
+                ),
+              if (note.title.isEmpty)
+                const SizedBox(height: 2),
+              Text(
+                previewText,
+                style: TextStyle(
+                  fontSize: 13,
+                  color: colors.onSurface.withValues(alpha: 0.5),
+                  height: 1.5,
+                ),
+                maxLines: 3,
+                overflow: TextOverflow.ellipsis,
               ),
             ],
 
+            // 标签（换行显示）
             if (note.tags.isNotEmpty) ...[
-              const SizedBox(height: 6),
+              const SizedBox(height: 8),
               Wrap(
                 spacing: 6,
                 runSpacing: 4,
                 children: note.tags.map((tag) {
                   return Container(
-                    padding: const EdgeInsets.symmetric(horizontal: 7, vertical: 2),
+                    padding: const EdgeInsets.symmetric(
+                        horizontal: 7, vertical: 2),
                     decoration: BoxDecoration(
                       color: colors.surface,
                       borderRadius: BorderRadius.circular(4),
@@ -173,37 +146,82 @@ class _NoteListItemContent extends StatelessWidget {
     );
   }
 
+  String _getPreviewText(Note note) {
+    return _collapseBlankLines(_cleanMarkdown(note.content).trim());
+  }
+
   void _showActions(BuildContext context) {
     final colors = Theme.of(context).colorScheme;
     showModalBottomSheet(
       context: context,
       backgroundColor: colors.surface,
-      shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(16))),
+      shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.vertical(top: Radius.circular(16))),
       builder: (ctx) => Padding(
         padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
         child: Column(mainAxisSize: MainAxisSize.min, children: [
-          Container(width: 36, height: 4, decoration: BoxDecoration(color: colors.onSurface.withValues(alpha: 0.15), borderRadius: BorderRadius.circular(2))),
+          Container(
+              width: 36,
+              height: 4,
+              decoration: BoxDecoration(
+                  color: colors.onSurface.withValues(alpha: 0.15),
+                  borderRadius: BorderRadius.circular(2))),
           const SizedBox(height: 16),
           ListTile(
             contentPadding: EdgeInsets.zero,
-            leading: Container(width: 36, height: 36, decoration: BoxDecoration(color: colors.surfaceContainerHighest, borderRadius: BorderRadius.circular(10)),
+            leading: Container(
-                child: Icon(note.isPinned ? Icons.push_pin_outlined : Icons.push_pin, size: 20, color: colors.onSurface.withValues(alpha: 0.6))),
+                width: 36,
-            title: Text(note.isPinned ? '取消置顶' : '置顶', style: TextStyle(fontSize: 13, fontWeight: FontWeight.w500, color: colors.onSurface)),
+                height: 36,
-            subtitle: Text(note.isPinned ? '取消置顶后按时间排序' : '置顶后始终显示在最前', style: TextStyle(fontSize: 11, color: colors.onSurface.withValues(alpha: 0.4))),
+                decoration: BoxDecoration(
-            trailing: Icon(Icons.chevron_right, color: colors.onSurface.withValues(alpha: 0.25)),
+                    color: colors.surfaceContainerHighest,
+                    borderRadius: BorderRadius.circular(10)),
+                child: Icon(
+                    note.isPinned
+                        ? Icons.push_pin_outlined
+                        : Icons.push_pin,
+                    size: 20,
+                    color: colors.onSurface.withValues(alpha: 0.6))),
+            title: Text(note.isPinned ? '取消置顶' : '置顶',
+                style: TextStyle(
+                    fontSize: 13,
+                    fontWeight: FontWeight.w500,
+                    color: colors.onSurface)),
+            subtitle: Text(
+                note.isPinned ? '取消置顶后按时间排序' : '置顶后始终显示在最前',
+                style: TextStyle(
+                    fontSize: 11,
+                    color: colors.onSurface.withValues(alpha: 0.4))),
+            trailing: Icon(Icons.chevron_right,
+                color: colors.onSurface.withValues(alpha: 0.25)),
             onTap: () {
               Navigator.pop(ctx);
-              context.read<AppProvider>().toggleNotePin(note.id, !note.isPinned);
+              context
+                  .read<AppProvider>()
+                  .toggleNotePin(note.id, !note.isPinned);
             },
           ),
           Divider(height: 0.5, color: colors.outlineVariant),
           ListTile(
             contentPadding: EdgeInsets.zero,
-            leading: Container(width: 36, height: 36, decoration: BoxDecoration(color: colors.surfaceContainerHighest, borderRadius: BorderRadius.circular(10)),
+            leading: Container(
-                child: Icon(Icons.delete_outline, size: 20, color: colors.error)),
+                width: 36,
-            title: Text('删除', style: TextStyle(fontSize: 13, fontWeight: FontWeight.w500, color: colors.error)),
+                height: 36,
-            subtitle: Text('删除后可在回收站恢复', style: TextStyle(fontSize: 11, color: colors.onSurface.withValues(alpha: 0.4))),
+                decoration: BoxDecoration(
-            trailing: Icon(Icons.chevron_right, color: colors.onSurface.withValues(alpha: 0.25)),
+                    color: colors.surfaceContainerHighest,
+                    borderRadius: BorderRadius.circular(10)),
+                child: Icon(Icons.delete_outline,
+                    size: 20, color: colors.error)),
+            title: Text('删除',
+                style: TextStyle(
+                    fontSize: 13,
+                    fontWeight: FontWeight.w500,
+                    color: colors.error)),
+            subtitle: Text('删除后可在回收站恢复',
+                style: TextStyle(
+                    fontSize: 11,
+                    color: colors.onSurface.withValues(alpha: 0.4))),
+            trailing: Icon(Icons.chevron_right,
+                color: colors.onSurface.withValues(alpha: 0.25)),
             onTap: () {
               Navigator.pop(ctx);
               _showDeleteConfirm(context);
@@ -220,26 +238,44 @@ class _NoteListItemContent extends StatelessWidget {
     showDialog(
       context: context,
       builder: (ctx) => AlertDialog(
-        backgroundColor: colors.surface, elevation: 0,
+        backgroundColor: colors.surface,
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+        elevation: 0,
-        title: Text('确认删除', style: TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: colors.onSurface)),
+        shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(12)),
+        title: Text('确认删除',
+            style: TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.w600,
+                color: colors.onSurface)),
         content: Text('确定要删除这条笔记吗？删除后可在回收站恢复。',
-            style: TextStyle(fontSize: 14, color: colors.onSurface.withValues(alpha: 0.6), height: 1.5)),
+            style: TextStyle(
+                fontSize: 14,
+                color: colors.onSurface.withValues(alpha: 0.6),
+                height: 1.5)),
         actions: [
-          TextButton(onPressed: () => Navigator.pop(ctx),
+          TextButton(
-            child: Text('取消', style: TextStyle(color: colors.onSurface.withValues(alpha: 0.6)))),
+              onPressed: () => Navigator.pop(ctx),
+              child: Text('取消',
+                  style: TextStyle(
+                      color: colors.onSurface.withValues(alpha: 0.6)))),
           ElevatedButton(
             onPressed: () async {
               await context.read<AppProvider>().removeNote(note.id);
               Navigator.pop(ctx);
             },
-            style: ElevatedButton.styleFrom(backgroundColor: colors.error, foregroundColor: colors.onError, elevation: 0,
+            style: ElevatedButton.styleFrom(
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
+                backgroundColor: colors.error,
-                padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8)),
+                foregroundColor: colors.onError,
+                elevation: 0,
+                shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(8)),
+                padding: const EdgeInsets.symmetric(
+                    horizontal: 16, vertical: 8)),
             child: const Text('删除'),
           ),
         ],
-        actionsPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+        actionsPadding:
+            const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
       ),
     );
   }