Parse showKey before precache

3003h · Nov 26, 2023 · 2cfabb6 · 2cfabb6
1 parent 1404203
commit 2cfabb6
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/lib/pages/image_view/controller/view_controller.dart b/lib/pages/image_view/controller/view_controller.dart
@@ -568,6 +568,19 @@ class ViewExtController extends GetxController {
         await _galleryPageController?.loadImagesForSer(itemSer);
       }
 
+      var needShowKey =
+          vState.pageState?.galleryProvider?.showKey?.isEmpty ?? true;
+
+      if (needShowKey) {
+        // fetchAndParserImageInfo() then ehPrecacheImages()
+        // make sure showKey is parsed before ehPrecacheImages()
+        image = await _galleryPageController?.fetchAndParserImageInfo(
+        itemSer,
+        cancelToken: vState.getMoreCancelToken,
+        changeSource: changeSource,
+        );
+      }
+
       GalleryPara.instance
           .ehPrecacheImages(
         imageMap: _galleryPageStat?.imageMap,
@@ -582,11 +595,16 @@ class ViewExtController extends GetxController {
         }
       });
 
-      image = await _galleryPageController?.fetchAndParserImageInfo(
+      if (!needShowKey) {
+        // ehPrecacheImages() then fetchAndParserImageInfo()
+        // the original logic
+        image = await _galleryPageController?.fetchAndParserImageInfo(
         itemSer,
         cancelToken: vState.getMoreCancelToken,
         changeSource: changeSource,
-      );
+        );
+      }
+
     }
 
     return image;