diff --git a/lib/models/common/history_business_type.dart b/lib/models/common/history_business_type.dart deleted file mode 100644 index bcfa38d6..00000000 --- a/lib/models/common/history_business_type.dart +++ /dev/null @@ -1,15 +0,0 @@ -enum HistoryBusinessType { - // 普通视频 - archive('archive'), - // 剧集(番剧 / 影视) - pgc('pgc'), - // 直播 - live('live'), - // 文章 - articleList('article-list'), - // 文章 - article('article'); - - final String type; - const HistoryBusinessType(this.type); -} diff --git a/lib/pages/fav_detail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart index e4b3eda8..3f4aaf4f 100644 --- a/lib/pages/fav_detail/widget/fav_video_card.dart +++ b/lib/pages/fav_detail/widget/fav_video_card.dart @@ -59,7 +59,7 @@ class FavVideoCardH extends StatelessWidget { ctr!.onViewFav(item, index); }, - onLongPress: isSort + onLongPress: isSort || enableMultiSelect ? null : isOwner && !enableMultiSelect ? () { diff --git a/lib/pages/history/view.dart b/lib/pages/history/view.dart index b02977c8..f1a66dce 100644 --- a/lib/pages/history/view.dart +++ b/lib/pages/history/view.dart @@ -191,9 +191,6 @@ class _HistoryPageState extends State case 'viewed': currCtr().onDelViewedHistory(); break; - case 'multiple': - _historyController.baseCtr.enableMultiSelect.value = true; - break; } }, itemBuilder: (BuildContext context) => >[ @@ -213,10 +210,6 @@ class _HistoryPageState extends State value: 'viewed', child: Text('删除已看记录'), ), - const PopupMenuItem( - value: 'multiple', - child: Text('多选删除'), - ), ], ), const SizedBox(width: 6), diff --git a/lib/pages/history/widgets/item.dart b/lib/pages/history/widgets/item.dart index c5c1868b..3d162ad0 100644 --- a/lib/pages/history/widgets/item.dart +++ b/lib/pages/history/widgets/item.dart @@ -6,7 +6,6 @@ import 'package:PiliPlus/common/widgets/select_mask.dart'; import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/models/common/badge_type.dart'; -import 'package:PiliPlus/models/common/history_business_type.dart'; import 'package:PiliPlus/models_new/history/list.dart'; import 'package:PiliPlus/pages/common/multi_select/base.dart'; import 'package:PiliPlus/utils/date_util.dart'; @@ -136,9 +135,7 @@ class HistoryItem extends StatelessWidget { text: item.badge, top: 6.0, right: 6.0, - type: - business == HistoryBusinessType.live.type && - item.liveStatus != 1 + type: business == 'live' && item.liveStatus != 1 ? PBadgeType.gray : PBadgeType.primary, ),