From 0cd57c9bb0ff195e0eb3cd44033b71b8bfb2aab8 Mon Sep 17 00:00:00 2001 From: bggRGjQaUbCoE Date: Thu, 14 Aug 2025 11:40:01 +0800 Subject: [PATCH] tweak Signed-off-by: bggRGjQaUbCoE --- lib/http/search.dart | 2 +- lib/models/common/{ => search}/search_type.dart | 15 --------------- lib/models/common/search/video_search_type.dart | 15 +++++++++++++++ lib/pages/search_panel/all/controller.dart | 2 +- lib/pages/search_panel/controller.dart | 2 +- lib/pages/search_panel/video/controller.dart | 2 +- lib/pages/search_panel/video/view.dart | 2 +- lib/pages/search_panel/view.dart | 2 +- lib/pages/search_result/controller.dart | 2 +- lib/pages/search_result/view.dart | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) rename lib/models/common/{ => search}/search_type.dart (67%) diff --git a/lib/http/search.dart b/lib/http/search.dart index 9e2c6ee0..0d1f2bea 100644 --- a/lib/http/search.dart +++ b/lib/http/search.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; -import 'package:PiliPlus/models/common/search_type.dart'; +import 'package:PiliPlus/models/common/search/search_type.dart'; import 'package:PiliPlus/models/search/result.dart'; import 'package:PiliPlus/models/search/suggest.dart'; import 'package:PiliPlus/models_new/dynamic/dyn_topic_pub_search/data.dart'; diff --git a/lib/models/common/search_type.dart b/lib/models/common/search/search_type.dart similarity index 67% rename from lib/models/common/search_type.dart rename to lib/models/common/search/search_type.dart index e4aee0b7..fffa3432 100644 --- a/lib/models/common/search_type.dart +++ b/lib/models/common/search/search_type.dart @@ -26,18 +26,3 @@ enum SearchType { final String label; const SearchType(this.label, {this.hasHeader = false}); } - -// 搜索类型为视频、专栏及相簿时 -enum ArchiveFilterType { - totalrank('默认排序'), - click('播放多'), - pubdate('新发布'), - dm('弹幕多'), - stow('收藏多'), - scores('评论多'); - // 专栏 - // attention('最多喜欢'), - - final String desc; - const ArchiveFilterType(this.desc); -} diff --git a/lib/models/common/search/video_search_type.dart b/lib/models/common/search/video_search_type.dart index 46afeb93..ec552bc0 100644 --- a/lib/models/common/search/video_search_type.dart +++ b/lib/models/common/search/video_search_type.dart @@ -47,3 +47,18 @@ enum VideoZoneType { final int? tids; const VideoZoneType(this.label, {this.tids}); } + +// 搜索类型为视频、专栏及相簿时 +enum ArchiveFilterType { + totalrank('默认排序'), + click('播放多'), + pubdate('新发布'), + dm('弹幕多'), + stow('收藏多'), + scores('评论多'); + // 专栏 + // attention('最多喜欢'), + + final String desc; + const ArchiveFilterType(this.desc); +} diff --git a/lib/pages/search_panel/all/controller.dart b/lib/pages/search_panel/all/controller.dart index a7f0066f..e97fd8cf 100644 --- a/lib/pages/search_panel/all/controller.dart +++ b/lib/pages/search_panel/all/controller.dart @@ -1,6 +1,6 @@ import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/search.dart'; -import 'package:PiliPlus/models/common/search_type.dart'; +import 'package:PiliPlus/models/common/search/search_type.dart'; import 'package:PiliPlus/models/search/result.dart'; import 'package:PiliPlus/pages/search_panel/controller.dart'; import 'package:PiliPlus/utils/app_scheme.dart'; diff --git a/lib/pages/search_panel/controller.dart b/lib/pages/search_panel/controller.dart index b13050fb..1caad24a 100644 --- a/lib/pages/search_panel/controller.dart +++ b/lib/pages/search_panel/controller.dart @@ -1,9 +1,9 @@ import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/models/common/search/article_search_type.dart'; +import 'package:PiliPlus/models/common/search/search_type.dart'; import 'package:PiliPlus/models/common/search/user_search_type.dart'; import 'package:PiliPlus/models/common/search/video_search_type.dart'; -import 'package:PiliPlus/models/common/search_type.dart'; import 'package:PiliPlus/models/search/result.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:PiliPlus/pages/search_result/controller.dart'; diff --git a/lib/pages/search_panel/video/controller.dart b/lib/pages/search_panel/video/controller.dart index 8a56f42a..5d8f8150 100644 --- a/lib/pages/search_panel/video/controller.dart +++ b/lib/pages/search_panel/video/controller.dart @@ -1,8 +1,8 @@ import 'dart:math'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/common/search/search_type.dart'; import 'package:PiliPlus/models/common/search/video_search_type.dart'; -import 'package:PiliPlus/models/common/search_type.dart'; import 'package:PiliPlus/models/search/result.dart'; import 'package:PiliPlus/pages/search/widgets/search_text.dart'; import 'package:PiliPlus/pages/search_panel/controller.dart'; diff --git a/lib/pages/search_panel/video/view.dart b/lib/pages/search_panel/video/view.dart index 8a3d42d4..07af0305 100644 --- a/lib/pages/search_panel/video/view.dart +++ b/lib/pages/search_panel/video/view.dart @@ -1,6 +1,6 @@ import 'package:PiliPlus/common/widgets/custom_sliver_persistent_header_delegate.dart'; import 'package:PiliPlus/common/widgets/video_card/video_card_h.dart'; -import 'package:PiliPlus/models/common/search_type.dart'; +import 'package:PiliPlus/models/common/search/video_search_type.dart'; import 'package:PiliPlus/models/search/result.dart'; import 'package:PiliPlus/pages/search/widgets/search_text.dart'; import 'package:PiliPlus/pages/search_panel/video/controller.dart'; diff --git a/lib/pages/search_panel/view.dart b/lib/pages/search_panel/view.dart index c7507729..a81d4403 100644 --- a/lib/pages/search_panel/view.dart +++ b/lib/pages/search_panel/view.dart @@ -6,7 +6,7 @@ import 'package:PiliPlus/common/skeleton/video_card_v.dart'; import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; -import 'package:PiliPlus/models/common/search_type.dart'; +import 'package:PiliPlus/models/common/search/search_type.dart'; import 'package:PiliPlus/models/search/result.dart'; import 'package:PiliPlus/pages/search_panel/controller.dart'; import 'package:PiliPlus/utils/grid.dart'; diff --git a/lib/pages/search_result/controller.dart b/lib/pages/search_result/controller.dart index 766f30dd..3bf67368 100644 --- a/lib/pages/search_result/controller.dart +++ b/lib/pages/search_result/controller.dart @@ -1,4 +1,4 @@ -import 'package:PiliPlus/models/common/search_type.dart'; +import 'package:PiliPlus/models/common/search/search_type.dart'; import 'package:get/get.dart'; class SearchResultController extends GetxController { diff --git a/lib/pages/search_result/view.dart b/lib/pages/search_result/view.dart index 34444770..73a260cc 100644 --- a/lib/pages/search_result/view.dart +++ b/lib/pages/search_result/view.dart @@ -1,5 +1,5 @@ import 'package:PiliPlus/common/widgets/scroll_physics.dart'; -import 'package:PiliPlus/models/common/search_type.dart'; +import 'package:PiliPlus/models/common/search/search_type.dart'; import 'package:PiliPlus/pages/search/controller.dart'; import 'package:PiliPlus/pages/search_panel/article/view.dart'; import 'package:PiliPlus/pages/search_panel/live/view.dart'; @@ -44,8 +44,8 @@ class _SearchResultPageState extends State sSearchController = Get.find( tag: Get.parameters['tag'], ); + _tabController.addListener(listener); } catch (_) {} - _tabController.addListener(listener); } }