refactor: enhance image caching and loading logic in gallery view

- Introduce a new extension method for generating cache keys for GalleryImage.
- Refactor image fetching logic to use the new method for improved cache management.
- Update logging levels for better debugging visibility during image loading.

Author: 3003h

lib/extension.dart

@@ -686,3 +686,16 @@ extension EhT<T> on T {
     return Optional<T>.fromNullable(this);
   }
 }
+
+extension GalleryImageExt on GalleryImage {
+  String getCacheKey(String url) {
+    final bool isOriginImage = url == originImageUrl;
+    final regExpXres = RegExp(r'xres=(\d+)');
+    final xres = regExpXres.firstMatch(url)?.group(1) ?? '';
+    return '${Uri.encodeComponent(href ?? '')}_${isOriginImage ? 'origin' : xres}';
+  }
+
+  String get cacheKey {
+    return getCacheKey(imageUrl ?? '');
+  }
+}

lib/network/request.dart

@@ -258,7 +258,7 @@ Future<GalleryImage?> fetchImageInfoByApi(
       (sourceId?.isNotEmpty ?? false)) {
     logger.d(
         '使用常规请求，解析html: href $href,showKey $showKey, sourceId $sourceId, isMpv $isMpv, refresh $refresh');
-    final resultImage = await _fetchImageInfo(
+    final resultImage = await fetchImageInfoByHtml(
       href,
       refresh: refresh,
       sourceId: sourceId,
@@ -315,7 +315,7 @@ Future<GalleryImage?> fetchImageInfoByApi(
   return image;
 }
 
-Future<GalleryImage?> _fetchImageInfo(
+Future<GalleryImage?> fetchImageInfoByHtml(
   String href, {
   bool refresh = false,
   String? sourceId,

lib/pages/image_view/common.dart

@@ -65,80 +65,80 @@ class GalleryPara {
     }
 
     for (int add = 1; add < max + 1; add++) {
-      final int _ser = itemSer + add;
+      final int ser = itemSer + add;
 
-      logger.t('开始预载 ser $_ser');
+      logger.t('开始预载 ser $ser');
 
-      if (_processingSerSet.contains(_ser)) {
+      if (_processingSerSet.contains(ser)) {
         continue;
       }
 
-      final GalleryImage? _imageTemp = imageMap[_ser];
-      if (_imageTemp == null) {
+      final GalleryImage? imageTemp = imageMap[ser];
+      if (imageTemp == null) {
         // yield null;
         continue;
       }
 
-      GalleryImage _image = _imageTemp;
+      GalleryImage image = imageTemp;
 
-      if (_image.completeCache ?? false) {
-        logger.t('ser $_ser 已预载完成 跳过');
+      if (image.completeCache ?? false) {
+        logger.t('ser $ser 已预载完成 跳过');
         continue;
       }
 
-      if (_image.startPrecache ?? false) {
-        logger.t('ser $_ser 已开始预载 跳过');
+      if (image.startPrecache ?? false) {
+        logger.t('ser $ser 已开始预载 跳过');
         continue;
       }
 
-      String _url = '';
-      if (_image.imageUrl?.isEmpty ?? true) {
+      String url = '';
+      if (image.imageUrl?.isEmpty ?? true) {
         if (showKey == null) {
-          logger.d('ser $_ser, showKey is null, skip precache');
+          logger.d('ser $ser, showKey is null, skip precache');
           continue;
         }
 
-        _processingSerSet.add(_ser);
-        final String _href = imageMap[_ser]?.href ?? '';
+        _processingSerSet.add(ser);
+        final String href = imageMap[ser]?.href ?? '';
 
         // paraImageLageInfoFromHtml
-        // final GalleryImage? _imageFetch = await fetchImageInfo(_href);
-        final GalleryImage? _imageFetch =
-            await fetchImageInfoByApi(_href, showKey: showKey);
-
-        _url = _imageFetch?.imageUrl ?? '';
-
-        _image = _image.copyWith(
-          imageUrl: _url.oN,
-          imageWidth: _imageFetch?.imageWidth.oN,
-          imageHeight: _imageFetch?.imageHeight.oN,
-          originImageUrl: _imageFetch?.originImageUrl.oN,
-          filename: _imageFetch?.filename.oN,
-          showKey: _imageFetch?.showKey.oN,
+        final GalleryImage? imageFetch = await fetchImageInfoByHtml(href);
+        // final GalleryImage? imageFetch =
+        //     await fetchImageInfoByApi(href, showKey: showKey);
+
+        url = imageFetch?.imageUrl ?? '';
+
+        image = image.copyWith(
+          imageUrl: url.oN,
+          imageWidth: imageFetch?.imageWidth.oN,
+          imageHeight: imageFetch?.imageHeight.oN,
+          originImageUrl: imageFetch?.originImageUrl.oN,
+          filename: imageFetch?.filename.oN,
+          showKey: imageFetch?.showKey.oN,
         );
 
-        _processingSerSet.remove(_ser);
+        _processingSerSet.remove(ser);
       }
 
-      _url = _image.imageUrl ?? '';
+      url = image.imageUrl ?? '';
 
-      if (_url.isEmpty) {
+      if (url.isEmpty) {
         // yield null;
         continue;
       }
 
-      _map.putIfAbsent(_url, () {
-        logger.d('ser $_ser, 开始预载图片 $_url');
-        return _precacheSingleImage(_url, _image);
+      _map.putIfAbsent(url, () {
+        logger.d('ser $ser, 开始预载图片 $url');
+        return _precacheSingleImage(url, image);
       });
 
-      final Future<GalleryImage?>? _future = _map[_url];
+      final Future<GalleryImage?>? futureImage = _map[url];
 
-      if (_future != null) {
-        final GalleryImage? value = await _future;
+      if (futureImage != null) {
+        final GalleryImage? value = await futureImage;
         // logger.d('yield rult ser ${value?.ser}  ${value?.toJson()}');
         yield value?.copyWith(completeCache: true.oN);
-        _map.remove(_url);
+        _map.remove(url);
         continue;
       }
     }
@@ -148,17 +148,20 @@ class GalleryPara {
     String url,
     GalleryImage image,
   ) async {
-    logger.t('_precacheSingleImage, 开始预载图片 $url');
+    final cacheKey = image.getCacheKey(url);
+    logger.d('_precacheSingleImage, 开始预载图片 $url,\ncacheKey: $cacheKey');
     final ImageProvider imageProvider = ExtendedNetworkImageProvider(
       url,
       cache: true,
+      cacheKey: cacheKey,
       retries: 5,
       timeLimit: const Duration(seconds: 5),
     );
 
     /// 预缓存图片
     try {
       await precacheImage(imageProvider, Get.context!);
+      logger.d('预载图片完成 $url');
       return image.copyWith(completeCache: true.oN);
     } catch (e, stack) {
       logger.e('$e /n $stack');

lib/pages/image_view/view/view_image.dart

@@ -497,7 +497,7 @@ class _ViewImageState extends State<ViewImage> with TickerProviderStateMixin {
               final GalleryImage? currentImageData =
                   vState.pageState?.imageMap[widget.imageSer];
 
-              logger.d('currentImageData ${currentImageData?.toJson()}\n'
+              logger.t('currentImageData ${currentImageData?.toJson()}\n'
                   'imageData        ${imageData?.toJson()}');
 
               // 图片文件已下载 加载显示本地图片文件
@@ -569,17 +569,17 @@ class _ViewImageState extends State<ViewImage> with TickerProviderStateMixin {
               //   );
               // }
 
-              logger.d('ImageExtProvider, imageUrl: ${imageData?.imageUrl}');
+              logger.t('ImageExtProvider, imageUrl: ${imageData?.imageUrl}');
               Widget image = ImageExtProvider(
                 image: ExtendedResizeImage.resizeIfNeeded(
                   provider: ExtendedNetworkImageProvider(
                     imageData?.imageUrl ?? '',
-                    timeLimit: const Duration(seconds: 10),
-                    cache: false,
-                    retries: 5,
-                    timeRetry: const Duration(seconds: 5),
+                    timeLimit: const Duration(seconds: 5),
+                    cache: true,
+                    retries: 2,
+                    timeRetry: const Duration(seconds: 2),
                     printError: true,
-                    cacheRawData: true,
+                    cacheKey: imageData?.cacheKey,
                   ),
                   // provider: getEhImageProvider(
                   //   imageData?.imageUrl ?? '',

lib/pages/image_view/view/view_widget.dart

@@ -453,7 +453,7 @@ class ImageExtProvider extends GetView<ViewExtController> {
       initGestureConfigHandler: initGestureConfigHandler,
       onDoubleTap: onDoubleTap,
       loadStateChanged: (ExtendedImageState state) {
-        logger.d(
+        logger.t(
             'loadStateChanged ser:$ser, state:${state.extendedImageLoadState}, image:$image');
         switch (state.extendedImageLoadState) {
           case LoadState.loading: