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

feat: 补充根评论结构；增加跳转至评论详情页；

Browse Source
This commit is contained in:
orz12
2024-08-25 13:51:40 +08:00
parent 5f43846d0c
commit 8c60bef982
4 changed files with 209 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/models/video/reply/data.dart
View File

@@ -44,6 +44,7 @@ class ReplyReplyData {
this.replies, this.replies,
this.topReplies, this.topReplies,
this.upper, this.upper,
this.root,
}); });
ReplyPage? page; ReplyPage? page;
@@ -51,6 +52,7 @@ class ReplyReplyData {
late List<ReplyItemModel>? replies; late List<ReplyItemModel>? replies;
late List<ReplyItemModel>? topReplies; late List<ReplyItemModel>? topReplies;
ReplyUpper? upper; ReplyUpper? upper;
ReplyItemModel? root;
ReplyReplyData.fromJson(Map<String, dynamic> json) { ReplyReplyData.fromJson(Map<String, dynamic> json) {
page = ReplyPage.fromJson(json['page']); page = ReplyPage.fromJson(json['page']);
@@ -67,5 +69,6 @@ class ReplyReplyData {
isTopStatus: true))) isTopStatus: true)))
: <ReplyItemModel>[]; : <ReplyItemModel>[];
upper = ReplyUpper.fromJson(json['upper']); upper = ReplyUpper.fromJson(json['upper']);
root = ReplyItemModel.fromJson(json['root'], json['upper']['mid']);
} }
} }

4
lib/pages/video/detail/reply_reply/controller.dart
View File

