diff --git a/lib/pages/dynamics/widgets/rich_node_panel.dart b/lib/pages/dynamics/widgets/rich_node_panel.dart index 5d22c597..65e20b21 100644 --- a/lib/pages/dynamics/widgets/rich_node_panel.dart +++ b/lib/pages/dynamics/widgets/rich_node_panel.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; import 'package:pilipala/models/dynamics/result.dart'; +import 'package:pilipala/pages/preview/index.dart'; // 富文本 InlineSpan richNode(item, context) { @@ -198,11 +199,11 @@ InlineSpan richNode(item, context) { print('有图片'); List pics = item.modules.moduleDynamic.major.opus.pics; int len = pics.length; - List picList = []; + List picList = []; if (len == 1) { OpusPicsModel pictureItem = pics.first; - picList.add(pictureItem.url); + picList.add(pictureItem.url!); spanChilds.add(const TextSpan(text: '\n')); spanChilds.add( WidgetSpan( @@ -210,8 +211,13 @@ InlineSpan richNode(item, context) { builder: (context, BoxConstraints box) { return GestureDetector( onTap: () { - Get.toNamed('/preview', - arguments: {'initialPage': 0, 'imgList': picList}); + showDialog( + useSafeArea: false, + context: context, + builder: (context) { + return ImagePreview(initialPage: 0, imgList: picList); + }, + ); }, child: Padding( padding: const EdgeInsets.only(top: 4), @@ -233,14 +239,19 @@ InlineSpan richNode(item, context) { if (len > 1) { List list = []; for (var i = 0; i < len; i++) { - picList.add(pics[i].url); + picList.add(pics[i].url!); list.add( LayoutBuilder( builder: (context, BoxConstraints box) { return GestureDetector( onTap: () { - Get.toNamed('/preview', - arguments: {'initialPage': i, 'imgList': picList}); + showDialog( + useSafeArea: false, + context: context, + builder: (context) { + return ImagePreview(initialPage: i, imgList: picList); + }, + ); }, child: NetworkImgLayer( src: pics[i].url, diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart index 03088ca4..fd6db614 100644 --- a/lib/router/app_pages.dart +++ b/lib/router/app_pages.dart @@ -48,13 +48,13 @@ class Routes { // 视频详情 CustomGetPage(name: '/video', page: () => const VideoDetailPage()), // 图片预览 - GetPage( - name: '/preview', - page: () => const ImagePreview(), - transition: Transition.fade, - transitionDuration: const Duration(milliseconds: 300), - showCupertinoParallax: false, - ), + // GetPage( + // name: '/preview', + // page: () => const ImagePreview(), + // transition: Transition.fade, + // transitionDuration: const Duration(milliseconds: 300), + // showCupertinoParallax: false, + // ), // CustomGetPage(name: '/webview', page: () => const WebviewPage()), // 设置