Ling0925
/
TiebaLite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 贴子页面闪退

This commit is contained in:
HuanCheng65 2023-07-23 20:00:29 +08:00
parent 878e8ba8f1
commit 7460a0cd29
No known key found for this signature in database
GPG Key ID: 5EC9DD60A32C7360
2 changed files with 19 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/src/main/java/com/huanchengfly/tieba/post/ui/page/thread/ThreadPage.kt
View File

@ -25,7 +25,7 @@ import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.appendInlineContent
@ -433,14 +433,6 @@ fun ThreadPage(
prop1 = ThreadUiState::data,
initial = persistentListOf()
)
val contentRenders by viewModel.uiState.collectPartialAsState(
prop1 = ThreadUiState::contentRenders,
initial = persistentListOf()
)
val subPostContents by viewModel.uiState.collectPartialAsState(
prop1 = ThreadUiState::subPostContents,
initial = persistentListOf()
)
val author by viewModel.uiState.collectPartialAsState(
prop1 = ThreadUiState::author,
initial = null
@ -521,14 +513,6 @@ fun ThreadPage(
prop1 = ThreadUiState::latestPosts,
initial = persistentListOf()
)
val latestPostContentRenders by viewModel.uiState.collectPartialAsState(
prop1 = ThreadUiState::latestPostContentRenders,
initial = persistentListOf()
)
val latestPostSubPostContents by viewModel.uiState.collectPartialAsState(
prop1 = ThreadUiState::latestPostSubPostContents,
initial = persistentListOf()
)
val isEmpty by remember {
derivedStateOf { data.isEmpty() && firstPost == null }
@ -621,18 +605,19 @@ fun ThreadPage(
onGlobalEvent<GlobalEvent.ReplySuccess>(
filter = { it.threadId == threadId }
) {
) { event ->
viewModel.send(
ThreadUiIntent.LoadLatestReply(
threadId = threadId,
postId = it.newPostId,
postId = event.newPostId,
forumId = curForumId,
isDesc = curSortType == ThreadSortType.SORT_TYPE_DESC,
curLatestPostFloor = if (curSortType == ThreadSortType.SORT_TYPE_DESC) {
data.firstOrNull()?.post?.get { floor } ?: 1
} else {
data.lastOrNull()?.post?.get { floor } ?: 1
}
},
curPostIds = data.map { it.post.get { id } },
)
)
}
@ -935,14 +920,14 @@ fun ThreadPage(
}
}
}
itemsIndexed(
items(
items = latestPosts,
key = { _, (item) -> "LatestPost_${item.get { id }}" }
) { index, (item, blocked) ->
key = { (item) -> "LatestPost_${item.get { id }}" }
) { (item, blocked, renders, subPostContents) ->
PostCard(
item,
latestPostContentRenders[index],
latestPostSubPostContents[index],
renders,
subPostContents,
blocked
)
}
@ -1029,7 +1014,7 @@ fun ThreadPage(
)
}
} else {
val readItem = getLastVisibilityPost()
val readItem = lastVisibilityPost
if (readItem != null) {
viewModel.send(
ThreadUiIntent.AddFavorite(
@ -1308,14 +1293,14 @@ fun ThreadPage(
}
}
}
itemsIndexed(
items(
items = data,
key = { _, (item) -> "Post_${item.get { id }}" }
) { index, (item, blocked) ->
key = { (item) -> "Post_${item.get { id }}" }
) { (item, blocked, renders, subPostContents) ->
PostCard(
item,
contentRenders[index],
subPostContents[index],
renders,
subPostContents,
blocked
)
}

48
app/src/main/java/com/huanchengfly/tieba/post/ui/page/thread/ThreadViewModel.kt
View File

@ -623,11 +623,7 @@ sealed interface ThreadPartialChange : PartialChange<ThreadUiState> {
hasPrevious = hasPrevious,
firstPostContentRenders = firstPostContentRenders?.toImmutableList()
?: oldState.firstPostContentRenders,
contentRenders = contentRenders.toImmutableList(),
subPostContents = subPostContents.toImmutableList(),
latestPosts = persistentListOf(),
latestPostContentRenders = persistentListOf(),
latestPostSubPostContents = persistentListOf(),
postId = postId,
seeLz = seeLz,
sortType = sortType,
@ -687,11 +683,7 @@ sealed interface ThreadPartialChange : PartialChange<ThreadUiState> {
nextPagePostId = nextPagePostId,
hasPrevious = hasPrevious,
firstPostContentRenders = firstPostContentRenders.toImmutableList(),
contentRenders = contentRenders.toImmutableList(),
subPostContents = subPostContents.toImmutableList(),
latestPosts = persistentListOf(),
latestPostContentRenders = persistentListOf(),
latestPostSubPostContents = persistentListOf(),
postId = postId,
seeLz = seeLz,
sortType = sortType,
@ -741,11 +733,7 @@ sealed interface ThreadPartialChange : PartialChange<ThreadUiState> {
totalPage = totalPage,
hasMore = hasMore,
nextPagePostId = nextPagePostId,
contentRenders = (oldState.contentRenders + contentRenders).toImmutableList(),
subPostContents = (oldState.subPostContents + subPostContents).toImmutableList(),
latestPosts = persistentListOf(),
latestPostContentRenders = persistentListOf(),
latestPostSubPostContents = persistentListOf(),
)
is Failure -> oldState.copy(isLoadingMore = false)
@ -782,8 +770,6 @@ sealed interface ThreadPartialChange : PartialChange<ThreadUiState> {
currentPageMin = currentPage,
totalPage = totalPage,
hasPrevious = hasPrevious,
contentRenders = (contentRenders + oldState.contentRenders).toImmutableList(),
subPostContents = (subPostContents + oldState.subPostContents).toImmutableList()
)
is Failure -> oldState.copy(isRefreshing = false)
@ -823,14 +809,6 @@ sealed interface ThreadPartialChange : PartialChange<ThreadUiState> {
val replaceIndex = replacePostIndexes.firstOrNull { it.first == index }
if (replaceIndex != null) posts[replaceIndex.second] else oldItem
}
val newContentRenders = oldState.contentRenders.mapIndexed { index, oldItem ->
val replaceIndex = replacePostIndexes.firstOrNull { it.first == index }
if (replaceIndex != null) contentRenders[replaceIndex.second] else oldItem
}
val newSubPostContents = oldState.subPostContents.mapIndexed { index, oldItem ->
val replaceIndex = replacePostIndexes.firstOrNull { it.first == index }
if (replaceIndex != null) subPostContents[replaceIndex.second] else oldItem
}
when {
hasNewPost && continuous && isDesc -> {
oldState.copy(
@ -839,11 +817,7 @@ sealed interface ThreadPartialChange : PartialChange<ThreadUiState> {
error = null,
anti = anti.wrapImmutable(),
data = (posts + newPost).toImmutableList(),
contentRenders = (contentRenders + newContentRenders).toImmutableList(),
subPostContents = (subPostContents + newSubPostContents).toImmutableList(),
latestPosts = persistentListOf(),
latestPostContentRenders = persistentListOf(),
latestPostSubPostContents = persistentListOf(),
)
}
@ -854,11 +828,7 @@ sealed interface ThreadPartialChange : PartialChange<ThreadUiState> {
error = null,
anti = anti.wrapImmutable(),
data = (newPost + posts).toImmutableList(),
contentRenders = (newContentRenders + contentRenders).toImmutableList(),
subPostContents = (newSubPostContents + subPostContents).toImmutableList(),
latestPosts = persistentListOf(),
latestPostContentRenders = persistentListOf(),
latestPostSubPostContents = persistentListOf(),
)
}
@ -869,11 +839,7 @@ sealed interface ThreadPartialChange : PartialChange<ThreadUiState> {
error = null,
anti = anti.wrapImmutable(),
data = newPost.toImmutableList(),
contentRenders = newContentRenders.toImmutableList(),
subPostContents = newSubPostContents.toImmutableList(),
latestPosts = posts.toImmutableList(),
latestPostContentRenders = contentRenders.toImmutableList(),
latestPostSubPostContents = subPostContents.toImmutableList(),
)
}
@ -884,11 +850,7 @@ sealed interface ThreadPartialChange : PartialChange<ThreadUiState> {
error = null,
anti = anti.wrapImmutable(),
data = newPost.toImmutableList(),
contentRenders = newContentRenders.toImmutableList(),
subPostContents = newSubPostContents.toImmutableList(),
latestPosts = persistentListOf(),
latestPostContentRenders = persistentListOf(),
latestPostSubPostContents = persistentListOf(),
)
}
@ -1088,8 +1050,6 @@ sealed interface ThreadPartialChange : PartialChange<ThreadUiState> {
val deletedPostIndex = oldState.data.indexOfFirst { it.post.get { id } == postId }
oldState.copy(
data = oldState.data.removeAt(deletedPostIndex),
contentRenders = oldState.contentRenders.removeAt(deletedPostIndex),
subPostContents = oldState.subPostContents.removeAt(deletedPostIndex)
)
}
@ -1146,11 +1106,7 @@ data class ThreadUiState(
val firstPostContentRenders: ImmutableList<PbContentRender> = persistentListOf(),
val data: ImmutableList<PostItemData> = persistentListOf(),
val contentRenders: ImmutableList<ImmutableList<PbContentRender>> = persistentListOf(),
val subPostContents: ImmutableList<ImmutableList<AnnotatedString>> = persistentListOf(),
val latestPosts: ImmutableList<PostItemData> = persistentListOf(),
val latestPostContentRenders: ImmutableList<ImmutableList<PbContentRender>> = persistentListOf(),
val latestPostSubPostContents: ImmutableList<ImmutableList<AnnotatedString>> = persistentListOf(),
val isImmersiveMode: Boolean = false,
) : UiState
@ -1179,5 +1135,7 @@ object ThreadSortType {
@Immutable
data class PostItemData(
val post: ImmutableHolder<Post>,
val blocked: Boolean = post.get { shouldBlock() }
val blocked: Boolean = post.get { shouldBlock() },
val contentRenders: ImmutableList<PbContentRender> = post.get { this.contentRenders },
val subPostContents: ImmutableList<AnnotatedString> = post.get { this.subPostContents },
)