diff --git a/lib/pages/main_content_page.dart b/lib/pages/main_content_page.dart index 03bc5f9..df3096d 100644 --- a/lib/pages/main_content_page.dart +++ b/lib/pages/main_content_page.dart @@ -7,8 +7,8 @@ import '../utils/toast_util.dart'; import 'movies/movie_tab_page.dart'; import 'book/book_tab_page.dart'; import 'note/note_tab_page.dart'; -import 'search_page.dart'; -import 'online_search_page.dart'; +import 'online_search/search_page.dart'; +import 'online_search/online_search_page.dart'; import 'sync/webdav_sync_page.dart'; /// 主内容页 - 观影/阅读/笔记标签页(PageView 滑动切换) diff --git a/lib/pages/online_search/book_detail_page.dart b/lib/pages/online_search/book_detail_page.dart index e978fc2..60911ac 100644 --- a/lib/pages/online_search/book_detail_page.dart +++ b/lib/pages/online_search/book_detail_page.dart @@ -6,12 +6,12 @@ import 'package:http/http.dart' as http; import 'package:path/path.dart' as p; import 'package:provider/provider.dart'; import 'package:uuid/uuid.dart'; -import '../utils/server_config.dart'; -import '../utils/user_prefs.dart'; -import '../models/data_models.dart'; -import '../providers/app_provider.dart'; -import '../utils/image_path_helper.dart'; -import '../utils/toast_util.dart'; +import '../../utils/server_config.dart'; +import '../../utils/user_prefs.dart'; +import '../../models/data_models.dart'; +import '../../providers/app_provider.dart'; +import '../../utils/image_path_helper.dart'; +import '../../utils/toast_util.dart'; /// 书籍详情页 - 在线版 class BookDetailPage extends StatefulWidget { diff --git a/lib/pages/online_search/enhanced_search_settings_page.dart b/lib/pages/online_search/enhanced_search_settings_page.dart index f66f0af..111c1fa 100644 --- a/lib/pages/online_search/enhanced_search_settings_page.dart +++ b/lib/pages/online_search/enhanced_search_settings_page.dart @@ -1,9 +1,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; -import '../utils/user_prefs.dart'; -import '../utils/server_config.dart'; -import 'legal_page.dart'; +import '../../utils/user_prefs.dart'; +import '../../utils/server_config.dart'; +import '../legal_page.dart'; /// 增强搜索设置页面 class EnhancedSearchSettingsPage extends StatefulWidget { diff --git a/lib/pages/online_search/movie_detail_page.dart b/lib/pages/online_search/movie_detail_page.dart index b45c02f..d82469c 100644 --- a/lib/pages/online_search/movie_detail_page.dart +++ b/lib/pages/online_search/movie_detail_page.dart @@ -5,12 +5,12 @@ import 'package:http/http.dart' as http; import 'package:path/path.dart' as p; import 'package:provider/provider.dart'; import 'package:uuid/uuid.dart'; -import '../utils/server_config.dart'; -import '../utils/user_prefs.dart'; -import '../models/data_models.dart'; -import '../providers/app_provider.dart'; -import '../utils/image_path_helper.dart'; -import '../utils/toast_util.dart'; +import '../../utils/server_config.dart'; +import '../../utils/user_prefs.dart'; +import '../../models/data_models.dart'; +import '../../providers/app_provider.dart'; +import '../../utils/image_path_helper.dart'; +import '../../utils/toast_util.dart'; /// 影视详情页 - 在线版 class MovieDetailPage extends StatefulWidget { diff --git a/lib/pages/online_search/online_search_page.dart b/lib/pages/online_search/online_search_page.dart index 2fbf979..8d480af 100644 --- a/lib/pages/online_search/online_search_page.dart +++ b/lib/pages/online_search/online_search_page.dart @@ -1,9 +1,9 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; -import '../utils/server_config.dart'; -import '../utils/user_prefs.dart'; -import '../utils/toast_util.dart'; +import '../../utils/server_config.dart'; +import '../../utils/user_prefs.dart'; +import '../../utils/toast_util.dart'; import 'movie_detail_page.dart'; import 'book_detail_page.dart'; diff --git a/lib/pages/online_search/search_page.dart b/lib/pages/online_search/search_page.dart index 0bd4d0e..415e2b2 100644 --- a/lib/pages/online_search/search_page.dart +++ b/lib/pages/online_search/search_page.dart @@ -1,12 +1,12 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../providers/app_provider.dart'; -import '../models/data_models.dart'; -import 'movies/movie_detail_page.dart'; -import 'book/book_detail_page.dart'; -import 'note/note_detail_page.dart'; -import '../widgets/fade_in_local_image.dart'; +import '../../providers/app_provider.dart'; +import '../../models/data_models.dart'; +import '../movies/movie_detail_page.dart'; +import '../book/book_detail_page.dart'; +import '../note/note_detail_page.dart'; +import '../../widgets/fade_in_local_image.dart'; /// 搜索页面 class SearchPage extends StatefulWidget { diff --git a/lib/pages/profile_page.dart b/lib/pages/profile_page.dart index 7544336..f87e769 100644 --- a/lib/pages/profile_page.dart +++ b/lib/pages/profile_page.dart @@ -17,7 +17,7 @@ import '../widgets/fade_in_local_image.dart'; import 'statistics_page.dart'; import 'changelog_page.dart'; import 'legal_page.dart'; -import 'enhanced_search_settings_page.dart'; +import 'online_search/enhanced_search_settings_page.dart'; import 'sync/cloud_sync_page.dart'; import 'app_icon_picker_page.dart'; import 'tag_management_page.dart'; diff --git a/lib/pages/reader/epub_player.dart b/lib/pages/reader/epub_player.dart index 3e74d41..5b48ea8 100644 --- a/lib/pages/reader/epub_player.dart +++ b/lib/pages/reader/epub_player.dart @@ -9,8 +9,8 @@ import 'package:wakelock_plus/wakelock_plus.dart'; import '../../models/reader_book.dart'; import '../../providers/app_provider.dart'; import '../../service/book_server.dart'; -import '../../utils/book_file_helper.dart'; -import '../../utils/reader_url_generator.dart'; +import '../../utils/reader/book_file_helper.dart'; +import '../../utils/reader/reader_url_generator.dart'; /// 目录条目 class TocItem { diff --git a/lib/pages/reader/reader_book_detail_page.dart b/lib/pages/reader/reader_book_detail_page.dart index cdb7462..dd85055 100644 --- a/lib/pages/reader/reader_book_detail_page.dart +++ b/lib/pages/reader/reader_book_detail_page.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../../models/reader_book.dart'; import '../../providers/app_provider.dart'; -import '../../utils/book_file_helper.dart'; +import '../../utils/reader/book_file_helper.dart'; import 'reading_page.dart'; /// 阅读器书籍详情页 diff --git a/lib/pages/reader/reading_page.dart b/lib/pages/reader/reading_page.dart index ad8c118..b58272e 100644 --- a/lib/pages/reader/reading_page.dart +++ b/lib/pages/reader/reading_page.dart @@ -3,7 +3,7 @@ import 'package:flutter/services.dart'; import 'package:pointer_interceptor/pointer_interceptor.dart'; import '../../models/reader_book.dart'; import '../../service/book_server.dart'; -import '../../utils/book_file_helper.dart'; +import '../../utils/reader/book_file_helper.dart'; import 'epub_player.dart'; import 'toc_drawer.dart'; import 'progress_panel.dart'; diff --git a/lib/pages/statistics_page.dart b/lib/pages/statistics_page.dart index b81e0cc..bab5229 100644 --- a/lib/pages/statistics_page.dart +++ b/lib/pages/statistics_page.dart @@ -702,7 +702,7 @@ class _StatisticsPageState extends State { crossAxisAlignment: CrossAxisAlignment.end, children: List.generate(7, (i) { final ratio = weekdayCounts[i] / maxCount; - final barHeight = (ratio * 100).clamp(4.0, 100.0); + final barHeight = (ratio * 96).clamp(4.0, 96.0); return Expanded( child: Padding( padding: const EdgeInsets.symmetric(horizontal: 4), diff --git a/lib/providers/app_provider.dart b/lib/providers/app_provider.dart index cc18a83..0bd6c44 100644 --- a/lib/providers/app_provider.dart +++ b/lib/providers/app_provider.dart @@ -8,7 +8,7 @@ import '../utils/movie/movie_poster_dao.dart'; import '../utils/book/book_review_dao.dart'; import '../utils/book/book_excerpt_dao.dart'; import '../utils/tag/tag_dao.dart'; -import '../utils/reader_book_dao.dart'; +import '../utils/reader/reader_book_dao.dart'; import '../models/reader_book.dart'; import '../utils/database_helper.dart'; import '../utils/image_path_helper.dart'; diff --git a/lib/service/book_import_service.dart b/lib/service/book_import_service.dart index 87027c8..9bccefc 100644 --- a/lib/service/book_import_service.dart +++ b/lib/service/book_import_service.dart @@ -5,7 +5,7 @@ import 'package:path/path.dart' as p; import 'package:uuid/uuid.dart'; import '../models/reader_book.dart'; import '../providers/app_provider.dart'; -import '../utils/book_file_helper.dart'; +import '../utils/reader/book_file_helper.dart'; /// 书籍导入服务 class BookImportService { diff --git a/lib/utils/reader/reader_book_dao.dart b/lib/utils/reader/reader_book_dao.dart index ade9b61..a4d3a1e 100644 --- a/lib/utils/reader/reader_book_dao.dart +++ b/lib/utils/reader/reader_book_dao.dart @@ -1,6 +1,6 @@ import 'package:flutter/foundation.dart'; -import '../models/reader_book.dart'; -import 'database_helper.dart'; +import '../../models/reader_book.dart'; +import '../database_helper.dart'; /// 阅读器书籍 DAO class ReaderBookDao { diff --git a/lib/utils/reader/reader_url_generator.dart b/lib/utils/reader/reader_url_generator.dart index 3236e54..b54ee3c 100644 --- a/lib/utils/reader/reader_url_generator.dart +++ b/lib/utils/reader/reader_url_generator.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import '../service/book_server.dart'; -import 'color_converter.dart'; +import '../../service/book_server.dart'; +import '../color_converter.dart'; /// 生成 foliate-js 阅读器 URL String generateReaderUrl({ diff --git a/lib/utils/server_config.dart b/lib/utils/server_config.dart index 8af8637..666eb5a 100644 --- a/lib/utils/server_config.dart +++ b/lib/utils/server_config.dart @@ -11,7 +11,7 @@ class ServerConfig { static final String apiBase = '$baseUrl/api'; static final String vipBaseUrl = kDebugMode - // ? 'http://vipapi.mooknote.iletter.top' - ? 'http://192.168.31.48:8081' + ? 'http://vipapi.mooknote.iletter.top' + // ? 'http://192.168.31.48:8081' : 'http://vipapi.mooknote.iletter.top'; }