mirrors/pilipala
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature-opusRender'

Browse Source
This commit is contained in:
guozhigq
2024-10-07 22:54:03 +08:00
parent ee1b3049cb a366f5d3ce
commit c92ef36504
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ class _OpusPageState extends State<OpusPage> {
Container( Container(
alignment: TextHelper.getAlignment(paragraph.align), alignment: TextHelper.getAlignment(paragraph.align),
margin: const EdgeInsets.only(bottom: 10), margin: const EdgeInsets.only(bottom: 10),
child: Text.rich( child: SelectableText.rich(
TextSpan( TextSpan(
children: paragraph.text?.nodes?.map((node) { children: paragraph.text?.nodes?.map((node) {
return TextHelper.buildTextSpan( return TextHelper.buildTextSpan(

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

@ -20,7 +20,7 @@ class ReadPageController extends GetxController {
super.onInit(); super.onInit();
title.value = Get.parameters['title'] ?? ''; title.value = Get.parameters['title'] ?? '';
id = Get.parameters['id']!; id = Get.parameters['id']!;
articleType = Get.parameters['articleType']!; articleType = Get.parameters['articleType'] ?? 'read';
url = 'https://www.bilibili.com/read/cv$id'; url = 'https://www.bilibili.com/read/cv$id';
scrollController.addListener(_scrollListener); scrollController.addListener(_scrollListener);
fetchViewInfo(); fetchViewInfo();

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

@ -126,7 +126,6 @@ class _ReadPageState extends State<ReadPage> {
Widget _buildContent(ReadDataModel cvData) { Widget _buildContent(ReadDataModel cvData) {
final List<String> picList = _extractPicList(cvData); final List<String> picList = _extractPicList(cvData);
final List<String> imgList = extractDataSrc(cvData.readInfo!.content!); final List<String> imgList = extractDataSrc(cvData.readInfo!.content!);
return Padding( return Padding(
padding: EdgeInsets.fromLTRB( padding: EdgeInsets.fromLTRB(
16, 0, 16, MediaQuery.of(context).padding.bottom + 40), 16, 0, 16, MediaQuery.of(context).padding.bottom + 40),
@ -163,9 +162,11 @@ class _ReadPageState extends State<ReadPage> {
padding: const EdgeInsets.only(bottom: 20), padding: const EdgeInsets.only(bottom: 20),
child: _buildAuthorWidget(cvData), child: _buildAuthorWidget(cvData),
), ),
HtmlRender( SelectionArea(
htmlContent: cvData.readInfo!.content!, child: HtmlRender(
imgList: imgList, htmlContent: cvData.readInfo!.content!,
imgList: imgList,
),
), ),
], ],
); );
@ -206,7 +207,7 @@ class _ReadPageState extends State<ReadPage> {
return Container( return Container(
alignment: TextHelper.getAlignment(paragraph.align), alignment: TextHelper.getAlignment(paragraph.align),
margin: const EdgeInsets.only(bottom: 10), margin: const EdgeInsets.only(bottom: 10),
child: Text.rich( child: SelectableText.rich(
TextSpan( TextSpan(
children: paragraph.text?.nodes?.map((node) { children: paragraph.text?.nodes?.map((node) {
return TextHelper.buildTextSpan(node, paragraph.align, context); return TextHelper.buildTextSpan(node, paragraph.align, context);

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

@ -703,14 +703,11 @@ InlineSpan buildContent(
'', '',
); );
} else if (RegExp(r'^cv\d+$').hasMatch(matchStr)) { } else if (RegExp(r'^cv\d+$').hasMatch(matchStr)) {
Get.toNamed( Get.toNamed('/read', parameters: {
'/webview', 'title': title,
parameters: { 'id': Utils.matchNum(matchStr).first.toString(),
'url': 'https://www.bilibili.com/read/$matchStr', 'articleType': 'read',
'type': 'url', });
'pageTitle': title
},
);
} else { } else {
Uri uri = Uri.parse(matchStr.replaceAll('/?', '?')); Uri uri = Uri.parse(matchStr.replaceAll('/?', '?'));
SchemeEntity scheme = SchemeEntity( SchemeEntity scheme = SchemeEntity(