右对齐文本显示修复(如"巫鸿"只显示"鸿"的问题): - RDEPUBChapterTailNormalizer: 短尾页合并时检查 avoidPageBreakInside 语义, 避免将带有此标记的短文本(如 right-info 署名)错误合并回上一页 - RDEPUBTextContentView: 续段归一化时跳过右对齐/居中对齐的段落, 防止错误修改 firstLineHeadIndent 导致首字不可见 - RDEPUBCSSCompatibilityLayer: 为含 text-align:right/center 的 CSS 块 自动注入 text-indent:0 !important,确保右对齐/居中文本无首行缩进 - RDEPUBTextRendererSupport: 排版属性归一化时将右对齐/居中段落的 firstLineHeadIndent 重置为 0 图片查看器及脚注点击功能: - 新增 RDEPUBImageViewController 和 RDEPUBImageViewerCoordinator, 支持从 WebView 和 TextPage 两种模式查看图片 - epub-bridge.js: 检测图片和脚注图片的点击事件,脚注图片显示弹窗 - RDEPUBJavaScriptBridge: 新增 imageDidTap/footnoteDidTap 桥接消息 - RDEPUBWebView: 新增图片和脚注点击的 delegate 方法 - RDEPUBAttachmentNormalizer: 改进脚注检测,优先使用 alt 文本判断 - RDEPUBPaginationModels: 新增 .footnote 附件类型 - RDEPUBPageLayoutSnapshot: 运行时动态解析附件类型,脚注优先级高于图片 位置解析改进: - RDEPUBReaderController+LocationResolution: 利用 rangeInfo 提升页码定位精度 其他: - RDEPUBTextBookCache: schema 版本升级至 13 - RDEPUBReaderTheme: 主题更新 - Pod 项目文件更新 Co-Authored-By: Claude <noreply@anthropic.com>
128 lines
4.8 KiB
Swift
128 lines
4.8 KiB
Swift
import Foundation
|
|
|
|
final class RDEPUBReaderLocationCoordinator {
|
|
private unowned let context: RDEPUBReaderContext
|
|
|
|
private var lastPageChangeSpineIndex: Int?
|
|
|
|
init(context: RDEPUBReaderContext) {
|
|
self.context = context
|
|
}
|
|
|
|
@discardableResult
|
|
func restoreReadingLocation(
|
|
_ location: RDEPUBLocation,
|
|
animated: Bool = false,
|
|
targetHighlightRangeInfo: String? = nil
|
|
) -> Bool {
|
|
guard let controller = context.controller,
|
|
let readerView = context.readerView else { return false }
|
|
if context.bookPageMap != nil {
|
|
_ = context.runtime?.ensureOnDemandNavigationTargetAvailable(for: location)
|
|
}
|
|
guard let targetPageNumber = controller.pageNumber(for: location, rangeInfo: targetHighlightRangeInfo) else {
|
|
readerView.transitionToPage(pageNum: 0)
|
|
context.readingSession?.transition(to: .idle)
|
|
return false
|
|
}
|
|
|
|
if context.bookPageMap != nil {
|
|
guard context.runtime?.prepareOnDemandChapter(forAbsolutePageNumber: targetPageNumber) == true else {
|
|
return false
|
|
}
|
|
_ = context.readingSession?.queueNavigation(
|
|
to: location,
|
|
relativeToSpineIndex: nil,
|
|
bookIdentifier: context.currentBookIdentifier,
|
|
targetHighlightRangeInfo: targetHighlightRangeInfo
|
|
)
|
|
} else if context.textBook == nil {
|
|
_ = context.readingSession?.queueNavigation(
|
|
to: location,
|
|
relativeToSpineIndex: nil,
|
|
bookIdentifier: context.currentBookIdentifier,
|
|
targetHighlightRangeInfo: targetHighlightRangeInfo
|
|
)
|
|
} else {
|
|
context.readingSession?.transition(to: .jumping)
|
|
}
|
|
readerView.transitionToPage(pageNum: max(targetPageNumber - 1, 0), animated: animated)
|
|
|
|
recordPageChangeIfNeeded()
|
|
|
|
return true
|
|
}
|
|
|
|
func currentVisibleLocation() -> RDEPUBLocation? {
|
|
guard let controller = context.controller,
|
|
let readerView = context.readerView else {
|
|
return nil
|
|
}
|
|
let pageNumber = readerView.currentPage + 1
|
|
if (context.textBook != nil || context.bookPageMap != nil), readerView.currentPage >= 0 {
|
|
if let location = controller.resolvedTextLocation(forPageNumber: pageNumber) {
|
|
return location
|
|
}
|
|
|
|
if let readingSession = context.readingSession,
|
|
readingSession.activePages.indices.contains(readerView.currentPage) {
|
|
return readingSession.fallbackLocation(
|
|
for: readingSession.activePages[readerView.currentPage],
|
|
bookIdentifier: context.currentBookIdentifier
|
|
)
|
|
}
|
|
}
|
|
return context.readingSession?.currentReadingLocation(bookIdentifier: context.currentBookIdentifier)
|
|
}
|
|
|
|
func persistenceLocation() -> RDEPUBLocation? {
|
|
guard let controller = context.controller,
|
|
let currentBookIdentifier = context.currentBookIdentifier else {
|
|
return nil
|
|
}
|
|
return controller.persistence?.loadLocation(for: currentBookIdentifier)
|
|
}
|
|
|
|
func persist(location: RDEPUBLocation) {
|
|
guard let controller = context.controller,
|
|
let currentBookIdentifier = context.currentBookIdentifier else { return }
|
|
controller.persistence?.saveLocation(location, for: currentBookIdentifier)
|
|
controller.delegate?.epubReader(controller, didUpdateLocation: location)
|
|
controller.delegate?.epubReader(controller, didUpdateCurrentTableOfContentsItem: controller.currentTableOfContentsItem)
|
|
controller.updateReaderChrome()
|
|
}
|
|
|
|
func recordPageChangeIfNeeded() {
|
|
guard let runtime = context.runtime,
|
|
let bookPageMap = context.bookPageMap,
|
|
let readerView = context.readerView else { return }
|
|
|
|
let currentPageNumber = readerView.currentPage + 1
|
|
guard let currentSpineIndex = bookPageMap.spineIndex(forAbsolutePage: currentPageNumber - 1) else {
|
|
return
|
|
}
|
|
|
|
if let lastSpineIndex = lastPageChangeSpineIndex,
|
|
lastSpineIndex != currentSpineIndex {
|
|
runtime.jumpSessionManager.recordPageChange(
|
|
fromSpineIndex: lastSpineIndex,
|
|
toSpineIndex: currentSpineIndex
|
|
)
|
|
}
|
|
|
|
lastPageChangeSpineIndex = currentSpineIndex
|
|
|
|
let isIdle = context.secondsSinceLastUserNavigation() > 2.0
|
|
if let endReason = runtime.jumpSessionManager.checkSessionEnd(
|
|
currentSpineIndex: currentSpineIndex,
|
|
isIdle: isIdle
|
|
) {
|
|
runtime.jumpSessionManager.endSession(endReason)
|
|
}
|
|
}
|
|
|
|
func resetPageChangeState() {
|
|
lastPageChangeSpineIndex = nil
|
|
}
|
|
}
|