auth to server-V70

This commit is contained in:
Eric85710 2026-05-08 16:05:54 +08:00
parent 041fa0bd9c
commit 142b6b337d
2 changed files with 10 additions and 8 deletions

View file

@ -42,27 +42,27 @@ val Friend.fullFriendsAvatarUrl: Any
//friends pending request //friends pending request
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
data class PendingFriendsResponse( data class PendingFriendsResponse(
@field:Json(name = "pending") @Json(name = "pending") // 移除 field:
val pendingRequests: List<PendingFriendApiModel> val pendingRequests: List<PendingFriendApiModel>
) )
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
data class PendingFriendApiModel( data class PendingFriendApiModel(
@field:Json(name = "friendship_id") @Json(name = "friendship_id")
val friendshipId: String?, val friendshipId: String?,
val username: String?, val username: String?,
@field:Json(name = "display_name") @Json(name = "display_name")
val displayName: String, val displayName: String?, // 建議改為可空,比較保險
@field:Json(name = "avatar_url") @Json(name = "avatar_url")
val pendingAvatarUrl: String?, val pendingAvatarUrl: String?,
@field:Json(name = "from_user_id") @Json(name = "from_user_id")
val fromUserId: String?, val fromUserId: String?,
@field:Json(name = "created_at") @Json(name = "created_at")
val createdAt: String? val createdAt: String?
) )

View file

@ -1,5 +1,6 @@
package com.example.login_v3.home.Message.UI.Detail package com.example.login_v3.home.Message.UI.Detail
import android.util.Log
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
@ -24,6 +25,7 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
@ -152,7 +154,7 @@ fun FriendRow(friend: Friend) {
@Composable @Composable
fun PendingFriendRow(request: PendingFriendApiModel) { fun PendingFriendRow(request: PendingFriendApiModel) {
ListItem( ListItem(
headlineContent = { Text(request.displayName) }, headlineContent = { Text("${request.displayName}") },
supportingContent = { Text("想加你為好友") }, supportingContent = { Text("想加你為好友") },
leadingContent = { leadingContent = {
AsyncImage( AsyncImage(