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

opt: handle url

Browse Source 
Closes #143

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-01-12 09:27:36 +08:00
parent 0817b183a4
commit e645274609
4 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/pages/video/detail/reply/widgets/reply_item.dart
View File

@@ -777,7 +777,6 @@ class ReplyItem extends StatelessWidget {
if (matchStr.startsWith('BV')) {
UrlUtils.matchUrlPush(
matchStr,
title,
'',
);
} else if (RegExp(r'^[Cc][Vv][0-9]+$')
@@ -834,7 +833,6 @@ class ReplyItem extends StatelessWidget {
if (lastPathSegment.startsWith('BV')) {
UrlUtils.matchUrlPush(
lastPathSegment,
title,
redirectUrl,
);
} else {
@@ -876,7 +874,26 @@ class ReplyItem extends StatelessWidget {
color: Theme.of(context).colorScheme.primary,
),
recognizer: TapGestureRecognizer()
..onTap = () => Utils.handleWebview(matchStr),
..onTap = () async {
if (matchStr.startsWith('https://b23.tv')) {
final String redirectUrl =
(await UrlUtils.parseRedirectUrl(matchStr)) ??
matchStr;
final String pathSegment = Uri.parse(redirectUrl).path;
final String lastPathSegment =
pathSegment.split('/').last;
if (lastPathSegment.startsWith('BV')) {
UrlUtils.matchUrlPush(
lastPathSegment,
redirectUrl,
);
} else {
PiliScheme.routePush(Uri.parse(matchStr));
}
} else {
PiliScheme.routePush(Uri.parse(matchStr));
}
},
),
);
} else {

23
lib/pages/video/detail/reply/widgets/reply_item_grpc.dart
View File

@@ -809,7 +809,6 @@ class ReplyItemGrpc extends StatelessWidget {
if (matchStr.startsWith('BV')) {
UrlUtils.matchUrlPush(
matchStr,
title,
'',
);
} else if (RegExp(r'^[Cc][Vv][0-9]+$')
@@ -866,7 +865,6 @@ class ReplyItemGrpc extends StatelessWidget {
if (lastPathSegment.startsWith('BV')) {
UrlUtils.matchUrlPush(
lastPathSegment,
title,
redirectUrl,
);
} else {
@@ -908,7 +906,26 @@ class ReplyItemGrpc extends StatelessWidget {
color: Theme.of(context).colorScheme.primary,
),
recognizer: TapGestureRecognizer()
..onTap = () => Utils.handleWebview(matchStr),
..onTap = () async {
if (matchStr.startsWith('https://b23.tv')) {
final String redirectUrl =
(await UrlUtils.parseRedirectUrl(matchStr)) ??
matchStr;
final String pathSegment = Uri.parse(redirectUrl).path;
final String lastPathSegment =
pathSegment.split('/').last;
if (lastPathSegment.startsWith('BV')) {
UrlUtils.matchUrlPush(
lastPathSegment,
redirectUrl,
);
} else {
PiliScheme.routePush(Uri.parse(matchStr));
}
} else {
PiliScheme.routePush(Uri.parse(matchStr));
}
},
),
);
} else {

24
lib/utils/app_scheme.dart
View File

@@ -201,7 +201,7 @@ class PiliScheme {
//Utils.toDupNamed(
// '/webview',
// parameters: {
// 'url': value.dataString ?? "",
// 'url': ,
// 'type': 'url',
// 'pageTitle': ''
// },
@@ -336,24 +336,17 @@ class PiliScheme {
} else if (lastPathSegment.startsWith('BV')) {
UrlUtils.matchUrlPush(
lastPathSegment,
'',
redirectUrl,
);
} else {
Utils.toDupNamed(
'/webview',
parameters: {'url': redirectUrl, 'type': 'url', 'pageTitle': ''},
);
Utils.handleWebview(redirectUrl);
}
return;
}
List<String> pathPart = path.split('/');
if (pathPart.length < 3) {
Utils.toDupNamed(
'/webview',
parameters: {'url': value.toString()},
);
Utils.handleWebview(value.toString());
return;
}
final String area = pathPart[1] == 'mobile' ? pathPart[2] : pathPart[1];
@@ -409,15 +402,8 @@ class PiliScheme {
} else if (res.containsKey('BV')) {
videoPush(null, res['BV'] as String);
} else {
SmartDialog.showToast('未知路径或匹配错误:$value，先采用浏览器打开');
Utils.toDupNamed(
'/webview',
parameters: {
'url': value.toString(),
'type': 'url',
'pageTitle': ''
},
);
// SmartDialog.showToast('未知路径或匹配错误:$value，先采用浏览器打开');
Utils.handleWebview(value.toString());
}
}
}

1
lib/utils/url_utils.dart
View File

@@ -50,7 +50,6 @@ class UrlUtils {
// 匹配url路由跳转
static matchUrlPush(
String pathSegment,
String title,
String redirectUrl,
) async {
final Map matchRes = IdUtils.matchAvorBv(input: pathSegment);