From 173c19d557186fb176f250985e86b7d30f22a17c Mon Sep 17 00:00:00 2001 From: niuhuan Date: Sat, 6 Nov 2021 15:01:25 +0800 Subject: [PATCH] rename image provider --- lib/screens/FilePhotoViewScreen.dart | 2 +- lib/screens/components/ImageReader.dart | 4 +-- lib/screens/components/Images.dart | 46 ++++++++++++------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/screens/FilePhotoViewScreen.dart b/lib/screens/FilePhotoViewScreen.dart index cba240e..d94b202 100644 --- a/lib/screens/FilePhotoViewScreen.dart +++ b/lib/screens/FilePhotoViewScreen.dart @@ -14,7 +14,7 @@ class FilePhotoViewScreen extends StatelessWidget { body: Stack( children: [ PhotoView( - imageProvider: PicaFileImageProvider(filePath), + imageProvider: ResourceFileImageProvider(filePath), ), InkWell( onTap: () => Navigator.of(context).pop(), diff --git a/lib/screens/components/ImageReader.dart b/lib/screens/components/ImageReader.dart index 6df0711..3eaa332 100644 --- a/lib/screens/components/ImageReader.dart +++ b/lib/screens/components/ImageReader.dart @@ -713,7 +713,7 @@ class _GalleryReaderState extends State<_GalleryReader> { if (item.downloadLocalPath != null) { return PhotoViewGalleryPageOptions( imageProvider: - PicaDownloadFileImageProvider(item.downloadLocalPath!), + ResourceDownloadFileImageProvider(item.downloadLocalPath!), errorBuilder: (b, e, s) { print("$e,$s"); return LayoutBuilder( @@ -726,7 +726,7 @@ class _GalleryReaderState extends State<_GalleryReader> { ); } return PhotoViewGalleryPageOptions( - imageProvider: PicaRemoteImageProvider(item.fileServer, item.path), + imageProvider: ResourceRemoteImageProvider(item.fileServer, item.path), errorBuilder: (b, e, s) { print("$e,$s"); return LayoutBuilder( diff --git a/lib/screens/components/Images.dart b/lib/screens/components/Images.dart index 5f3a4a8..dd5559a 100644 --- a/lib/screens/components/Images.dart +++ b/lib/screens/components/Images.dart @@ -7,14 +7,14 @@ import 'dart:io'; import 'dart:ui' as ui show Codec; // 从本地加载图片 -class PicaFileImageProvider extends ImageProvider { +class ResourceFileImageProvider extends ImageProvider { final String path; final double scale; - PicaFileImageProvider(this.path, {this.scale = 1.0}); + ResourceFileImageProvider(this.path, {this.scale = 1.0}); @override - ImageStreamCompleter load(PicaFileImageProvider key, DecoderCallback decode) { + ImageStreamCompleter load(ResourceFileImageProvider key, DecoderCallback decode) { return MultiFrameImageStreamCompleter( codec: _loadAsync(key), scale: key.scale, @@ -22,11 +22,11 @@ class PicaFileImageProvider extends ImageProvider { } @override - Future obtainKey(ImageConfiguration configuration) { - return SynchronousFuture(this); + Future obtainKey(ImageConfiguration configuration) { + return SynchronousFuture(this); } - Future _loadAsync(PicaFileImageProvider key) async { + Future _loadAsync(ResourceFileImageProvider key) async { assert(key == this); return PaintingBinding.instance! .instantiateImageCodec(await File(path).readAsBytes()); @@ -35,7 +35,7 @@ class PicaFileImageProvider extends ImageProvider { @override bool operator ==(dynamic other) { if (other.runtimeType != runtimeType) return false; - final PicaFileImageProvider typedOther = other; + final ResourceFileImageProvider typedOther = other; return path == typedOther.path && scale == typedOther.scale; } @@ -50,16 +50,16 @@ class PicaFileImageProvider extends ImageProvider { } // 从本地加载图片 -class PicaDownloadFileImageProvider - extends ImageProvider { +class ResourceDownloadFileImageProvider + extends ImageProvider { final String path; final double scale; - PicaDownloadFileImageProvider(this.path, {this.scale = 1.0}); + ResourceDownloadFileImageProvider(this.path, {this.scale = 1.0}); @override ImageStreamCompleter load( - PicaDownloadFileImageProvider key, DecoderCallback decode) { + ResourceDownloadFileImageProvider key, DecoderCallback decode) { return MultiFrameImageStreamCompleter( codec: _loadAsync(key), scale: key.scale, @@ -67,12 +67,12 @@ class PicaDownloadFileImageProvider } @override - Future obtainKey( + Future obtainKey( ImageConfiguration configuration) { - return SynchronousFuture(this); + return SynchronousFuture(this); } - Future _loadAsync(PicaDownloadFileImageProvider key) async { + Future _loadAsync(ResourceDownloadFileImageProvider key) async { assert(key == this); return PaintingBinding.instance!.instantiateImageCodec( await File(await method.downloadImagePath(path)).readAsBytes()); @@ -81,7 +81,7 @@ class PicaDownloadFileImageProvider @override bool operator ==(dynamic other) { if (other.runtimeType != runtimeType) return false; - final PicaDownloadFileImageProvider typedOther = other; + final ResourceDownloadFileImageProvider typedOther = other; return path == typedOther.path && scale == typedOther.scale; } @@ -96,16 +96,16 @@ class PicaDownloadFileImageProvider } // 从远端加载图片 暂时未使用 (现在都是先获取路径然后再通过file显示) -class PicaRemoteImageProvider extends ImageProvider { +class ResourceRemoteImageProvider extends ImageProvider { final String fileServer; final String path; final double scale; - PicaRemoteImageProvider(this.fileServer, this.path, {this.scale = 1.0}); + ResourceRemoteImageProvider(this.fileServer, this.path, {this.scale = 1.0}); @override ImageStreamCompleter load( - PicaRemoteImageProvider key, DecoderCallback decode) { + ResourceRemoteImageProvider key, DecoderCallback decode) { return MultiFrameImageStreamCompleter( codec: _loadAsync(key), scale: key.scale, @@ -113,11 +113,11 @@ class PicaRemoteImageProvider extends ImageProvider { } @override - Future obtainKey(ImageConfiguration configuration) { - return SynchronousFuture(this); + Future obtainKey(ImageConfiguration configuration) { + return SynchronousFuture(this); } - Future _loadAsync(PicaRemoteImageProvider key) async { + Future _loadAsync(ResourceRemoteImageProvider key) async { assert(key == this); var downloadTo = await method.remoteImageData(fileServer, path); return PaintingBinding.instance! @@ -127,7 +127,7 @@ class PicaRemoteImageProvider extends ImageProvider { @override bool operator ==(dynamic other) { if (other.runtimeType != runtimeType) return false; - final PicaRemoteImageProvider typedOther = other; + final ResourceRemoteImageProvider typedOther = other; return fileServer == typedOther.fileServer && path == typedOther.path && scale == typedOther.scale; @@ -280,7 +280,7 @@ Widget buildLoading(double? width, double? height) { Widget buildFile(String file, double? width, double? height, {BoxFit fit = BoxFit.cover}) { return Image( - image: PicaFileImageProvider(file), + image: ResourceFileImageProvider(file), width: width, height: height, errorBuilder: (a, b, c) {