eric/technologia-jetpack-compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dm-95

Browse source
This commit is contained in:
Eric85710 2026-06-07 05:44:25 +08:00
parent bf006e6c7e
commit 4b8bfe0128
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_Messaging.kt
View file

@ -141,19 +141,20 @@ fun MessageMessaging(
onDispose { bottomBarViewModel.setVisible(true) } onDispose { bottomBarViewModel.setVisible(true) }
} }
// ✨ 監聽發送狀態，如果失敗了就彈出提示並重置狀態 // 🎯 修正後的發送狀態監聽：只管提示與重置，絕不插手列表刷新！
LaunchedEffect(sendStatus) { LaunchedEffect(sendStatus) {
if (sendStatus is SendMessageState.Error) { when (sendStatus) {
is SendMessageState.Error -> {
val errorMsg = (sendStatus as SendMessageState.Error).message val errorMsg = (sendStatus as SendMessageState.Error).message
Toast.makeText(context, "發送失敗: $errorMsg", Toast.LENGTH_SHORT).show() Toast.makeText(context, "發送失敗: $errorMsg", Toast.LENGTH_SHORT).show()
viewModel.resetSendMessageState() viewModel.resetSendMessageState()
} else if (sendStatus is SendMessageState.Success) { }
// 發送成功後，重置狀態以便下一次發送 is SendMessageState.Success -> {
// ✅ 樂觀更新成功時，Room 內部已經自己把狀態改成 SUCCESS 並藉由 Flow 推送了
// 這裡「完全不需要」再呼叫 viewModel.loadMessages(roomId)！
viewModel.resetSendMessageState() viewModel.resetSendMessageState()
}
// 【優化體驗】：你可以在這裡重新呼叫 viewModel.loadMessages(roomId) 刷新列表 else -> {}
// 或者如果你的 ViewModel 已經會自動把新訊息塞進 uiState，這裡就什麼都不用做。
viewModel.loadMessages(roomId)
} }
} }
@ -183,21 +184,19 @@ fun MessageMessaging(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp) horizontalArrangement = Arrangement.spacedBy(8.dp)
) { ) {
//avatar // 💡 安全優化：用 smart cast 代替強轉
if (uiState is MessagesUiState.Success) { val currentState = uiState
val successState = uiState as MessagesUiState.Success if (currentState is MessagesUiState.Success) {
UserAvatar( UserAvatar(
avatarUrl = successState.partnerAvatarUrl, avatarUrl = currentState.partnerAvatarUrl,
modifier = Modifier.size(36.dp) // 適中的 TopBar 頭像大小 modifier = Modifier.size(36.dp)
) )
} }
Text(text = topBarTitle) Text(text = topBarTitle)
// ✨ 如果是 Success 狀態，且對方是在線狀態（ONLINE），就顯示綠色小圓點 if (currentState is MessagesUiState.Success) {
if (uiState is MessagesUiState.Success) { if (currentState.partnerStatus == UserStatus.ONLINE) {
val successState = uiState as MessagesUiState.Success
if (successState.partnerStatus == UserStatus.ONLINE) {
Box( Box(
modifier = Modifier modifier = Modifier
.size(10.dp) .size(10.dp)

2
app/src/main/java/com/example/login_v3/home/Message/ViewModel/Detail/Message_Cache.kt
View file

@ -27,7 +27,7 @@ data class MessageEntity(
@Dao @Dao
interface MessageDao { interface MessageDao {
// 💡 修正這裡：WHERE 條件欄位改為 chatRoomId // 💡 修正這裡：WHERE 條件欄位改為 chatRoomId
@Query("SELECT * FROM messages WHERE chatRoomId = :roomId ORDER BY createdAt ASC") @Query("SELECT * FROM messages WHERE chatRoomId = :roomId ORDER BY createdAt DESC") // 👈 確保是 DESC（降序）
fun getMessagesFlow(roomId: String): Flow<List<MessageEntity>> fun getMessagesFlow(roomId: String): Flow<List<MessageEntity>>
@Insert(onConflict = OnConflictStrategy.REPLACE) @Insert(onConflict = OnConflictStrategy.REPLACE)