本次提交围绕搜索链路的稳定性、定位恢复体验以及长章节内存优化的验证能力进行了补强。 主要改动: 1. 调整阅读器搜索栏、搜索协调器与定位恢复逻辑,改善搜索结果跳转、状态同步与相关 UI 行为。 2. 补充内存探针接入点与上下文记录,便于跟踪阅读过程中的内存占用变化。 3. 更新 RDURLReaderController、ReaderContext 与工具视图相关实现,使调试与观测链路更完整。 4. 新增 MemoryFootprintTests,并同步更新 DemoReaderState 与 SearchTests,用 UI 测试覆盖搜索与内存相关回归场景。
137 lines
5.7 KiB
Swift
137 lines
5.7 KiB
Swift
|
|
import UIKit
|
|
|
|
extension RDReaderView {
|
|
|
|
func tapCenter() {
|
|
refreshToolViewsFromProviderIfNeeded()
|
|
isShowToolView = !isShowToolView
|
|
RDReaderTapDebug.log(
|
|
"ReaderView.tapCenter",
|
|
"toggle toolView visible=\(isShowToolView) top=\(RDReaderTapDebug.describe(topToolView)) bottom=\(RDReaderTapDebug.describe(bottomToolView))"
|
|
)
|
|
if isShowToolView {
|
|
if let topToolView = topToolView {
|
|
installToolViewIfNeeded(topToolView, position: .top)
|
|
layoutIfNeeded()
|
|
topToolView.transform = CGAffineTransform(translationX: 0, y: -topToolView.bounds.height)
|
|
UIView.animate(withDuration: toolViewAnimationDuration) {
|
|
topToolView.transform = .identity
|
|
}
|
|
}
|
|
|
|
if let bottomToolView = bottomToolView {
|
|
installToolViewIfNeeded(bottomToolView, position: .bottom)
|
|
layoutIfNeeded()
|
|
bottomToolView.transform = CGAffineTransform(translationX: 0, y: bottomToolView.bounds.height)
|
|
UIView.animate(withDuration: toolViewAnimationDuration) {
|
|
bottomToolView.transform = .identity
|
|
}
|
|
}
|
|
|
|
collectionView.isUserInteractionEnabled = false
|
|
pageViewController.view.isUserInteractionEnabled = false
|
|
RDReaderTapDebug.log("ReaderView.tapCenter", "disabled collectionView/pageViewController interaction while toolView is visible")
|
|
} else {
|
|
if let topToolView = topToolView {
|
|
UIView.animate(withDuration: toolViewAnimationDuration, animations: {
|
|
topToolView.transform = CGAffineTransform(translationX: 0, y: -topToolView.bounds.height)
|
|
}) { _ in
|
|
topToolView.removeFromSuperview()
|
|
}
|
|
}
|
|
|
|
if let bottomToolView = bottomToolView {
|
|
UIView.animate(withDuration: toolViewAnimationDuration, animations: {
|
|
bottomToolView.transform = CGAffineTransform(translationX: 0, y: bottomToolView.bounds.height)
|
|
}) { _ in
|
|
bottomToolView.removeFromSuperview()
|
|
}
|
|
}
|
|
|
|
collectionView.isUserInteractionEnabled = true
|
|
pageViewController.view.isUserInteractionEnabled = true
|
|
RDReaderTapDebug.log("ReaderView.tapCenter", "re-enabled collectionView/pageViewController interaction after hiding toolView")
|
|
}
|
|
onToolViewVisibilityChanged?(isShowToolView)
|
|
}
|
|
|
|
func isHitView(_ hitView: UIView?, inside toolView: UIView, point: CGPoint) -> Bool {
|
|
if let hitView, hitView === toolView || hitView.isDescendant(of: toolView) {
|
|
return true
|
|
}
|
|
|
|
if toolView.frame.contains(point) {
|
|
// For search bar views, only consider the hit inside the visible
|
|
// panel area. Taps on the dimmed scrim should pass through to
|
|
// the reader content to allow chrome toggling. Touches that
|
|
// resolved to a search bar subview (e.g. the accessibility-only
|
|
// navigation buttons outside the panel) are already claimed by
|
|
// the descendant check above.
|
|
if let searchBarView = toolView as? RDEPUBReaderSearchBarView {
|
|
let panelPoint = convert(point, to: searchBarView.panelView)
|
|
if !searchBarView.panelView.point(inside: panelPoint, with: nil) {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
enum ToolViewPosition {
|
|
|
|
case top
|
|
|
|
case bottom
|
|
}
|
|
|
|
func installToolViewIfNeeded(_ toolView: UIView, position: ToolViewPosition) {
|
|
guard toolView.superview !== self else { return }
|
|
|
|
toolView.removeFromSuperview()
|
|
addSubview(toolView)
|
|
toolView.translatesAutoresizingMaskIntoConstraints = false
|
|
|
|
let heightConstraint: NSLayoutConstraint
|
|
switch position {
|
|
case .top:
|
|
topToolViewHeightConstraint?.isActive = false
|
|
heightConstraint = toolView.heightAnchor.constraint(equalToConstant: resolvedToolViewHeight(for: .top))
|
|
topToolViewHeightConstraint = heightConstraint
|
|
NSLayoutConstraint.activate([
|
|
toolView.leadingAnchor.constraint(equalTo: leadingAnchor),
|
|
toolView.trailingAnchor.constraint(equalTo: trailingAnchor),
|
|
toolView.topAnchor.constraint(equalTo: topAnchor),
|
|
heightConstraint
|
|
])
|
|
case .bottom:
|
|
bottomToolViewHeightConstraint?.isActive = false
|
|
heightConstraint = toolView.heightAnchor.constraint(equalToConstant: resolvedToolViewHeight(for: .bottom))
|
|
bottomToolViewHeightConstraint = heightConstraint
|
|
NSLayoutConstraint.activate([
|
|
toolView.leadingAnchor.constraint(equalTo: leadingAnchor),
|
|
toolView.trailingAnchor.constraint(equalTo: trailingAnchor),
|
|
toolView.bottomAnchor.constraint(equalTo: bottomAnchor),
|
|
heightConstraint
|
|
])
|
|
}
|
|
}
|
|
|
|
func updateToolViewHeightConstraintsIfNeeded() {
|
|
topToolViewHeightConstraint?.constant = resolvedToolViewHeight(for: .top)
|
|
bottomToolViewHeightConstraint?.constant = resolvedToolViewHeight(for: .bottom)
|
|
}
|
|
|
|
private func resolvedToolViewHeight(for position: ToolViewPosition) -> CGFloat {
|
|
let contentHeight: CGFloat = 52
|
|
switch position {
|
|
case .top:
|
|
return safeAreaInsets.top + contentHeight
|
|
case .bottom:
|
|
return safeAreaInsets.bottom + contentHeight
|
|
}
|
|
}
|
|
}
|