模块化 AppStore 并完善素材管理与个人空间设置。
将会话、权限、位置、收款与排队存储拆分为独立模块,同步更新各 ViewModel 与单元测试,并补充素材管理 UI 与个人空间设置交互。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@ -1057,7 +1057,7 @@ final class WildReportRiskMapViewModel {
|
||||
init() {
|
||||
self.markers = []
|
||||
self.region = Self.region(for: [])
|
||||
let scenicName = AppStore.shared.currentScenicName.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
let scenicName = AppStore.shared.session.currentScenicName.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
self.scenicAreaName = scenicName.isEmpty ? "当前景区" : scenicName
|
||||
self.selectedMarkerID = nil
|
||||
}
|
||||
@ -1203,7 +1203,7 @@ final class WildReportRiskMapViewModel {
|
||||
scenicName: String?,
|
||||
selectCurrentLocation: Bool
|
||||
) async {
|
||||
let resolvedScenicId = scenicId ?? AppStore.shared.currentScenicId
|
||||
let resolvedScenicId = scenicId ?? AppStore.shared.session.currentScenicId
|
||||
guard resolvedScenicId >= 1 else {
|
||||
errorMessage = "请先选择景区后再查看风险地图"
|
||||
notifyStateChange()
|
||||
@ -1244,7 +1244,7 @@ final class WildReportRiskMapViewModel {
|
||||
))
|
||||
scenicAreaName = response.scenicName.nonEmpty
|
||||
?? scenicName?.nonEmpty
|
||||
?? AppStore.shared.currentScenicName.nonEmpty
|
||||
?? AppStore.shared.session.currentScenicName.nonEmpty
|
||||
?? scenicAreaName
|
||||
greenMarkerTip = response.greenMarkerTip
|
||||
legendItems = response.legend
|
||||
@ -1376,7 +1376,7 @@ final class WildReportRiskMapViewModel {
|
||||
for marker: WildReportMapMarker,
|
||||
scenicId: Int?
|
||||
) -> WildReportMarkerDetailRequest? {
|
||||
let resolvedScenicId = scenicId ?? AppStore.shared.currentScenicId
|
||||
let resolvedScenicId = scenicId ?? AppStore.shared.session.currentScenicId
|
||||
guard resolvedScenicId >= 1 else { return nil }
|
||||
let parts = marker.id.split(separator: "-", maxSplits: 1).map(String.init)
|
||||
guard parts.count == 2, let id = Int(parts[1]), id >= 1 else { return nil }
|
||||
|
||||
Reference in New Issue
Block a user