阅读器修改
This commit is contained in:
@@ -93,6 +93,7 @@ final class RDPDFInteractionHotspotView: UIView {
|
||||
|
||||
deinit {
|
||||
flickerTimer?.invalidate()
|
||||
flickerTimer = nil
|
||||
if let embedPlayerViewController {
|
||||
embedPlayerViewController.player?.pause()
|
||||
embedPlayerViewController.willMove(toParent: nil)
|
||||
@@ -231,8 +232,10 @@ final class RDPDFInteractionHotspotView: UIView {
|
||||
func setActive(_ active: Bool) {
|
||||
guard isActive != active else { return }
|
||||
isActive = active
|
||||
// 彻底清理任何正在进行的闪烁
|
||||
flickerTimer?.invalidate()
|
||||
flickerTimer = nil
|
||||
remainingFlickerToggles = 0
|
||||
styleView.layer.removeAllAnimations()
|
||||
applyBorderAndFillColors()
|
||||
if active {
|
||||
|
||||
@@ -230,22 +230,21 @@ public final class RDPDFKitPageProvider: RDPDFReaderPageProvider, RDPDFReaderOut
|
||||
return runs
|
||||
}
|
||||
|
||||
/// 使用完整文件内容生成稳定身份。按块读取避免大 PDF 一次性进入内存;绝对路径、
|
||||
/// 修改时间不参与签名,因此应用容器迁移或重新下载不会丢失阅读状态。
|
||||
/// 用文件名 + 大小 + 头部 64KB 内容生成稳定身份。绝对路径、修改时间不参与签名,
|
||||
/// 因此应用容器迁移或重新下载不会丢失阅读状态;只读头部而非整文件,避免大 PDF
|
||||
/// 在 `init`(通常主线程)里对几十~上百 MB 做同步哈希阻塞打开。
|
||||
private static func defaultBookIdentifier(for url: URL) -> String {
|
||||
let fileURL = url.standardizedFileURL
|
||||
let fileSize = (try? fileURL.resourceValues(forKeys: [.fileSizeKey]))?.fileSize
|
||||
guard let handle = try? FileHandle(forReadingFrom: fileURL) else {
|
||||
let fallback = "\(fileURL.lastPathComponent)|\(fileSize.map(String.init) ?? "")"
|
||||
return "pdf.\(RDPDFReaderTextRunDiskCache.stableIdentifier(for: fallback))"
|
||||
}
|
||||
defer { handle.closeFile() }
|
||||
|
||||
var hasher = SHA256()
|
||||
while true {
|
||||
let chunk = handle.readData(ofLength: 1024 * 1024)
|
||||
guard chunk.isEmpty == false else { break }
|
||||
hasher.update(data: chunk)
|
||||
hasher.update(data: Data(fileURL.lastPathComponent.utf8))
|
||||
if let fileSize {
|
||||
withUnsafeBytes(of: UInt64(fileSize).littleEndian) { hasher.update(data: Data($0)) }
|
||||
}
|
||||
if let handle = try? FileHandle(forReadingFrom: fileURL) {
|
||||
defer { handle.closeFile() }
|
||||
hasher.update(data: handle.readData(ofLength: 64 * 1024))
|
||||
}
|
||||
let digest = hasher.finalize().map { String(format: "%02x", $0) }.joined()
|
||||
return "pdf.sha256.\(digest)"
|
||||
|
||||
@@ -372,6 +372,13 @@ public final class RDPDFReaderView: UIView, UIGestureRecognizerDelegate {
|
||||
public func setDrawingToolActive(_ active: Bool) { zoomOverlayView.isDrawingToolActive = active }
|
||||
public func hideToolViewIfNeeded() { if isToolViewVisible { toggleToolbars() } }
|
||||
public func refreshCurrentPageIfNeeded() { pageContentView(pageNum: currentPage)?.setNeedsLayout() }
|
||||
/// 页面图异步到达后,让仿真翻页容器按真实纸张尺寸重新收缩;首屏页面图迟到时
|
||||
/// `updateNativeCurlBookFrame` 会因取不到 fitted frame 提前返回,之后没有其它
|
||||
/// 路径重试,导致仿真书页比例/留白错误直到下一次翻页。
|
||||
public func refreshPageCurlLayoutIfNeeded() {
|
||||
guard currentDisplayType == .pageCurl else { return }
|
||||
updateNativeCurlBookFrame()
|
||||
}
|
||||
|
||||
public func register(contentView: UIView.Type, contentViewWithReuseIdentifier identifier: String) {
|
||||
reusableTypes[identifier] = contentView
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
import CoreImage
|
||||
import UIKit
|
||||
|
||||
/// `Configuration.pageImageTransform` 的内置默认实现:深色主题按反相处理,浅色系
|
||||
/// 有色主题按正片叠底混合背景色,纯白/未设主题不做处理。宿主不传该闭包也能获得
|
||||
/// 合理的页面图片配色,需要自定义规则时仍可整体覆盖 `pageImageTransform`。
|
||||
public enum RDPDFReaderPageImageTransform {
|
||||
/// 复用同一个 `CIContext`:反相分支每次新建 `CIContext` 的开销很高,且该变换会
|
||||
/// 在朗读逐句高亮、OCR 回填等路径被频繁触发。
|
||||
private static let sharedCIContext = CIContext(options: [.useSoftwareRenderer: false])
|
||||
|
||||
public static func apply(_ image: UIImage, theme: RDPDFReaderThemeOption) -> UIImage {
|
||||
let background = theme.contentBackgroundColor
|
||||
guard background != .white else { return image }
|
||||
if background.rdPDFPerceivedBrightness < 0.5 {
|
||||
return invertedImage(image) ?? image
|
||||
}
|
||||
return multiplyBlended(image, backgroundColor: background)
|
||||
}
|
||||
|
||||
private static func invertedImage(_ image: UIImage) -> UIImage? {
|
||||
guard let ciImage = CIImage(image: image), let filter = CIFilter(name: "CIColorInvert") else { return nil }
|
||||
filter.setValue(ciImage, forKey: kCIInputImageKey)
|
||||
guard let output = filter.outputImage, let cgImage = sharedCIContext.createCGImage(output, from: output.extent) else { return nil }
|
||||
return UIImage(cgImage: cgImage, scale: image.scale, orientation: image.imageOrientation)
|
||||
}
|
||||
|
||||
private static func multiplyBlended(_ image: UIImage, backgroundColor: UIColor) -> UIImage {
|
||||
UIGraphicsImageRenderer(size: image.size).image { _ in
|
||||
backgroundColor.setFill()
|
||||
UIBezierPath(rect: CGRect(origin: .zero, size: image.size)).fill()
|
||||
image.draw(in: CGRect(origin: .zero, size: image.size), blendMode: .multiply, alpha: 1)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private extension UIColor {
|
||||
/// ITU-R BT.601 感知亮度权重,用于粗略区分“深色主题”与“浅色有色主题”。
|
||||
var rdPDFPerceivedBrightness: CGFloat {
|
||||
var r: CGFloat = 0, g: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 0
|
||||
if getRed(&r, green: &g, blue: &b, alpha: &a) {
|
||||
return 0.299 * r + 0.587 * g + 0.114 * b
|
||||
}
|
||||
var w: CGFloat = 0
|
||||
getWhite(&w, alpha: &a)
|
||||
return w
|
||||
}
|
||||
}
|
||||
@@ -36,6 +36,17 @@ public extension RDPDFReaderPageViewDelegate {
|
||||
func pageView(_ pageView: RDPDFReaderPageView, didTap interaction: RDPDFReaderPageInteraction) {}
|
||||
}
|
||||
|
||||
/// 点读热区的容器层。裸 `UIView` 在没有子视图接住触摸时,默认 `hitTest` 会返回
|
||||
/// 自身,导致整页(哪怕零热区)都会截住触摸,使叠在它下面的 `textLayer` 收不到
|
||||
/// 长按选区手势。这里让容器像它的热区子视图(`RDPDFInteractionHotspotView.hitTest`)
|
||||
/// 一样只在真正命中某个热区时才截获触摸,否则放行给下层视图。
|
||||
private final class RDPDFReaderPageInteractionOverlayView: UIView {
|
||||
override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
|
||||
let hit = super.hitTest(point, with: event)
|
||||
return hit === self ? nil : hit
|
||||
}
|
||||
}
|
||||
|
||||
/// PDF 页面视图:组合缩放画布、文字选择层和选区放大镜,
|
||||
/// 并提供与 EPUB 一致的两套系统编辑菜单:
|
||||
/// - 选区菜单:复制、划线、注释;
|
||||
@@ -68,7 +79,7 @@ public final class RDPDFReaderPageView: UIView, RDPDFReaderPageInteractable, UIG
|
||||
private let zoomView = RDPDFZoomablePageView()
|
||||
private let textLayer = RDPDFReaderImageTextLayerView()
|
||||
private let drawingCanvas = RDPDFReaderDrawingCanvasView()
|
||||
private let interactionOverlay = UIView()
|
||||
private let interactionOverlay = RDPDFReaderPageInteractionOverlayView()
|
||||
private var pageInteractions: [RDPDFReaderPageInteraction] = []
|
||||
private var activeInteractionIdentifier: String?
|
||||
/// 已经在本 page view 实例上播放过入场闪烁的热区标识。`configureInteractions`
|
||||
@@ -179,7 +190,11 @@ public final class RDPDFReaderPageView: UIView, RDPDFReaderPageInteractable, UIG
|
||||
flickerTrackedPageIndex = pageIndex
|
||||
flickeredInteractionIdentifiers.removeAll()
|
||||
}
|
||||
interactionOverlay.subviews.forEach { $0.removeFromSuperview() }
|
||||
// 先停止所有旧热区的闪烁,确保没有遗留的 timer
|
||||
interactionOverlay.subviews.forEach { subview in
|
||||
(subview as? RDPDFInteractionHotspotView)?.setActive(false)
|
||||
subview.removeFromSuperview()
|
||||
}
|
||||
for interaction in interactions {
|
||||
// 同一个热区标识如果之前已经在这一页播放过入场闪烁,这次重建只是因为
|
||||
// 资源异步就绪触发的 configureInteractions,不是用户第一次看到这一页,
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import CryptoKit
|
||||
import Foundation
|
||||
|
||||
/// 标注文件无法安全读写时返回的错误。调用方应提示用户重试或导出原文件,SDK 不会
|
||||
@@ -49,6 +50,9 @@ public final class RDPDFReaderPersistenceStore: RDPDFReaderAnnotationPersisting,
|
||||
/// 同一进程内的多个阅读器可能指向同一本书;将本地状态文件的读写串行化,
|
||||
/// 避免原子替换过程中出现竞争或读取半完成文件。
|
||||
private static let annotationPersistenceLock = NSLock()
|
||||
/// 阅读位置 / 书签写盘走后台串行队列:这类高频更新(每次翻页)不该在主线程
|
||||
/// 做整文件读 + 编码 + 原子写,原子性仍由 `annotationPersistenceLock` 保证。
|
||||
private static let readerStateIOQueue = DispatchQueue(label: "com.readoor.pdf-reader.reader-state-io", qos: .utility)
|
||||
private let rootURL: URL
|
||||
private let drawingsURL: URL
|
||||
private let highlightsURL: URL
|
||||
@@ -63,6 +67,39 @@ public final class RDPDFReaderPersistenceStore: RDPDFReaderAnnotationPersisting,
|
||||
readerStateURL = rootURL.appendingPathComponent("reader-state.json")
|
||||
}
|
||||
|
||||
/// 按 `bookIdentifier` 派生存储目录,宿主无需自己把标识符转换成文件系统安全的
|
||||
/// 目录名。对齐 EPUB 侧 `RDEPUBProtectedContentStore` 的做法:`bookIdentifier`
|
||||
/// 可能含 `/`、空格等非法字符,且长度不可控,用 SHA256 定长摘要避免撞文件名
|
||||
/// 长度上限,也避免每个宿主各自实现一套不一致的哈希方案。
|
||||
public convenience init(
|
||||
bookIdentifier: String,
|
||||
baseDirectory: URL? = nil,
|
||||
directoryName: String = "ssreaderview-pdf"
|
||||
) {
|
||||
self.init(rootURL: Self.storageDirectoryURL(
|
||||
bookIdentifier: bookIdentifier,
|
||||
baseDirectory: baseDirectory,
|
||||
directoryName: directoryName
|
||||
))
|
||||
}
|
||||
|
||||
/// `init(bookIdentifier:baseDirectory:directoryName:)` 使用的目录派生规则,单独
|
||||
/// 暴露出来供宿主在构造 store 前需要读写同一目录时复用(例如迁移旧数据)。
|
||||
public static func storageDirectoryURL(
|
||||
bookIdentifier: String,
|
||||
baseDirectory: URL? = nil,
|
||||
directoryName: String = "ssreaderview-pdf"
|
||||
) -> URL {
|
||||
let base = baseDirectory
|
||||
?? FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first
|
||||
?? FileManager.default.temporaryDirectory
|
||||
let digest = SHA256.hash(data: Data(bookIdentifier.utf8))
|
||||
let name = digest.map { String(format: "%02x", $0) }.joined()
|
||||
return base
|
||||
.appendingPathComponent(directoryName, isDirectory: true)
|
||||
.appendingPathComponent(name, isDirectory: true)
|
||||
}
|
||||
|
||||
// MARK: - RDPDFReaderPersistence
|
||||
|
||||
public func restoreReadingPage(for bookIdentifier: String) -> Int? {
|
||||
@@ -73,11 +110,13 @@ public final class RDPDFReaderPersistenceStore: RDPDFReaderAnnotationPersisting,
|
||||
|
||||
public func saveReadingPage(_ pageIndex: Int, for bookIdentifier: String) {
|
||||
guard pageIndex >= 0 else { return }
|
||||
Self.annotationPersistenceLock.lock()
|
||||
defer { Self.annotationPersistenceLock.unlock() }
|
||||
var state = loadReaderStateLocked()
|
||||
state.readingPages[bookIdentifier] = pageIndex
|
||||
saveReaderStateLocked(state)
|
||||
Self.readerStateIOQueue.async { [self] in
|
||||
Self.annotationPersistenceLock.lock()
|
||||
defer { Self.annotationPersistenceLock.unlock() }
|
||||
var state = loadReaderStateLocked()
|
||||
state.readingPages[bookIdentifier] = pageIndex
|
||||
saveReaderStateLocked(state)
|
||||
}
|
||||
}
|
||||
|
||||
public func loadBookmarks(for bookIdentifier: String) -> [RDPDFReaderBookmark] {
|
||||
@@ -90,13 +129,15 @@ public final class RDPDFReaderPersistenceStore: RDPDFReaderAnnotationPersisting,
|
||||
|
||||
public func setBookmark(_ isBookmarked: Bool, pageIndex: Int, for bookIdentifier: String) {
|
||||
guard pageIndex >= 0 else { return }
|
||||
Self.annotationPersistenceLock.lock()
|
||||
defer { Self.annotationPersistenceLock.unlock() }
|
||||
var state = loadReaderStateLocked()
|
||||
var pages = Set(state.bookmarks[bookIdentifier] ?? [])
|
||||
if isBookmarked { pages.insert(pageIndex) } else { pages.remove(pageIndex) }
|
||||
state.bookmarks[bookIdentifier] = pages.sorted()
|
||||
saveReaderStateLocked(state)
|
||||
Self.readerStateIOQueue.async { [self] in
|
||||
Self.annotationPersistenceLock.lock()
|
||||
defer { Self.annotationPersistenceLock.unlock() }
|
||||
var state = loadReaderStateLocked()
|
||||
var pages = Set(state.bookmarks[bookIdentifier] ?? [])
|
||||
if isBookmarked { pages.insert(pageIndex) } else { pages.remove(pageIndex) }
|
||||
state.bookmarks[bookIdentifier] = pages.sorted()
|
||||
saveReaderStateLocked(state)
|
||||
}
|
||||
}
|
||||
|
||||
public func drawingPaths(pageNo: Int) -> [RDPDFReaderDrawingPath] {
|
||||
|
||||
@@ -4,7 +4,7 @@ import SnapKit
|
||||
/// 成品 PDF 阅读控制器。自定义加密文件由宿主提供页面;普通 PDF 可由 SDK 使用
|
||||
/// PDFKit 直接解析。两种来源共用阅读交互、OCR、标注及面板。
|
||||
public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataSource, RDPDFReaderDelegate, RDPDFReaderPageViewDelegate {
|
||||
|
||||
|
||||
public struct Configuration {
|
||||
public var displayType: RDPDFReaderView.DisplayType = .pageCurl
|
||||
/// 默认与 EPUB 成品控制器一致:横屏仿真/横滑使用双页,竖滑保持单页。
|
||||
@@ -28,8 +28,10 @@ public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataS
|
||||
public var pageDescriptorCacheRadius = 2
|
||||
/// 内存中保留当前页前后的 OCR 结果数量;默认沿用页面描述缓存半径。
|
||||
public var ocrMemoryCacheRadius: Int?
|
||||
/// 宿主或内置 Provider 提供页面后,可在此进行反色或其它主题渲染。
|
||||
public var pageImageTransform: ((UIImage, RDPDFReaderThemeOption) -> UIImage)?
|
||||
/// 宿主或内置 Provider 提供页面后,可在此进行反色或其它主题渲染。默认使用
|
||||
/// SDK 内置规则(深色主题反相、浅色有色主题正片叠底),宿主不设置也有合理
|
||||
/// 效果;显式赋值可整体覆盖,赋值为 nil 可关闭页面图片配色。
|
||||
public var pageImageTransform: ((UIImage, RDPDFReaderThemeOption) -> UIImage)? = RDPDFReaderPageImageTransform.apply
|
||||
/// 试读策略。非 nil 且宿主经 delegate 提供了墙视图时启用试读墙。
|
||||
public var trialPolicy: RDPDFReaderTrialPolicy?
|
||||
|
||||
@@ -94,6 +96,7 @@ public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataS
|
||||
guard pageIndex >= 0, pageIndex < book.totalPages else { return }
|
||||
clearPageDescriptorRequest(for: pageIndex)
|
||||
pageDescriptors.removeValue(forKey: pageIndex)
|
||||
renderedImageCache.removeValue(forKey: pageIndex)
|
||||
pageLoadFailedPages.remove(pageIndex)
|
||||
pageDescriptorRequestAttempts[pageIndex] = 0
|
||||
refreshPageViews(at: pageIndex)
|
||||
@@ -142,6 +145,21 @@ public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataS
|
||||
private var preferredDisplayType: RDPDFReaderView.DisplayType
|
||||
/// 旋转动画期间不能依赖尚未更新的 view.bounds,提前锁定目标方向以避免先建出双页。
|
||||
private var phoneLandscapeTransitionOverride: Bool?
|
||||
/// 宿主可能把控制器塞进 UINavigationController;进入/离开阅读器时临时接管导航栏
|
||||
/// 与侧滑返回手势,离开后原样恢复,避免污染宿主配置(对齐 EPUB 侧已修过的同类问题)。
|
||||
private var navigationBarHiddenBeforeReader: Bool?
|
||||
private var interactivePopWasEnabledBeforeReader: Bool?
|
||||
private weak var interactivePopDelegateBeforeReader: UIGestureRecognizerDelegate?
|
||||
/// 初次进入恢复上次阅读页的窗口期。期间 `reloadData()` 触发的 `pageNum(0)`
|
||||
/// 不能把待恢复的进度覆盖成 0。
|
||||
private var isRestoringInitialReadingState = false
|
||||
/// 翻页进度写盘防抖:快速翻页时合并为一次落盘。
|
||||
private var readingPagePersistWork: DispatchWorkItem?
|
||||
private var pendingReadingPagePersist: Int?
|
||||
/// 按 (页码, 主题 identifier) 缓存变换后的页面图。`configure` 会被 OCR 回填、
|
||||
/// 朗读逐句高亮、标注增删等路径高频触发,若每次都重跑整页 CIFilter/正片叠底
|
||||
/// 会在主线程掉帧。
|
||||
private var renderedImageCache: [Int: (theme: Int, image: UIImage)] = [:]
|
||||
|
||||
public init(
|
||||
pageProvider: RDPDFReaderPageProvider,
|
||||
@@ -220,20 +238,56 @@ public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataS
|
||||
return availableWidth * imageSize.height / imageSize.width
|
||||
}
|
||||
view.addSubview(readerView)
|
||||
// reloadData() 会把 currentPage 从 -1 置 0 并同步回调 pageNum(0)。必须在此之前
|
||||
// 读出待恢复页,并在恢复窗口内抑制写盘,否则续读进度每次打开都被覆盖成 0。
|
||||
isRestoringInitialReadingState = true
|
||||
let restoredReadingPage = persistence?.restoreReadingPage(for: book.identifier)
|
||||
readerView.reloadData()
|
||||
applyDisplayTypeForCurrentInterface()
|
||||
if let page = persistence?.restoreReadingPage(for: book.identifier), page >= 0, page < readableContentPageCount {
|
||||
if let page = restoredReadingPage, page >= 0, page < readableContentPageCount {
|
||||
readerView.transitionToPage(pageNum: page, animated: false)
|
||||
}
|
||||
isRestoringInitialReadingState = false
|
||||
bookmarks = Set(persistence?.loadBookmarks(for: book.identifier).map(\.pageIndex) ?? [])
|
||||
NotificationCenter.default.addObserver(
|
||||
self,
|
||||
selector: #selector(handleAppDidEnterBackground),
|
||||
name: UIApplication.didEnterBackgroundNotification,
|
||||
object: nil
|
||||
)
|
||||
}
|
||||
|
||||
public override func viewWillAppear(_ animated: Bool) {
|
||||
super.viewWillAppear(animated)
|
||||
if navigationBarHiddenBeforeReader == nil {
|
||||
navigationBarHiddenBeforeReader = navigationController?.isNavigationBarHidden
|
||||
}
|
||||
if interactivePopWasEnabledBeforeReader == nil {
|
||||
interactivePopWasEnabledBeforeReader = navigationController?.interactivePopGestureRecognizer?.isEnabled
|
||||
interactivePopDelegateBeforeReader = navigationController?.interactivePopGestureRecognizer?.delegate
|
||||
}
|
||||
navigationController?.setNavigationBarHidden(true, animated: animated)
|
||||
navigationController?.interactivePopGestureRecognizer?.isEnabled = false
|
||||
// 宿主或另一阅读器实例可能已修改同一本书的标注;重新出现时刷新快照。
|
||||
reloadAnnotations()
|
||||
}
|
||||
|
||||
public override func viewWillDisappear(_ animated: Bool) {
|
||||
super.viewWillDisappear(animated)
|
||||
if let navigationBarHiddenBeforeReader {
|
||||
navigationController?.setNavigationBarHidden(navigationBarHiddenBeforeReader, animated: animated)
|
||||
}
|
||||
if let interactivePopWasEnabledBeforeReader {
|
||||
navigationController?.interactivePopGestureRecognizer?.delegate = interactivePopDelegateBeforeReader
|
||||
navigationController?.interactivePopGestureRecognizer?.isEnabled = interactivePopWasEnabledBeforeReader
|
||||
}
|
||||
flushReadingPagePersist()
|
||||
}
|
||||
|
||||
@objc private func handleAppDidEnterBackground() {
|
||||
flushReadingPagePersist()
|
||||
}
|
||||
|
||||
public override func didReceiveMemoryWarning() {
|
||||
super.didReceiveMemoryWarning()
|
||||
cancelOutstandingOCRRequests()
|
||||
@@ -243,6 +297,7 @@ public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataS
|
||||
pageDescriptors = pageDescriptors.filter { visibleIndexes.contains($0.key) }
|
||||
ocrRuns = ocrRuns.filter { visibleIndexes.contains($0.key) }
|
||||
drawingDocuments = drawingDocuments.filter { visibleIndexes.contains($0.key) }
|
||||
renderedImageCache = renderedImageCache.filter { visibleIndexes.contains($0.key) }
|
||||
(pageProvider as? RDPDFKitPageProvider)?.removeCachedImages()
|
||||
visiblePageViews().forEach { $0.releaseDrawingRenderingCache() }
|
||||
visibleIndexes.sorted().forEach { startOCRIfNeeded($0) }
|
||||
@@ -295,7 +350,12 @@ public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataS
|
||||
descriptor = await withCheckedContinuation { continuation in
|
||||
pageProvider.readerPage(at: pageIndex) { continuation.resume(returning: $0) }
|
||||
}
|
||||
pageDescriptors[pageIndex] = descriptor
|
||||
// 只有带页面图的结果才能进显示缓存:无图 descriptor 会让 configure 的
|
||||
// `guard descriptor == nil else { … return }` 短路成永久白页(configure
|
||||
// 自己的请求路径对无图结果是按无效处理、给重试入口的)。
|
||||
if descriptor.image != nil {
|
||||
pageDescriptors[pageIndex] = descriptor
|
||||
}
|
||||
}
|
||||
if let nativeRuns = descriptor.textRuns, !nativeRuns.isEmpty { return nativeRuns }
|
||||
guard configuration.enablesOCR, let image = descriptor.image else { return [] }
|
||||
@@ -431,7 +491,9 @@ public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataS
|
||||
title = "PDF · \(pageNum + 1) / \(readableContentPageCount)"
|
||||
topToolbar?.setTitle(title ?? book.title)
|
||||
topToolbar?.setBookmarkSelected(bookmarks.contains(pageNum))
|
||||
persistence?.saveReadingPage(pageNum, for: book.identifier)
|
||||
if !isRestoringInitialReadingState {
|
||||
scheduleReadingPagePersist(pageNum)
|
||||
}
|
||||
delegate?.pdfReaderViewController(self, didChangePage: pageNum)
|
||||
}
|
||||
|
||||
@@ -440,6 +502,7 @@ public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataS
|
||||
let visiblePages = Set(visiblePageViews().map(\.tag))
|
||||
let isStale: (Int) -> Bool = { abs($0 - pageIndex) > safeRadius && !visiblePages.contains($0) }
|
||||
pageDescriptors.keys.filter(isStale).forEach { pageDescriptors.removeValue(forKey: $0) }
|
||||
renderedImageCache.keys.filter(isStale).forEach { renderedImageCache.removeValue(forKey: $0) }
|
||||
|
||||
// Provider 本身无法取消时,以 token 失效保证迟到回调不能把远页重新塞回缓存。
|
||||
pageDescriptorRequestTokens.keys.filter(isStale).forEach { clearPageDescriptorRequest(for: $0) }
|
||||
@@ -479,11 +542,15 @@ public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataS
|
||||
private func acceptPageDescriptor(_ descriptor: RDPDFReaderPageDescriptor, at index: Int) {
|
||||
removePageDescriptorRequestState(for: index)
|
||||
pageDescriptors[index] = descriptor
|
||||
// 新页面图到达,丢弃基于旧图(或空图占位)算出的主题变换缓存。
|
||||
renderedImageCache.removeValue(forKey: index)
|
||||
// 宽度适配竖滑下,占位的一屏高 cell 要按真实纸张比例重新排版。
|
||||
readerView.invalidateWidthFitLayoutIfNeeded(updatedPage: index)
|
||||
// 初始请求的 cell 可能已经因旋转或复用离开屏幕,也可能是仿真翻页提前构建、
|
||||
// 尚未上屏的页;两者都要装配,否则翻到它时是白页。
|
||||
refreshPageViews(at: index)
|
||||
// 仿真翻页首屏的页面图迟到时,book frame 需在拿到真实尺寸后重新收缩一次。
|
||||
readerView.refreshPageCurlLayoutIfNeeded()
|
||||
}
|
||||
|
||||
private func handleInvalidPageDescriptor(at index: Int, token: UUID, attempt: Int) {
|
||||
@@ -503,7 +570,7 @@ public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataS
|
||||
|
||||
private func configure(_ page: RDPDFReaderPageView, at index: Int) {
|
||||
let descriptor = pageDescriptors[index]
|
||||
page.image = descriptor.flatMap { renderedImage($0.image) }
|
||||
page.image = descriptor.flatMap { renderedImage($0.image, at: index) }
|
||||
page.applyTheme(contentBackgroundColor: currentTheme.contentBackgroundColor, surroundingBackgroundColor: pageSurroundingColor)
|
||||
page.setPhoneLandscapeWidthFitting(isPhoneLandscape, safeAreaInsets: view.safeAreaInsets)
|
||||
let runs = descriptor?.textRuns ?? ocrRuns[index] ?? []
|
||||
@@ -601,9 +668,15 @@ public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataS
|
||||
pageDescriptorRequestTimeouts.removeValue(forKey: index)?.cancel()
|
||||
}
|
||||
|
||||
private func renderedImage(_ image: UIImage?) -> UIImage? {
|
||||
private func renderedImage(_ image: UIImage?, at index: Int) -> UIImage? {
|
||||
guard let image else { return nil }
|
||||
return configuration.pageImageTransform?(image, currentTheme) ?? image
|
||||
guard let transform = configuration.pageImageTransform else { return image }
|
||||
if let hit = renderedImageCache[index], hit.theme == currentTheme.identifier {
|
||||
return hit.image
|
||||
}
|
||||
let result = transform(image, currentTheme)
|
||||
renderedImageCache[index] = (currentTheme.identifier, result)
|
||||
return result
|
||||
}
|
||||
|
||||
private func startOCRIfNeeded(_ index: Int) {
|
||||
@@ -705,6 +778,23 @@ public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataS
|
||||
topToolbar?.setBookmarkSelected(marked)
|
||||
}
|
||||
|
||||
/// 翻页进度写盘防抖:1s 内的连续翻页只落最后一页;离开阅读器或进入后台时立即落盘。
|
||||
private func scheduleReadingPagePersist(_ page: Int) {
|
||||
pendingReadingPagePersist = page
|
||||
readingPagePersistWork?.cancel()
|
||||
let work = DispatchWorkItem { [weak self] in self?.flushReadingPagePersist() }
|
||||
readingPagePersistWork = work
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 1.0, execute: work)
|
||||
}
|
||||
|
||||
private func flushReadingPagePersist() {
|
||||
readingPagePersistWork?.cancel()
|
||||
readingPagePersistWork = nil
|
||||
guard let page = pendingReadingPagePersist else { return }
|
||||
pendingReadingPagePersist = nil
|
||||
persistence?.saveReadingPage(page, for: book.identifier)
|
||||
}
|
||||
|
||||
private func showNavigation() {
|
||||
if let asyncOutlineProvider = pageProvider as? RDPDFReaderAsyncOutlineProviding {
|
||||
guard navigationLoadingIndicator == nil else { return }
|
||||
@@ -921,6 +1011,8 @@ public final class RDPDFReaderViewController: UIViewController, RDPDFReaderDataS
|
||||
|
||||
private func apply(_ theme: RDPDFReaderThemeOption) {
|
||||
currentTheme = theme
|
||||
// 主题变了,所有按旧主题算出的页面图变换缓存作废。
|
||||
renderedImageCache.removeAll()
|
||||
view.backgroundColor = theme.contentBackgroundColor
|
||||
readerView.backgroundColor = pageSurroundingColor
|
||||
applyChromeTheme()
|
||||
|
||||
Reference in New Issue
Block a user