优化 EPUB 翻页与后台分页刷新

Sources/RDReaderView/ReaderView/Paging/RDReaderPreloadController.swift

@@ -78,8 +78,12 @@ final class RDReaderPreloadController {
         environment: Environment,
         contentViewProvider: (Int, UIView?) -> UIView?
     ) -> UIView {
-        let reusableView = detachedReusablePageView(for: pageNum)
-        let view = contentViewProvider(pageNum, reusableView) ?? reusableView ?? UIView()
+        let view: UIView
+        if let reusableView = detachedReusablePageView(for: pageNum) {
+            view = reusableView
+        } else {
+            view = contentViewProvider(pageNum, nil) ?? UIView()
+        }
         if shouldCache(view: view, for: pageNum, environment: environment) {
             pageCurlCachedViews[pageNum] = view
         } else {
@@ -111,8 +115,14 @@ final class RDReaderPreloadController {
         preloadHostView.frame = parentView.bounds
 
         for targetPage in targets {
-            let existing = detachedReusablePageView(for: targetPage)
-            let contentView = contentViewProvider(targetPage, existing) ?? existing ?? UIView()
+            let contentView: UIView
+            if let existing = preloadedPageViews[targetPage], existing.superview === preloadHostView {
+                contentView = existing
+            } else if let cached = pageCurlCachedViews.removeValue(forKey: targetPage), cached.superview == nil {
+                contentView = cached
+            } else {
+                contentView = contentViewProvider(targetPage, nil) ?? UIView()
+            }
             let shouldCacheContentView = shouldCache(view: contentView, for: targetPage, environment: environment)
             if shouldCacheContentView {
                 preloadedPageViews[targetPage] = contentView

Sources/RDReaderView/ReaderView/RDReaderView.swift

@@ -763,6 +763,14 @@ public class RDReaderView: UIView {
         guard let safePageNum = clampedPageNumber(pageNum) else { return }
         switch currentDisplayType {
         case .pageCurl:
+            if !animated, safePageNum == currentPage, !detectPageViewControllerFault(pageViewController) {
+                RDReaderTapDebug.log(
+                    "ReaderView.transitionToPage",
+                    "skip same page page=\(safePageNum) animated=\(animated)"
+                )
+                return
+            }
+
             let request = PageTransitionRequest(pageNum: safePageNum, animated: animated)
             if shouldQueuePageTransition(request) {
                 return
@@ -823,6 +831,7 @@ public class RDReaderView: UIView {
     }
 
     public func reloadData() {
+        invalidatePageCaches()
         switchReaderDisplayType(currentDisplayType)
         topToolView = resolvedTopChromeView()
         bottomToolView = resolvedBottomChromeView()
@@ -830,8 +839,9 @@ public class RDReaderView: UIView {
 
     public func reloadPageCountOnly() {
         if currentDisplayType == .pageCurl {
-            if !isPageCurlTransitioning, currentPage >= 0, numberOfPages() > 0 {
-                transitionToPage(pageNum: currentPage, animated: false)
+            let totalPages = numberOfPages()
+            if !isPageCurlTransitioning, currentPage >= totalPages, totalPages > 0 {
+                transitionToPage(pageNum: totalPages - 1, animated: false)
             }
         } else {
             collectionView.reloadData()