From 142b6b337d8f832c444bbeffeebb4c431736c49c Mon Sep 17 00:00:00 2001 From: Eric85710 Date: Fri, 8 May 2026 16:05:54 +0800 Subject: [PATCH] auth to server-V70 --- .../login_v3/data/api/api_class/FriendRequest.kt | 14 +++++++------- .../home/Message/UI/Detail/Message_contact_list.kt | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/example/login_v3/data/api/api_class/FriendRequest.kt b/app/src/main/java/com/example/login_v3/data/api/api_class/FriendRequest.kt index 84698e6..1481c61 100644 --- a/app/src/main/java/com/example/login_v3/data/api/api_class/FriendRequest.kt +++ b/app/src/main/java/com/example/login_v3/data/api/api_class/FriendRequest.kt @@ -42,27 +42,27 @@ val Friend.fullFriendsAvatarUrl: Any //friends pending request @JsonClass(generateAdapter = true) data class PendingFriendsResponse( - @field:Json(name = "pending") + @Json(name = "pending") // 移除 field: val pendingRequests: List ) @JsonClass(generateAdapter = true) data class PendingFriendApiModel( - @field:Json(name = "friendship_id") + @Json(name = "friendship_id") val friendshipId: String?, val username: String?, - @field:Json(name = "display_name") - val displayName: String, + @Json(name = "display_name") + val displayName: String?, // 建議改為可空,比較保險 - @field:Json(name = "avatar_url") + @Json(name = "avatar_url") val pendingAvatarUrl: String?, - @field:Json(name = "from_user_id") + @Json(name = "from_user_id") val fromUserId: String?, - @field:Json(name = "created_at") + @Json(name = "created_at") val createdAt: String? ) diff --git a/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_contact_list.kt b/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_contact_list.kt index c50f29a..c77bdb3 100644 --- a/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_contact_list.kt +++ b/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_contact_list.kt @@ -1,5 +1,6 @@ package com.example.login_v3.home.Message.UI.Detail +import android.util.Log import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -24,6 +25,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -152,7 +154,7 @@ fun FriendRow(friend: Friend) { @Composable fun PendingFriendRow(request: PendingFriendApiModel) { ListItem( - headlineContent = { Text(request.displayName) }, + headlineContent = { Text("${request.displayName}") }, supportingContent = { Text("想加你為好友") }, leadingContent = { AsyncImage(