Merge branch 'feature-opusRender'
This commit is contained in:
@ -157,7 +157,7 @@ class _OpusPageState extends State<OpusPage> {
|
||||
Container(
|
||||
alignment: TextHelper.getAlignment(paragraph.align),
|
||||
margin: const EdgeInsets.only(bottom: 10),
|
||||
child: Text.rich(
|
||||
child: SelectableText.rich(
|
||||
TextSpan(
|
||||
children: paragraph.text?.nodes?.map((node) {
|
||||
return TextHelper.buildTextSpan(
|
||||
|
@ -20,7 +20,7 @@ class ReadPageController extends GetxController {
|
||||
super.onInit();
|
||||
title.value = Get.parameters['title'] ?? '';
|
||||
id = Get.parameters['id']!;
|
||||
articleType = Get.parameters['articleType']!;
|
||||
articleType = Get.parameters['articleType'] ?? 'read';
|
||||
url = 'https://www.bilibili.com/read/cv$id';
|
||||
scrollController.addListener(_scrollListener);
|
||||
fetchViewInfo();
|
||||
|
@ -126,7 +126,6 @@ class _ReadPageState extends State<ReadPage> {
|
||||
Widget _buildContent(ReadDataModel cvData) {
|
||||
final List<String> picList = _extractPicList(cvData);
|
||||
final List<String> imgList = extractDataSrc(cvData.readInfo!.content!);
|
||||
|
||||
return Padding(
|
||||
padding: EdgeInsets.fromLTRB(
|
||||
16, 0, 16, MediaQuery.of(context).padding.bottom + 40),
|
||||
@ -163,9 +162,11 @@ class _ReadPageState extends State<ReadPage> {
|
||||
padding: const EdgeInsets.only(bottom: 20),
|
||||
child: _buildAuthorWidget(cvData),
|
||||
),
|
||||
HtmlRender(
|
||||
htmlContent: cvData.readInfo!.content!,
|
||||
imgList: imgList,
|
||||
SelectionArea(
|
||||
child: HtmlRender(
|
||||
htmlContent: cvData.readInfo!.content!,
|
||||
imgList: imgList,
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
@ -206,7 +207,7 @@ class _ReadPageState extends State<ReadPage> {
|
||||
return Container(
|
||||
alignment: TextHelper.getAlignment(paragraph.align),
|
||||
margin: const EdgeInsets.only(bottom: 10),
|
||||
child: Text.rich(
|
||||
child: SelectableText.rich(
|
||||
TextSpan(
|
||||
children: paragraph.text?.nodes?.map((node) {
|
||||
return TextHelper.buildTextSpan(node, paragraph.align, context);
|
||||
|
@ -703,14 +703,11 @@ InlineSpan buildContent(
|
||||
'',
|
||||
);
|
||||
} else if (RegExp(r'^cv\d+$').hasMatch(matchStr)) {
|
||||
Get.toNamed(
|
||||
'/webview',
|
||||
parameters: {
|
||||
'url': 'https://www.bilibili.com/read/$matchStr',
|
||||
'type': 'url',
|
||||
'pageTitle': title
|
||||
},
|
||||
);
|
||||
Get.toNamed('/read', parameters: {
|
||||
'title': title,
|
||||
'id': Utils.matchNum(matchStr).first.toString(),
|
||||
'articleType': 'read',
|
||||
});
|
||||
} else {
|
||||
Uri uri = Uri.parse(matchStr.replaceAll('/?', '?'));
|
||||
SchemeEntity scheme = SchemeEntity(
|
||||
|
Reference in New Issue
Block a user