opt models

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-06-04 15:20:35 +08:00
parent f50b1d2beb
commit b960359a39
858 changed files with 11000 additions and 12588 deletions

View File

@@ -1,8 +1,8 @@
import 'package:PiliPlus/http/fav.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/http/user.dart';
import 'package:PiliPlus/http/video.dart';
import 'package:PiliPlus/models/user/fav_detail.dart';
import 'package:PiliPlus/models/user/fav_folder.dart';
import 'package:PiliPlus/models_new/fav/fav_detail/data.dart';
import 'package:PiliPlus/models_new/fav/fav_detail/media.dart';
import 'package:PiliPlus/models_new/fav/fav_video/list.dart';
import 'package:PiliPlus/pages/common/multi_select_controller.dart';
import 'package:PiliPlus/utils/extension.dart';
import 'package:PiliPlus/utils/page_utils.dart';
@@ -13,13 +13,13 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
class FavDetailController
extends MultiSelectController<FavDetailData, FavDetailItemData> {
Rx<FavFolderItemData> item = FavFolderItemData().obs;
extends MultiSelectController<FavDetailData, FavDetailItemModel> {
late int mediaId;
late String heroTag;
Rx<FavVideoItemModel> item = FavVideoItemModel().obs;
RxBool isOwner = false.obs;
dynamic mid;
late int mid;
@override
void onInit() {
@@ -37,8 +37,8 @@ class FavDetailController
bool? get hasFooter => true;
@override
List<FavDetailItemData>? getDataList(FavDetailData response) {
return response.list;
List<FavDetailItemModel>? getDataList(FavDetailData response) {
return response.medias;
}
@override
@@ -52,19 +52,19 @@ class FavDetailController
bool customHandleResponse(bool isRefresh, Success<FavDetailData> response) {
FavDetailData data = response.response;
if (isRefresh) {
item.value = data.info ?? FavFolderItemData();
item.value = data.info ?? FavVideoItemModel();
isOwner.value = data.info?.mid == mid;
}
return false;
}
Future<void> onCancelFav(int index, int id, int type) async {
var result = await VideoHttp.delFav(
var result = await FavHttp.delFav(
ids: ['$id:$type'],
delIds: mediaId.toString(),
);
if (result['status']) {
List<FavDetailItemData> dataList = loadingState.value.data!;
List<FavDetailItemModel> dataList = loadingState.value.data!;
item.value.mediaCount = item.value.mediaCount! - 1;
item.refresh();
dataList.removeAt(index);
@@ -77,7 +77,7 @@ class FavDetailController
@override
Future<LoadingState<FavDetailData>> customGetData() =>
UserHttp.userFavFolderDetail(
FavHttp.userFavFolderDetail(
pn: page,
ps: 20,
mediaId: mediaId,
@@ -103,16 +103,16 @@ class FavDetailController
TextButton(
onPressed: () async {
Get.back();
List<FavDetailItemData> list = loadingState.value.data!
List<FavDetailItemModel> list = loadingState.value.data!
.where((e) => e.checked == true)
.toList();
var result = await VideoHttp.delFav(
var result = await FavHttp.delFav(
ids: list.map((item) => '${item.id}:${item.type}').toList(),
delIds: mediaId.toString(),
);
if (result['status']) {
List<FavDetailItemData> dataList = loadingState.value.data!;
List<FavDetailItemData> remainList =
List<FavDetailItemModel> dataList = loadingState.value.data!;
List<FavDetailItemModel> remainList =
dataList.toSet().difference(list.toSet()).toList();
item.value.mediaCount = item.value.mediaCount! - list.length;
item.refresh();
@@ -138,18 +138,18 @@ class FavDetailController
void toViewPlayAll() {
if (loadingState.value.isSuccess) {
List<FavDetailItemData>? list = loadingState.value.data;
List<FavDetailItemModel>? list = loadingState.value.data;
if (list.isNullOrEmpty) return;
for (FavDetailItemData element in list!) {
if (element.cid == null) {
for (FavDetailItemModel element in list!) {
if (element.ugc?.firstCid == null) {
continue;
} else {
if (element.bvid != list.first.bvid) {
SmartDialog.showToast('已跳过不支持播放的视频');
}
PageUtils.toVideoPage(
'bvid=${element.bvid}&cid=${element.cid}',
'bvid=${element.bvid}&cid=${element.ugc!.firstCid}',
arguments: {
'videoItem': element,
'heroTag': Utils.makeHeroTag(element.bvid),
@@ -173,4 +173,17 @@ class FavDetailController
scrollController.jumpToTop();
return super.onReload();
}
Future<void> onFav(bool isFav) async {
var res = isFav
? await FavHttp.unfavFavFolder(mediaId)
: await FavHttp.favFavFolder(mediaId);
if (res['status']) {
item
..value.favState = isFav ? 0 : 1
..refresh();
}
SmartDialog.showToast(res['msg']);
}
}

View File

@@ -4,10 +4,11 @@ import 'package:PiliPlus/common/widgets/dialog/dialog.dart';
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
import 'package:PiliPlus/http/fav.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/http/user.dart';
import 'package:PiliPlus/models/user/fav_detail.dart';
import 'package:PiliPlus/models/user/fav_folder.dart';
import 'package:PiliPlus/models_new/fav/fav_detail/data.dart';
import 'package:PiliPlus/models_new/fav/fav_detail/media.dart';
import 'package:PiliPlus/models_new/fav/fav_video/list.dart';
import 'package:PiliPlus/pages/fav_detail/controller.dart';
import 'package:PiliPlus/pages/fav_detail/widget/fav_video_card.dart';
import 'package:PiliPlus/pages/fav_sort/view.dart';
@@ -112,233 +113,259 @@ class _FavDetailPageState extends State<FavDetailPage> {
],
),
actions: _favDetailController.enableMultiSelect.value
? [
TextButton(
style: TextButton.styleFrom(
visualDensity: VisualDensity.compact,
),
onPressed: () => _favDetailController.handleSelect(true),
child: const Text('全选'),
),
TextButton(
style: TextButton.styleFrom(
visualDensity: VisualDensity.compact,
),
onPressed: () =>
RequestUtils.onCopyOrMove<FavDetailData, FavDetailItemData>(
context: context,
isCopy: true,
ctr: _favDetailController,
mediaId: _favDetailController.mediaId,
mid: _favDetailController.mid,
),
child: Text(
'复制',
style: TextStyle(
color: theme.colorScheme.onSurfaceVariant,
),
),
),
TextButton(
style: TextButton.styleFrom(
visualDensity: VisualDensity.compact,
),
onPressed: () =>
RequestUtils.onCopyOrMove<FavDetailData, FavDetailItemData>(
context: context,
isCopy: false,
ctr: _favDetailController,
mediaId: _favDetailController.mediaId,
mid: _favDetailController.mid,
),
child: Text(
'移动',
style: TextStyle(
color: theme.colorScheme.onSurfaceVariant,
),
),
),
TextButton(
style: TextButton.styleFrom(
visualDensity: VisualDensity.compact,
),
onPressed: () => _favDetailController.onDelChecked(context),
child: Text(
'删除',
style: TextStyle(color: theme.colorScheme.error),
),
),
const SizedBox(width: 6),
]
: [
IconButton(
tooltip: '搜索',
onPressed: () => Get.toNamed(
'/favSearch',
arguments: {
'type': 0,
'mediaId': int.parse(mediaId),
'title': _favDetailController.item.value.title,
'count': _favDetailController.item.value.mediaCount,
'isOwner': _favDetailController.isOwner.value,
},
),
icon: const Icon(Icons.search_outlined),
),
Obx(
() => _favDetailController.isOwner.value
? PopupMenuButton(
icon: const Icon(Icons.more_vert),
itemBuilder: (context) => [
PopupMenuItem(
onTap: () => Get.toNamed(
'/createFav',
parameters: {'mediaId': mediaId},
)?.then((res) {
if (res is FavFolderItemData) {
_favDetailController.item.value = res;
}
}),
child: const Text('编辑信息'),
),
PopupMenuItem(
onTap: () => UserHttp.cleanFav(mediaId: mediaId)
.then((data) {
if (data['status']) {
SmartDialog.showToast('清除成功');
Future.delayed(
const Duration(milliseconds: 200), () {
_favDetailController.onReload();
});
} else {
SmartDialog.showToast(data['msg']);
}
}),
child: const Text('清除失效内容'),
),
PopupMenuItem(
onTap: () {
if (_favDetailController
.loadingState.value.isSuccess &&
_favDetailController.loadingState.value.data
?.isNotEmpty ==
true) {
if ((_favDetailController
.item.value.mediaCount ??
0) >
1000) {
SmartDialog.showToast('内容太多啦超过1000不支持排序');
return;
}
Get.to(
FavSortPage(
favDetailController:
_favDetailController),
);
}
},
child: const Text('排序'),
),
if (!Utils.isDefaultFav(
_favDetailController.item.value.attr ?? 0))
PopupMenuItem(
onTap: () => showConfirmDialog(
context: context,
title: '确定删除该收藏夹?',
onConfirm: () =>
UserHttp.deleteFolder(mediaIds: [mediaId])
.then((data) {
if (data['status']) {
SmartDialog.showToast('删除成功');
Get.back(result: true);
} else {
SmartDialog.showToast(data['msg']);
}
}),
),
child: Text(
'删除',
style: TextStyle(
color: theme.colorScheme.error,
),
),
),
],
)
: const SizedBox.shrink(),
),
const SizedBox(width: 6),
],
flexibleSpace: FlexibleSpaceBar(
background: Padding(
padding: EdgeInsets.only(
top: kToolbarHeight + MediaQuery.of(context).padding.top + 10,
left: 14,
right: 20,
bottom: 10,
? _selectActions(theme)
: _actions(theme),
flexibleSpace: _flexibleSpace(theme),
);
}
List<Widget> _actions(ThemeData theme) => [
IconButton(
tooltip: '搜索',
onPressed: () => Get.toNamed(
'/favSearch',
arguments: {
'type': 0,
'mediaId': int.parse(mediaId),
'title': _favDetailController.item.value.title,
'count': _favDetailController.item.value.mediaCount,
'isOwner': _favDetailController.isOwner.value,
},
),
child: SizedBox(
height: 110,
child: Obx(
() => Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Hero(
tag: _favDetailController.heroTag,
child: NetworkImgLayer(
width: 176,
height: 110,
src: _favDetailController.item.value.cover,
icon: const Icon(Icons.search_outlined),
),
Obx(
() => _favDetailController.isOwner.value
? PopupMenuButton(
icon: const Icon(Icons.more_vert),
itemBuilder: (context) => [
PopupMenuItem(
onTap: () => Get.toNamed(
'/createFav',
parameters: {'mediaId': mediaId},
)?.then((res) {
if (res is FavVideoItemModel) {
_favDetailController.item.value = res;
}
}),
child: const Text('编辑信息'),
),
),
const SizedBox(width: 14),
Expanded(
child: SizedBox(
height: 110,
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(height: 4),
Text(
_favDetailController.item.value.title ?? '',
style: TextStyle(
fontSize: theme.textTheme.titleMedium!.fontSize,
fontWeight: FontWeight.bold),
PopupMenuItem(
onTap: () =>
FavHttp.cleanFav(mediaId: mediaId).then((data) {
if (data['status']) {
SmartDialog.showToast('清除成功');
Future.delayed(const Duration(milliseconds: 200), () {
_favDetailController.onReload();
});
} else {
SmartDialog.showToast(data['msg']);
}
}),
child: const Text('清除失效内容'),
),
PopupMenuItem(
onTap: () {
if (_favDetailController.loadingState.value.isSuccess &&
_favDetailController
.loadingState.value.data?.isNotEmpty ==
true) {
if ((_favDetailController.item.value.mediaCount ??
0) >
1000) {
SmartDialog.showToast('内容太多啦超过1000不支持排序');
return;
}
Get.to(
FavSortPage(
favDetailController: _favDetailController),
);
}
},
child: const Text('排序'),
),
if (!Utils.isDefaultFav(
_favDetailController.item.value.attr ?? 0))
PopupMenuItem(
onTap: () => showConfirmDialog(
context: context,
title: '确定删除该收藏夹?',
onConfirm: () =>
FavHttp.deleteFolder(mediaIds: [mediaId])
.then((data) {
if (data['status']) {
SmartDialog.showToast('删除成功');
Get.back(result: true);
} else {
SmartDialog.showToast(data['msg']);
}
}),
),
child: Text(
'删除',
style: TextStyle(
color: theme.colorScheme.error,
),
if (_favDetailController
.item.value.intro?.isNotEmpty ==
true)
Text(
_favDetailController.item.value.intro ?? '',
style: TextStyle(
fontSize:
theme.textTheme.labelSmall!.fontSize,
color: theme.colorScheme.outline),
),
const SizedBox(height: 4),
Text(
_favDetailController.item.value.upper?.name ?? '',
style: TextStyle(
fontSize: theme.textTheme.labelSmall!.fontSize,
color: theme.colorScheme.outline),
),
const Spacer(),
if (_favDetailController.item.value.attr != null)
Text(
'${_favDetailController.item.value.mediaCount}条视频 · ${Utils.isPublicFavText(_favDetailController.item.value.attr ?? 0)}',
style: TextStyle(
fontSize:
theme.textTheme.labelSmall!.fontSize,
color: theme.colorScheme.outline),
),
],
),
),
),
],
)
: _favDetailController.mid != 0
? Builder(
builder: (context) {
bool isFav =
_favDetailController.item.value.favState == 1;
return IconButton(
onPressed: () => _favDetailController.onFav(isFav),
icon: isFav
? const Icon(Icons.favorite)
: const Icon(Icons.favorite_border),
);
},
)
: const SizedBox.shrink(),
),
const SizedBox(width: 12),
];
List<Widget> _selectActions(ThemeData theme) => [
TextButton(
style: TextButton.styleFrom(
visualDensity: VisualDensity.compact,
),
onPressed: () => _favDetailController.handleSelect(true),
child: const Text('全选'),
),
TextButton(
style: TextButton.styleFrom(
visualDensity: VisualDensity.compact,
),
onPressed: () =>
RequestUtils.onCopyOrMove<FavDetailData, FavDetailItemModel>(
context: context,
isCopy: true,
ctr: _favDetailController,
mediaId: _favDetailController.mediaId,
mid: _favDetailController.mid,
),
child: Text(
'复制',
style: TextStyle(
color: theme.colorScheme.onSurfaceVariant,
),
),
),
TextButton(
style: TextButton.styleFrom(
visualDensity: VisualDensity.compact,
),
onPressed: () =>
RequestUtils.onCopyOrMove<FavDetailData, FavDetailItemModel>(
context: context,
isCopy: false,
ctr: _favDetailController,
mediaId: _favDetailController.mediaId,
mid: _favDetailController.mid,
),
child: Text(
'移动',
style: TextStyle(
color: theme.colorScheme.onSurfaceVariant,
),
),
),
TextButton(
style: TextButton.styleFrom(
visualDensity: VisualDensity.compact,
),
onPressed: () => _favDetailController.onDelChecked(context),
child: Text(
'删除',
style: TextStyle(color: theme.colorScheme.error),
),
),
const SizedBox(width: 12),
];
Widget _flexibleSpace(ThemeData theme) {
final style = TextStyle(
fontSize: 12.5,
color: theme.colorScheme.outline,
);
final item = _favDetailController.item.value;
return FlexibleSpaceBar(
background: Padding(
padding: EdgeInsets.only(
top: kToolbarHeight + MediaQuery.of(context).padding.top + 10,
left: 14,
right: 20,
bottom: 10,
),
child: SizedBox(
height: 110,
child: Obx(
() => Row(
spacing: 12,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Hero(
tag: _favDetailController.heroTag,
child: NetworkImgLayer(
width: 176,
height: 110,
src: item.cover,
),
],
),
),
if (item.title != null)
Expanded(
child: Column(
spacing: 4,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
item.title!,
style: TextStyle(
fontSize: theme.textTheme.titleMedium!.fontSize,
fontWeight: FontWeight.bold,
),
),
GestureDetector(
onTap: () =>
Get.toNamed('/member?mid=${item.upper!.mid}'),
child: Text(
item.upper!.name!,
style: TextStyle(
color: theme.colorScheme.primary,
),
),
),
if (item.intro?.isNotEmpty == true)
Text(
item.intro!,
style: style,
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
if (item.attr != null) ...[
Expanded(
child: Align(
alignment: Alignment.bottomLeft,
child: Text(
'${item.mediaCount}条视频 · ${Utils.isPublicFavText(item.attr ?? 0)}',
textAlign: TextAlign.end,
style: style,
),
),
),
],
],
),
)
else
SizedBox.shrink(
key: ValueKey(_favDetailController.item.value),
)
],
),
),
),
@@ -347,7 +374,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
}
Widget _buildBody(
ThemeData theme, LoadingState<List<FavDetailItemData>?> loadingState) {
ThemeData theme, LoadingState<List<FavDetailItemModel>?> loadingState) {
return switch (loadingState) {
Loading() => SliverGrid(
gridDelegate: Grid.videoCardHDelegate(context),
@@ -377,7 +404,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
),
);
}
FavDetailItemData item = response[index];
FavDetailItemModel item = response[index];
return Stack(
clipBehavior: Clip.none,
children: [
@@ -392,7 +419,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
)
: null,
onViewFav: () => PageUtils.toVideoPage(
'bvid=${item.bvid}&cid=${item.cid}',
'bvid=${item.bvid}&cid=${item.ugc?.firstCid}',
arguments: {
'videoItem': item,
'heroTag': Utils.makeHeroTag(item.bvid),

View File

@@ -5,7 +5,7 @@ import 'package:PiliPlus/common/widgets/image/image_save.dart';
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
import 'package:PiliPlus/common/widgets/stat/stat.dart';
import 'package:PiliPlus/models/common/badge_type.dart';
import 'package:PiliPlus/models/user/fav_detail.dart';
import 'package:PiliPlus/models_new/fav/fav_detail/media.dart';
import 'package:PiliPlus/utils/page_utils.dart';
import 'package:PiliPlus/utils/utils.dart';
import 'package:flutter/material.dart';
@@ -13,7 +13,7 @@ import 'package:get/get.dart';
// 收藏视频卡片 - 水平布局
class FavVideoCardH extends StatelessWidget {
final FavDetailItemData videoItem;
final FavDetailItemModel videoItem;
final GestureTapCallback? onTap;
final GestureLongPressCallback? onLongPress;
final VoidCallback? onDelFav;
@@ -38,15 +38,15 @@ class FavVideoCardH extends StatelessWidget {
: onTap ??
() {
if (!const [0, 16].contains(videoItem.attr)) {
Get.toNamed('/member?mid=${videoItem.owner.mid}');
Get.toNamed('/member?mid=${videoItem.upper?.mid}');
return;
}
// pgc
if (videoItem.type == 24) {
PageUtils.viewBangumi(
PageUtils.viewPgc(
seasonId: videoItem.ogv!.seasonId,
epId: videoItem.epId,
epId: videoItem.id,
);
return;
}
@@ -58,7 +58,7 @@ class FavVideoCardH extends StatelessWidget {
: onLongPress ??
() => imageSaveDialog(
title: videoItem.title,
cover: videoItem.pic,
cover: videoItem.cover,
),
child: Padding(
padding: const EdgeInsets.symmetric(
@@ -79,7 +79,7 @@ class FavVideoCardH extends StatelessWidget {
clipBehavior: Clip.none,
children: [
NetworkImgLayer(
src: videoItem.pic,
src: videoItem.cover,
width: maxWidth,
height: maxHeight,
),
@@ -109,7 +109,7 @@ class FavVideoCardH extends StatelessWidget {
);
}
Widget videoContent(context) {
Widget videoContent(BuildContext context) {
final theme = Theme.of(context);
return Expanded(
child: Stack(
@@ -120,7 +120,7 @@ class FavVideoCardH extends StatelessWidget {
children: [
Expanded(
child: Text(
videoItem.title,
videoItem.title!,
textAlign: TextAlign.start,
style: const TextStyle(
letterSpacing: 0.3,
@@ -130,7 +130,7 @@ class FavVideoCardH extends StatelessWidget {
),
),
Text(
'${Utils.dateFormat(videoItem.favTime)} ${videoItem.owner.name}',
'${Utils.dateFormat(videoItem.favTime)} ${videoItem.upper?.name}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
@@ -145,13 +145,13 @@ class FavVideoCardH extends StatelessWidget {
StatView(
context: context,
theme: 'gray',
value: videoItem.stat.viewStr,
value: Utils.numFormat(videoItem.cntInfo?.play),
),
const SizedBox(width: 8),
StatDanMu(
context: context,
theme: 'gray',
value: videoItem.stat.danmuStr,
value: Utils.numFormat(videoItem.cntInfo?.danmaku),
),
const Spacer(),
],