Skip to content

Commit 9913d30

Browse files
110110
committed
format
1 parent e5eebcc commit 9913d30

File tree

7 files changed

+38
-48
lines changed

7 files changed

+38
-48
lines changed

‎iosApp/iosApp.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@
574574
CODE_SIGN_IDENTITY = "Apple Development";
575575
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
576576
CODE_SIGN_STYLE = Automatic;
577-
CURRENT_PROJECT_VERSION = 2025080701;
577+
CURRENT_PROJECT_VERSION = 2025081601;
578578
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
579579
DEVELOPMENT_TEAM = 7LFDZ96332;
580580
ENABLE_PREVIEWS = YES;
@@ -622,7 +622,7 @@
622622
CODE_SIGN_IDENTITY = "Apple Development";
623623
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
624624
CODE_SIGN_STYLE = Automatic;
625-
CURRENT_PROJECT_VERSION = 2025080701;
625+
CURRENT_PROJECT_VERSION = 2025081601;
626626
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
627627
DEVELOPMENT_TEAM = 7LFDZ96332;
628628
ENABLE_PREVIEWS = YES;

‎iosApp/iosApp/UI/Page/Compose/Timeline/TimelineStatus/TimelineActionsViewV2.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ struct TimelineActionsViewV2: View, Equatable {
103103
FlareLog.debug("🔥 [TimelineActionsViewV2] handleLikeAction called for item: \(item.id)")
104104
FlareLog.debug("🔍 [TimelineActionsViewV2] handleLikeAction called for item: isLiked=\(item.isLiked), likeCount=\(item.likeCount)")
105105

106-
// timelineViewModel?.updateItemOptimistically(itemId: item.id, actionType: .like)
106+
// timelineViewModel?.updateItemOptimistically(itemId: item.id, actionType: .like)
107107

108108
// for action in item.actions {
109109
// let enumResult = onEnum(of: action)
@@ -142,7 +142,7 @@ struct TimelineActionsViewV2: View, Equatable {
142142
private func handleBookmarkAction() {
143143
FlareLog.debug("🔥 [TimelineActionsViewV2] handleBookmarkAction called for item: \(item.id)")
144144

145-
// timelineViewModel?.updateItemOptimistically(itemId: item.id, actionType: .bookmark)
145+
// timelineViewModel?.updateItemOptimistically(itemId: item.id, actionType: .bookmark)
146146

147147
performKMPAction(actionType: .bookmark)
148148
}

‎iosApp/iosApp/UI/Page/DataLayer/PagingStateConverter.swift‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,8 @@ class PagingStateConverter {
162162
successState: successState
163163
)
164164

165-
166-
167165
updateExistingItems(with: updatedItems)
168166

169-
170167
FlareLog.debug("[PagingStateConverter] 正常增量转换完成: 更新 \(updatedItems.count) 个items, 新增 \(incrementalItems.count) 个items")
171168

172169
} else {
@@ -417,11 +414,9 @@ class PagingStateConverter {
417414
return (updatedItems, newItems)
418415
}
419416

420-
421417
private func findUpdatedItems(
422418
successState: PagingStateSuccess<UiTimeline>
423419
) -> [TimelineItem] {
424-
425420
var existingItemsMap: [String: TimelineItem] = [:]
426421
for item in convertedItems {
427422
if existingItemsMap[item.id] != nil {
@@ -432,14 +427,12 @@ class PagingStateConverter {
432427

433428
FlareLog.debug("[PagingStateConverter] findUpdatedItems - 开始遍历KMP数据，总数: \(successState.itemCount)")
434429

435-
436430
var updatedItems: [TimelineItem] = []
437-
for index in 0..<successState.itemCount {
431+
for index in 0 ..< successState.itemCount {
438432
if let uiTimeline = safePeek(successState, index: Int32(index)) {
439433
let kmpItem = TimelineItem.from(uiTimeline)
440-
441-
if let existingItem = existingItemsMap[kmpItem.id] {
442434

435+
if let existingItem = existingItemsMap[kmpItem.id] {
443436
if hasOperationStateChanged(existing: existingItem, new: kmpItem) {
444437
updatedItems.append(kmpItem)
445438
FlareLog.debug("[PagingStateConverter] findUpdatedItems - 发现需要更新的item: \(kmpItem.id)")

‎iosApp/iosApp/UI/Page/Home/Model/TimelineViewModel.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ class TimelineViewModel {
2121
private(set) var isLoadingMore: Bool = false
2222
// private var isLoadMoreInProgress: Bool = false
2323

24-
var scrollToId: String = ""
24+
var scrollToId: String = ""
2525

2626
// @ObservationIgnored
2727
// private var visibleItems: [TimelineItem] = []
28-
//
29-
// private let visibilityQueue = DispatchQueue(label: "timeline.visibility", qos: .userInitiated)
28+
//
29+
// private let visibilityQueue = DispatchQueue(label: "timeline.visibility", qos: .userInitiated)
3030

31-
3231
var hasMore: Bool {
3332
if case let .loaded(_, hasMore) = timelineState {
3433
return hasMore
@@ -267,7 +266,7 @@ class TimelineViewModel {
267266
FlareLog.debug("🚨 [Timeline ViewModel] Error state set - showErrorAlert: true")
268267
}
269268
}
270-
269+
271270
func handleError(_ error: FlareError) {
272271
FlareLog.error("[TimelineViewModel] 处理错误: \(error)")
273272
currentError = error
@@ -284,7 +283,7 @@ class TimelineViewModel {
284283
}
285284
}
286285

287-
func handleLoadMore(scrollToId : String) async {
286+
func handleLoadMore(scrollToId: String) async {
288287
let timestamp = Date().timeIntervalSince1970
289288
FlareLog.debug("📄 [Timeline ViewModel] handleLoadMore started - isLoadingMore: \(isLoadingMore), hasPresenter: \(presenter != nil), timestamp: \(timestamp)")
290289

@@ -299,7 +298,7 @@ class TimelineViewModel {
299298
}
300299

301300
isLoadingMore = true
302-
301+
303302
// isLoadMoreInProgress = true
304303
FlareLog
305304
.debug(
@@ -327,16 +326,17 @@ class TimelineViewModel {
327326
// {
328327
// FlareLog.debug("🎯 [Timeline ViewModel] 恢复滚动位置到: \(topItem.id)")
329328
// if (isBottom == true){
330-
DispatchQueue.main.asyncAfter(deadline: .now() ) {
331-
self.scrollTo(itemId: scrollToId)
332-
}
329+
DispatchQueue.main.asyncAfter(deadline: .now()) {
330+
self.scrollTo(itemId: scrollToId)
331+
}
333332
// }
334333
// }
335334
} catch {
336335
let errorTimestamp = Date().timeIntervalSince1970
337336
FlareLog.error("💥 [Timeline ViewModel] handleLoadMore failed - error: \(error), timestamp: \(errorTimestamp)")
338337
}
339338
}
339+
340340
//
341341
func clearScrollTarget() {
342342
FlareLog.debug("[TimelineViewModel] 清除滚动目标")

‎iosApp/iosApp/UI/Page/Home/View/TimelineViewSwiftUI/TimelineItemsView.swift‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ struct TimelineItemsView: View {
1414
item: item,
1515
timelineViewModel: viewModel
1616
).id(item.id)
17-
.padding(.horizontal, 16)
17+
.padding(.horizontal, 16)
1818
.padding(.vertical, 4)
1919
.onAppear {
20-
// viewModel.itemOnAppear(item: item)
20+
// viewModel.itemOnAppear(item: item)
2121
FlareLog.debug("🔍 [TimelineItemsView] onAppear for id: '\(item.id)', content: '\(item.content.raw)'")
2222

2323
// Task {
@@ -39,15 +39,14 @@ struct TimelineItemsView: View {
3939
}
4040
.onDisappear {
4141
FlareLog.debug("🔍 [TimelineItemsView] onDisappear for id: '\(item.id)'")
42-
// viewModel.itemDidDisappear(item: item)
42+
// viewModel.itemDidDisappear(item: item)
4343
}
4444
}
4545

4646
if hasMore {
47-
4847
TimelineLoadMoreView {
4948
FlareLog.debug("[TimelineItemsView] LoadMoreView触发handleLoadMore")
50-
FlareLog.debug("🔍 [TimelineItemsView] onDisappear for items.last?.id: '\(items.last?.id )'")
49+
FlareLog.debug("🔍 [TimelineItemsView] onDisappear for items.last?.id: '\(items.last?.id)'")
5150

5251
try await viewModel.handleLoadMore(scrollToId: items.last?.id ?? "")
5352
}

‎iosApp/iosApp/UI/Page/Home/View/TimelineViewSwiftUI/TimelineViewSwiftUIV4.swift‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,15 @@ struct TimelineViewSwiftUIV4: View {
9494
}
9595
}
9696
.onChange(
97-
of: timeLineViewModel.timelineState.itemCount) { _, newValue in
98-
99-
FlareLog.debug("🔍 [TimelineViewSwiftUIV4] timeLineViewModel.scrollToId: '\(timeLineViewModel.scrollToId)'")
100-
FlareLog.debug("🔍 [TimelineViewSwiftUIV4] timeLineViewModel.timelineState.itemCount newValue: '\(newValue)'")
97+
of: timeLineViewModel.timelineState.itemCount)
98+
{ _, newValue in
99+
FlareLog.debug("🔍 [TimelineViewSwiftUIV4] timeLineViewModel.scrollToId: '\(timeLineViewModel.scrollToId)'")
100+
FlareLog.debug("🔍 [TimelineViewSwiftUIV4] timeLineViewModel.timelineState.itemCount newValue: '\(newValue)'")
101+
102+
if timeLineViewModel.scrollToId == "" {
103+
return
104+
}
101105

102-
if (timeLineViewModel.scrollToId == ""){
103-
return
104-
}
105-
106106
// let currentVisibleIds = timeLineViewModel.getCurrentVisibleItemIds()
107107
//
108108
// if currentVisibleIds
@@ -111,19 +111,18 @@ struct TimelineViewSwiftUIV4: View {
111111
//
112112
// timeLineViewModel.clearScrollTarget()
113113
// } else {
114-
withAnimation(.easeInOut(duration: 0.3)) {
115-
FlareLog.debug("🔍 [TimelineViewSwiftUIV4] proxy.scrollTo timeLineViewModel.scrollToId: '\(timeLineViewModel.scrollToId)'")
114+
withAnimation(.easeInOut(duration: 0.3)) {
115+
FlareLog.debug("🔍 [TimelineViewSwiftUIV4] proxy.scrollTo timeLineViewModel.scrollToId: '\(timeLineViewModel.scrollToId)'")
116116

117-
proxy.scrollTo(timeLineViewModel.scrollToId, anchor: .top)
118-
}
117+
proxy.scrollTo(timeLineViewModel.scrollToId, anchor: .top)
118+
}
119119

120-
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
121-
FlareLog.debug("🔍 [TimelineViewSwiftUIV4] proxy.scrollTo timeLineViewModel.clearScrollTarget timeLineViewModel.scrollToId: '\(timeLineViewModel.scrollToId)'")
120+
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
121+
FlareLog.debug("🔍 [TimelineViewSwiftUIV4] proxy.scrollTo timeLineViewModel.clearScrollTarget timeLineViewModel.scrollToId: '\(timeLineViewModel.scrollToId)'")
122122

123-
timeLineViewModel.clearScrollTarget()
124-
}
123+
timeLineViewModel.clearScrollTarget()
124+
}
125125
// }
126-
127126
}
128127
.task(id: tab.key) {
129128
let timestamp = Date().timeIntervalSince1970

‎iosApp/iosApp/UI/Page/Status/StatusDetailScreenV2.swift‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,15 @@ struct StatusDetailScreenV2: View {
2222

2323
switch timelineViewModel.timelineState {
2424
case .loading:
25-
if let preloadItem = preloadItem {
26-
25+
if let preloadItem {
2726
TimelineStatusViewV2(
2827
item: preloadItem,
2928
timelineViewModel: timelineViewModel
3029
)
3130
.listRowBackground(theme.primaryBackgroundColor)
3231
.listRowInsets(EdgeInsets())
3332
.listRowSeparator(.hidden)
34-
} else {
33+
} else {
3534
ForEach(0 ..< 5, id: \.self) { _ in
3635
TimelineStatusViewV2(
3736
item: createSampleTimelineItem(),

0 commit comments

Comments
 (0)