fix: refresh travel albums after OTG return

This commit is contained in:
2026-08-14 16:46:05 +08:00
parent 83afcb6deb
commit 8e444f7434
3 changed files with 75 additions and 3 deletions
@@ -7,6 +7,27 @@ import Kingfisher
import SnapKit
import UIKit
/// 相册页面的一次性返回刷新状态,避免初次展示或重复出现时多发列表请求。
struct TravelAlbumReturnRefreshState {
private var needsRefresh = false
private(set) var suppressesSnapshotAnimations = false
mutating func markRefreshNeeded() {
needsRefresh = true
}
mutating func beginRefreshIfNeeded() -> Bool {
guard needsRefresh else { return false }
needsRefresh = false
suppressesSnapshotAnimations = true
return true
}
mutating func finishRefresh() {
suppressesSnapshotAnimations = false
}
}
/// 新增相册入口页,对齐 Android `TravelAlbumEntryScreen`。
final class TravelAlbumEntryViewController: BaseViewController {
private let viewModel = TravelAlbumEntryViewModel()
@@ -17,6 +38,7 @@ final class TravelAlbumEntryViewController: BaseViewController {
private let tableView = UITableView(frame: .zero, style: .plain)
private let emptyView = TravelAlbumEmptyView()
private var dataSource: UITableViewDiffableDataSource<Int, TravelAlbum>!
private var refreshState = TravelAlbumReturnRefreshState()
init(api: (any TravelAlbumServing)? = nil) {
self.api = api ?? NetworkServices.shared.travelAlbumAPI
@@ -99,6 +121,18 @@ final class TravelAlbumEntryViewController: BaseViewController {
Task { await viewModel.loadAlbums(api: api) }
}
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
guard refreshState.beginRefreshIfNeeded() else { return }
Task {
await viewModel.loadAlbums(api: api)
await MainActor.run {
self.applyViewModel()
self.refreshState.finishRefresh()
}
}
}
@MainActor
private func applyViewModel() {
heroCard.isLoading = viewModel.isCreating
@@ -109,7 +143,10 @@ final class TravelAlbumEntryViewController: BaseViewController {
var snapshot = NSDiffableDataSourceSnapshot<Int, TravelAlbum>()
snapshot.appendSections([0])
snapshot.appendItems(viewModel.albums)
dataSource.apply(snapshot, animatingDifferences: true)
dataSource.apply(
snapshot,
animatingDifferences: !refreshState.suppressesSnapshotAnimations
)
if viewModel.isLoading && viewModel.albums.isEmpty {
showLoading()
} else {
@@ -162,6 +199,7 @@ final class TravelAlbumEntryViewController: BaseViewController {
}
private func pushWiredTransfer(album: TravelAlbum) {
refreshState.markRefreshNeeded()
let controller = WiredCameraTransferViewController(
viewModel: WiredCameraTransferViewModel(
albumId: album.id,
@@ -177,7 +215,11 @@ extension TravelAlbumEntryViewController: UITableViewDelegate {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true)
guard let album = dataSource.itemIdentifier(for: indexPath) else { return }
navigationController?.pushViewController(TravelAlbumDetailViewController(albumId: album.id), animated: true)
refreshState.markRefreshNeeded()
navigationController?.pushViewController(
TravelAlbumDetailViewController(albumId: album.id, api: api),
animated: true
)
}
}