@@ -11,7 +11,7 @@ class VideoReplyReplyController extends GetxController {
int? aid; int? aid;
// rpid 请求楼中楼回复 // rpid 请求楼中楼回复
String? rpid; String? rpid;
ReplyType replyType = ReplyType.video; ReplyType replyType; // = ReplyType.video;
RxList<ReplyItemModel> replyList = <ReplyItemModel>[].obs; RxList<ReplyItemModel> replyList = <ReplyItemModel>[].obs;
// 当前页 // 当前页
int currentPage = 0; int currentPage = 0;
@@ -19,6 +19,7 @@ class VideoReplyReplyController extends GetxController {
RxString noMore = ''.obs; RxString noMore = ''.obs;
// 当前回复的回复 // 当前回复的回复
ReplyItemModel? currentReplyItem; ReplyItemModel? currentReplyItem;
ReplyItemModel? root;
@override @override
void onInit() { void onInit() {
@@ -41,6 +42,7 @@ class VideoReplyReplyController extends GetxController {
type: replyType.index, type: replyType.index,
); );
if (res['status']) { if (res['status']) {
if (res['data'].root != null) root = res['data'].root;
final List<ReplyItemModel> replies = res['data'].replies; final List<ReplyItemModel> replies = res['data'].replies;
if (replies.isNotEmpty) { if (replies.isNotEmpty) {
noMore.value = '加载中...'; noMore.value = '加载中...';

130
lib/pages/video/detail/reply_reply/view.dart
View File

@@ -73,7 +73,8 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
height: widget.source == 'videoDetail' ? Utils.getSheetHeight(context) : null, height:
widget.source == 'videoDetail' ? Utils.getSheetHeight(context) : null,
color: Theme.of(context).colorScheme.background, color: Theme.of(context).colorScheme.background,
child: Column( child: Column(
children: [ children: [
@@ -137,60 +138,91 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
FutureBuilder( FutureBuilder(
future: _futureBuilderFuture, future: _futureBuilderFuture,
builder: (BuildContext context, snapshot) { builder: (BuildContext context, snapshot) {
if (snapshot.connectionState == ConnectionState.done) { if (snapshot.connectionState == ConnectionState.done &&
snapshot.hasData) {
final Map data = snapshot.data as Map; final Map data = snapshot.data as Map;
if (data['status']) { if (data['status']) {
// 请求成功 // 请求成功
return Obx( return SliverMainAxisGroup(
() => SliverList( slivers: <Widget>[
delegate: SliverChildBuilderDelegate( if (widget.firstFloor == null &&
(BuildContext context, int index) { _videoReplyReplyController.root != null) ...[
if (index == SliverToBoxAdapter(
_videoReplyReplyController child: ReplyItem(
.replyList.length) { replyItem: _videoReplyReplyController.root,
return Container( replyLevel: '2',
padding: EdgeInsets.only( showReplyRow: false,
bottom: MediaQuery.of(context) addReply: (replyItem) {
.padding _videoReplyReplyController.replyList
.bottom), .add(replyItem);
height: MediaQuery.of(context) },
.padding replyType: widget.replyType,
.bottom + replyReply: (replyItem) =>
100, replyReply(replyItem),
child: Center( ),
child: Obx( ),
() => Text( SliverToBoxAdapter(
_videoReplyReplyController child: Divider(
.noMore.value, height: 20,
style: TextStyle( color: Theme.of(context)
fontSize: 12, .dividerColor
color: Theme.of(context) .withOpacity(0.1),
.colorScheme thickness: 6,
.outline, ),
),
],
Obx(
() => SliverList(
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
if (index ==
_videoReplyReplyController
.replyList.length) {
return Container(
padding: EdgeInsets.only(
bottom: MediaQuery.of(context)
.padding
.bottom),
height: MediaQuery.of(context)
.padding
.bottom +
100,
child: Center(
child: Obx(
() => Text(
_videoReplyReplyController
.noMore.value,
style: TextStyle(
fontSize: 12,
color: Theme.of(context)
.colorScheme
.outline,
),
),
), ),
), ),
), );
), } else {
); return ReplyItem(
} else { replyItem: _videoReplyReplyController
return ReplyItem( .replyList[index],
replyItem: _videoReplyReplyController replyLevel: '2',
.replyList[index], showReplyRow: false,
replyLevel: '2', addReply: (replyItem) {
showReplyRow: false, _videoReplyReplyController.replyList
addReply: (replyItem) { .add(replyItem);
_videoReplyReplyController.replyList },
.add(replyItem); replyType: widget.replyType,
}, );
replyType: widget.replyType, }
); },
} childCount: _videoReplyReplyController
}, .replyList.length +
childCount: _videoReplyReplyController 1,
.replyList.length + ),
1, ),
), ),
), ],
); );
} else { } else {
// 请求错误 // 请求错误

131
lib/utils/app_scheme.dart
View File

@@ -1,11 +1,15 @@
import 'dart:async'; import 'dart:async';
import 'package:PiliPalaX/models/common/reply_type.dart';
import 'package:PiliPalaX/pages/video/detail/reply/widgets/reply_item.dart';
import 'package:app_links/app_links.dart'; import 'package:app_links/app_links.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:path/path.dart';
import '../http/search.dart'; import '../http/search.dart';
import '../models/common/search_type.dart'; import '../models/common/search_type.dart';
import '../pages/video/detail/reply_reply/view.dart';
import 'id_utils.dart'; import 'id_utils.dart';
import 'url_utils.dart'; import 'url_utils.dart';
import 'utils.dart'; import 'utils.dart';
@@ -30,6 +34,7 @@ class PiliScheme {
final String path = value.path; final String path = value.path;
if (scheme == 'bilibili') { if (scheme == 'bilibili') {
print(value);
if (host == 'root') { if (host == 'root') {
Navigator.popUntil( Navigator.popUntil(
Get.context!, (Route<dynamic> route) => route.isFirst); Get.context!, (Route<dynamic> route) => route.isFirst);
@@ -41,6 +46,38 @@ class PiliScheme {
); );
} else if (host == 'video') { } else if (host == 'video') {
String pathQuery = path.split('/').last; String pathQuery = path.split('/').last;
if (value.queryParameters['comment_root_id'] != null) {
Get.to(
() => Scaffold(
appBar: AppBar(
titleSpacing: 0,
centerTitle: false,
title: Text(
'评论详情',
// style: Theme.of(context).textTheme.titleMedium,
),
actions: [
IconButton(
tooltip: '前往原视频',
onPressed: () {
String? enterUri = value.toString().split('?').first;
routePush(Uri.parse(enterUri));
},
icon: const Icon(Icons.open_in_new),
),
],
),
body: VideoReplyReplyPanel(
oid: int.tryParse(pathQuery),
rpid: int.tryParse(value.queryParameters['comment_root_id']!),
source: 'routePush',
replyType: ReplyType.video,
firstFloor: null,
),
),
);
return;
}
final numericRegex = RegExp(r'^[0-9]+$'); final numericRegex = RegExp(r'^[0-9]+$');
if (numericRegex.hasMatch(pathQuery)) { if (numericRegex.hasMatch(pathQuery)) {
pathQuery = 'AV$pathQuery'; pathQuery = 'AV$pathQuery';
@@ -87,16 +124,92 @@ class PiliScheme {
'dynamicType': 'read' 'dynamicType': 'read'
}, },
); );
} else if (host == 'following' && path.startsWith("/detail/")) { } else if (host == 'comment' && path.startsWith("/detail/")) {
var opusId = path.split('/').last; //bilibili://comment/detail/17/832703053858603029/238686570016/?subType=0&anchor=238686628816&showEnter=1&extraIntentId=0&scene=1&enterName=%E6%9F%A5%E7%9C%8B%E5%8A%A8%E6%80%81%E8%AF%A6%E6%83%85&enterUri=bilibili://following/detail/832703053858603029
Get.toNamed( //fmt.Sprintf("bilibili://comment/detail/%d/%d/%d/?subType=%d&anchor=%d&showEnter=1&extraIntentId=%d", rp.Type, rp.Oid, rootID, subType, rp.RpID, extraIntentID)
'/webview', print(value.queryParameters);
parameters: { List<String> pathParts = path.split('/');
'url': 'https://www.bilibili.com/opus/$opusId', int type = int.parse(pathParts[2]);
'type': 'url', int oid = int.parse(pathParts[3]);
'pageTitle': '', int rootId = int.parse(pathParts[4]);
}, int subType = int.parse(value.queryParameters['subType'] ?? '0');
int RpID = int.parse(value.queryParameters['anchor'] ?? '0');
int extraIntentId =
int.parse(value.queryParameters['extraIntentId'] ?? '0');
Get.to(
() => Scaffold(
appBar: AppBar(
titleSpacing: 0,
centerTitle: false,
title: Text(
'评论详情',
// style: Theme.of(context).textTheme.titleMedium,
),
actions: [
IconButton(
tooltip: '前往',
onPressed: () {
String? enterUri = value.queryParameters['enterUri'];
if (enterUri != null) {
routePush(Uri.parse(enterUri));
}
},
icon: const Icon(Icons.open_in_new),
),
],
),
body: VideoReplyReplyPanel(
oid: oid,
rpid: RpID,
source: 'routePush',
replyType: ReplyType.dynamics,
firstFloor: null),
),
); );
} else if (host == 'following' && path.startsWith("/detail/")) {
void getToOpusWeb() {
var opusId = path.split('/').last;
Get.toNamed(
'/webview',
parameters: {
'url': 'https://m.bilibili.com/dynamic/$opusId',
'type': 'url',
'pageTitle': '',
},
);
}
if (value.queryParameters['comment_root_id'] != null) {
Get.to(
() => Scaffold(
appBar: AppBar(
titleSpacing: 0,
centerTitle: false,
title: Text(
'评论详情',
// style: Theme.of(context).textTheme.titleMedium,
),
actions: [
IconButton(
tooltip: '前往',
onPressed: () {
getToOpusWeb();
},
icon: const Icon(Icons.open_in_new),
),
],
),
body: VideoReplyReplyPanel(
oid: int.tryParse(path.split('/').last),
rpid: int.tryParse(value.queryParameters['comment_root_id']!),
source: 'routePush',
replyType: ReplyType.dynamics,
firstFloor: null),
),
);
} else {
getToOpusWeb();
}
} else { } else {
print(value); print(value);
SmartDialog.showToast('未知路径:$value，请截图反馈给开发者'); SmartDialog.showToast('未知路径:$value，请截图反馈给开发者');