HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-17 23:56:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt view fav

Browse Source 
Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-05-31 14:47:36 +08:00
parent 3364b52e33
commit 1462e6ecf1
18 changed files with 219 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/common/widgets/video_card/video_card_h.dart
View File

@@ -97,8 +97,9 @@ class VideoCardH extends StatelessWidget {
}
}
try {
final int cid = videoItem.cid ??
final int? cid = videoItem.cid ??
await SearchHttp.ab2c(aid: aid, bvid: bvid);
if (cid != null) {
if (source == 'later') {
onViewLater!(cid);
} else {
@@ -110,6 +111,7 @@ class VideoCardH extends StatelessWidget {
},
);
}
}
} catch (err) {
SmartDialog.showToast(err.toString());
}

27
lib/http/search.dart
View File

@@ -159,22 +159,25 @@ class SearchHttp {
}
}
static Future<int> ab2c({dynamic aid, dynamic bvid, int? part}) async {
Map<String, dynamic> data = {};
if (aid != null) {
data['aid'] = aid;
} else if (bvid != null) {
data['bvid'] = bvid;
}
var res = await Request().get(Api.ab2c, queryParameters: data);
static Future<int?> ab2c({dynamic aid, dynamic bvid, int? part}) async {
var res = await Request().get(
Api.ab2c,
queryParameters: {
if (aid != null) 'aid': aid,
if (bvid != null) 'bvid': bvid,
},
);
if (res.data['code'] == 0) {
if (res.data['data'] case List list) {
return part != null
? ((res.data['data'] as List).getOrNull(part - 1)?['cid'] ??
res.data['data'].first['cid'])
: res.data['data'].first['cid'];
? (list.getOrNull(part - 1)?['cid'] ?? list.firstOrNull?['cid'])
: list.firstOrNull?['cid'];
} else {
return null;
}
} else {
SmartDialog.showToast("ab2c error: ${res.data['message']}");
return -1;
return null;
}
}

4
lib/models/user/fav_detail.dart
View File

@@ -59,8 +59,8 @@ class FavDetailItemData extends BaseVideoItemModel with MultiSelectData {
}
}
static final _digitRegExp = RegExp(r'\d+');
String resolveEpId(String url) => _digitRegExp.firstMatch(url)!.group(0)!;
static final _digitRegExp = RegExp(r'ep(\d+)');
String? resolveEpId(String url) => _digitRegExp.firstMatch(url)?.group(1);
}
class Ogv {

4
lib/pages/dynamics/widgets/rich_node_panel.dart
View File

@@ -218,13 +218,15 @@ TextSpan? richNode(
recognizer: TapGestureRecognizer()
..onTap = () async {
try {
int cid = await SearchHttp.ab2c(bvid: i.rid);
int? cid = await SearchHttp.ab2c(bvid: i.rid);
if (cid != null) {
PageUtils.toVideoPage(
'bvid=${i.rid}&cid=$cid',
arguments: {
'heroTag': Utils.makeHeroTag(i.rid),
},
);
}
} catch (err) {
SmartDialog.showToast(err.toString());
}

2
lib/pages/episode_panel/view.dart
View File

@@ -546,7 +546,7 @@ class _EpisodePanelState extends CommonSlidePageState<EpisodePanel> {
? Icons.notifications_off_outlined
: Icons.notifications_active_outlined,
onPressed: () async {
dynamic result = await VideoHttp.seasonFav(
var result = await VideoHttp.seasonFav(
isFav: response,
seasonId: widget.seasonId,
);

31
lib/pages/fav_detail/widget/fav_video_card.dart
View File

@@ -4,15 +4,11 @@ import 'package:PiliPlus/common/widgets/button/icon_button.dart';
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/http/search.dart';
import 'package:PiliPlus/http/video.dart';
import 'package:PiliPlus/models/common/badge_type.dart';
import 'package:PiliPlus/models/user/fav_detail.dart';
import 'package:PiliPlus/utils/id_utils.dart';
import 'package:PiliPlus/utils/page_utils.dart';
import 'package:PiliPlus/utils/utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
// 收藏视频卡片 - 水平布局
@@ -36,8 +32,6 @@ class FavVideoCardH extends StatelessWidget {
@override
Widget build(BuildContext context) {
int id = videoItem.id!;
String bvid = videoItem.bvid ?? IdUtils.av2bv(id);
return InkWell(
onTap: isSort == true
? null
@@ -46,26 +40,21 @@ class FavVideoCardH extends StatelessWidget {
onTap!();
return;
}
String? epId;
if (videoItem.type == 24) {
videoItem.cid = await SearchHttp.ab2c(bvid: bvid);
dynamic seasonId = videoItem.ogv!.seasonId;
epId = videoItem.epId;
PageUtils.viewBangumi(seasonId: seasonId, epId: epId);
return;
} else if (videoItem.page == 0 || videoItem.page! > 1) {
var result = await VideoHttp.videoIntro(bvid: bvid);
if (result['status']) {
epId = result['data'].epId;
} else {
SmartDialog.showToast(result['msg']);
}
}
if (!const [0, 16].contains(videoItem.attr)) {
Get.toNamed('/member?mid=${videoItem.owner.mid}');
return;
}
// pgc
if (videoItem.type == 24) {
PageUtils.viewBangumi(
seasonId: videoItem.ogv!.seasonId,
epId: videoItem.epId,
);
return;
}
onViewFav?.call();
},
onLongPress: isSort == true

8
lib/pages/history/widgets/item.dart
View File

@@ -76,8 +76,9 @@ class HistoryItem extends StatelessWidget {
if (epid != null) {
PageUtils.viewBangumi(epId: epid);
} else {
int cid = videoItem.history.cid ??
int? cid = videoItem.history.cid ??
await SearchHttp.ab2c(aid: aid, bvid: bvid);
if (cid != null) {
PageUtils.toVideoPage(
'bvid=$bvid&cid=$cid',
arguments: {
@@ -86,6 +87,7 @@ class HistoryItem extends StatelessWidget {
},
);
}
}
} else {
SmartDialog.showToast(result['msg']);
}
@@ -95,8 +97,9 @@ class HistoryItem extends StatelessWidget {
}
}
} else {
int cid = videoItem.history.cid ??
int? cid = videoItem.history.cid ??
await SearchHttp.ab2c(aid: aid, bvid: bvid);
if (cid != null) {
PageUtils.toVideoPage(
'bvid=$bvid&cid=$cid',
arguments: {
@@ -105,6 +108,7 @@ class HistoryItem extends StatelessWidget {
},
);
}
}
},
onLongPress: () {
if (ctr is MultiSelectController || ctr is HistoryBaseController) {

2
lib/pages/history_search/controller.dart
View File

@@ -30,7 +30,7 @@ class HistorySearchController
loadingState
..value.data!.removeAt(index)
..refresh();
}
SmartDialog.showToast(res['msg']);
}
}
}

11
lib/pages/live_room/view.dart
View File

@@ -346,15 +346,8 @@ class _LiveRoomPageState extends State<LiveRoomPage>
: Row(
children: [
GestureDetector(
onTap: () {
dynamic uid = roomInfoH5.roomInfo?.uid;
Get.toNamed(
'/member?mid=$uid',
arguments: {
'heroTag': Utils.makeHeroTag(uid),
},
);
},
onTap: () => Get.toNamed(
'/member?mid=${roomInfoH5.roomInfo?.uid}'),
child: NetworkImgLayer(
width: 34,
height: 34,

4
lib/pages/member_coin/widgets/item.dart
View File

@@ -34,8 +34,9 @@ class MemberCoinsItem extends StatelessWidget {
}
}
}
int cid =
int? cid =
await SearchHttp.ab2c(aid: coinItem.aid, bvid: coinItem.bvid);
if (cid != null) {
PageUtils.toVideoPage(
'bvid=${coinItem.bvid}&cid=$cid',
arguments: {
@@ -43,6 +44,7 @@ class MemberCoinsItem extends StatelessWidget {
'heroTag': Utils.makeHeroTag(coinItem.aid)
},
);
}
},
onLongPress: () => imageSaveDialog(
title: coinItem.title,

8
lib/pages/member_video/controller.dart
View File

@@ -147,11 +147,12 @@ class MemberVideoCtr
if (list.isNullOrEmpty) return;
if (episodicButton.value.text == '继续播放') {
dynamic oid = RegExp(r'oid=([\d]+)')
String? oid = RegExp(r'oid=(\d+)')
.firstMatch('${episodicButton.value.uri}')
?.group(1);
dynamic bvid = IdUtils.av2bv(int.tryParse(oid) ?? 0);
dynamic cid = await SearchHttp.ab2c(aid: oid, bvid: bvid);
if (oid != null) {
var bvid = IdUtils.av2bv(int.parse(oid));
var cid = await SearchHttp.ab2c(aid: oid, bvid: bvid);
PageUtils.toVideoPage(
'bvid=$bvid&cid=$cid',
arguments: {
@@ -176,6 +177,7 @@ class MemberVideoCtr
'isContinuePlaying': true,
},
);
}
return;
}

4
lib/pages/subscription_detail/widget/sub_video_card.dart
View File

@@ -28,7 +28,8 @@ class SubVideoCardH extends StatelessWidget {
String bvid = videoItem.bvid!;
return InkWell(
onTap: () async {
int cid = await SearchHttp.ab2c(bvid: bvid);
int? cid = await SearchHttp.ab2c(bvid: bvid);
if (cid != null) {
PageUtils.toVideoPage(
'bvid=$bvid&cid=$cid',
arguments: {
@@ -37,6 +38,7 @@ class SubVideoCardH extends StatelessWidget {
'videoType': SearchType.video,
},
);
}
},
onLongPress: () => imageSaveDialog(
title: videoItem.title,

4
lib/pages/video/medialist/view.dart
View File

@@ -164,9 +164,11 @@ class _MediaListPanelState
String bvid = item.bvid!;
int? aid = item.aid;
String cover = item.cover ?? '';
final int cid =
final int? cid =
item.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid);
if (cid != null) {
widget.changeMediaList?.call(bvid, cid, aid, cover);
}
},
onLongPress: () => imageSaveDialog(
title: item.title,

4
lib/pages/video/view.dart
View File

@@ -2160,7 +2160,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
..cid.refresh();
} else {
// switch to first episode
dynamic episode = videoIntroController.videoDetail.value.ugcSeason!
var episode = videoIntroController.videoDetail.value.ugcSeason!
.sections![videoDetailController.seasonIndex.value].episodes!.first;
if (episode.cid != videoDetailController.cid.value) {
changeEpisode(episode);
@@ -2182,7 +2182,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
videoDetailController.cid.refresh();
} else {
// switch to first episode
dynamic episode = videoIntroController.videoDetail.value.pages!.first;
var episode = videoIntroController.videoDetail.value.pages!.first;
if (episode.cid != videoDetailController.cid.value) {
changeEpisode(episode);
} else {

12
lib/pages/whisper_detail/widget/chat_item.dart
View File

@@ -291,8 +291,9 @@ class ChatItem extends StatelessWidget {
String bvid = match.group(0)!;
try {
SmartDialog.showLoading();
final int cid = await SearchHttp.ab2c(bvid: bvid);
final int? cid = await SearchHttp.ab2c(bvid: bvid);
SmartDialog.dismiss();
if (cid != null) {
PageUtils.toVideoPage(
'bvid=$bvid&cid=$cid',
arguments: <String, String?>{
@@ -300,6 +301,7 @@ class ChatItem extends StatelessWidget {
'heroTag': Utils.makeHeroTag(bvid),
},
);
}
} catch (err) {
SmartDialog.dismiss();
SmartDialog.showToast(err.toString());
@@ -378,8 +380,9 @@ class ChatItem extends StatelessWidget {
try {
SmartDialog.showLoading();
var bvid = content["bvid"];
final int cid = await SearchHttp.ab2c(bvid: bvid);
final int? cid = await SearchHttp.ab2c(bvid: bvid);
SmartDialog.dismiss();
if (cid != null) {
PageUtils.toVideoPage(
'bvid=$bvid&cid=$cid',
arguments: {
@@ -387,6 +390,7 @@ class ChatItem extends StatelessWidget {
'heroTag': Utils.makeHeroTag(bvid),
},
);
}
} catch (err) {
SmartDialog.dismiss();
SmartDialog.showToast(err.toString());
@@ -460,8 +464,9 @@ class ChatItem extends StatelessWidget {
}
bvid ??= IdUtils.av2bv(aid);
SmartDialog.showLoading();
final int cid = await SearchHttp.ab2c(bvid: bvid);
final int? cid = await SearchHttp.ab2c(bvid: bvid);
SmartDialog.dismiss();
if (cid != null) {
PageUtils.toVideoPage(
'bvid=$bvid&cid=$cid',
arguments: <String, String?>{
@@ -469,6 +474,7 @@ class ChatItem extends StatelessWidget {
'heroTag': Utils.makeHeroTag(bvid),
},
);
}
};
break;

8
lib/utils/app_scheme.dart
View File

@@ -624,7 +624,8 @@ class PiliScheme {
?.group(1);
if (bvid != null) {
if (mediaId != null) {
final int cid = await SearchHttp.ab2c(bvid: bvid);
final int? cid = await SearchHttp.ab2c(bvid: bvid);
if (cid != null) {
PageUtils.toVideoPage(
'bvid=$bvid&cid=$cid',
arguments: {
@@ -637,6 +638,7 @@ class PiliScheme {
'isContinuePlaying': true,
},
);
}
} else {
videoPush(null, bvid, off: off);
}
@@ -852,7 +854,7 @@ class PiliScheme {
if (showDialog) {
SmartDialog.showLoading<dynamic>(msg: '获取中...');
}
final int cid = await SearchHttp.ab2c(
final int? cid = await SearchHttp.ab2c(
bvid: bvid,
aid: aid,
part: part != null ? int.tryParse(part) : null,
@@ -860,6 +862,7 @@ class PiliScheme {
if (showDialog) {
SmartDialog.dismiss();
}
if (cid != null) {
PageUtils.toVideoPage(
'bvid=$bvid&cid=$cid',
arguments: {
@@ -870,6 +873,7 @@ class PiliScheme {
off: off,
preventDuplicates: false,
);
}
} catch (e) {
SmartDialog.dismiss();
SmartDialog.showToast('video获取失败: $e');

8
lib/utils/page_utils.dart
View File

@@ -393,7 +393,8 @@ class PageUtils {
try {
String bvid = item.modules.moduleDynamic!.major!.archive!.bvid!;
String cover = item.modules.moduleDynamic!.major!.archive!.cover!;
int cid = await SearchHttp.ab2c(bvid: bvid);
int? cid = await SearchHttp.ab2c(bvid: bvid);
if (cid != null) {
toVideoPage(
'bvid=$bvid&cid=$cid',
arguments: {
@@ -402,6 +403,7 @@ class PageUtils {
},
preventDuplicates: false,
);
}
} catch (err) {
SmartDialog.showToast(err.toString());
}
@@ -456,7 +458,8 @@ class PageUtils {
int aid = ugcSeason.aid!;
String bvid = IdUtils.av2bv(aid);
String cover = ugcSeason.cover!;
int cid = await SearchHttp.ab2c(bvid: bvid);
int? cid = await SearchHttp.ab2c(bvid: bvid);
if (cid != null) {
toVideoPage(
'bvid=$bvid&cid=$cid',
arguments: {
@@ -465,6 +468,7 @@ class PageUtils {
},
preventDuplicates: false,
);
}
break;
/// 番剧查看

4
lib/utils/url_utils.dart
View File

@@ -49,7 +49,8 @@ class UrlUtils {
int? aid = matchRes['AV'];
String? bvid = matchRes['BV'];
bvid ??= IdUtils.av2bv(aid!);
final int cid = await SearchHttp.ab2c(aid: aid, bvid: bvid);
final int? cid = await SearchHttp.ab2c(aid: aid, bvid: bvid);
if (cid != null) {
PageUtils.toVideoPage(
'bvid=$bvid&cid=$cid',
arguments: <String, String?>{
@@ -58,6 +59,7 @@ class UrlUtils {
},
preventDuplicates: false,
);
}
} else {
if (redirectUrl.isNotEmpty) {
PageUtils.handleWebview(redirectUrl);