diff --git a/sample-app/src/main/java/com/xuqm/sdk/sample/ui/chat/ChatScreen.kt b/sample-app/src/main/java/com/xuqm/sdk/sample/ui/chat/ChatScreen.kt index 50f17b0..44980aa 100644 --- a/sample-app/src/main/java/com/xuqm/sdk/sample/ui/chat/ChatScreen.kt +++ b/sample-app/src/main/java/com/xuqm/sdk/sample/ui/chat/ChatScreen.kt @@ -433,8 +433,9 @@ fun ChatScreen( color = MaterialTheme.colorScheme.outline, ) } - }, - content = { padding -> + } + } + ) { padding -> Column( modifier = Modifier .fillMaxSize() @@ -512,7 +513,6 @@ fun ChatScreen( } } } -) } private enum class CameraAction { PHOTO, VIDEO } diff --git a/sdk-im/src/main/java/com/xuqm/sdk/im/ImSDK.kt b/sdk-im/src/main/java/com/xuqm/sdk/im/ImSDK.kt index 0a78f0b..16096af 100644 --- a/sdk-im/src/main/java/com/xuqm/sdk/im/ImSDK.kt +++ b/sdk-im/src/main/java/com/xuqm/sdk/im/ImSDK.kt @@ -414,7 +414,7 @@ object ImSDK { endTime?.toString(), page, size, - ).data ?: emptyList() + ).data?.content ?: emptyList() } suspend fun fetchGroupHistory(groupId: String, page: Int = 0, size: Int = 20): List = @@ -439,7 +439,7 @@ object ImSDK { endTime?.toString(), page, size, - ).data ?: emptyList() + ).data?.content ?: emptyList() } suspend fun locateHistoryPage( diff --git a/sdk-im/src/main/java/com/xuqm/sdk/im/api/ImApi.kt b/sdk-im/src/main/java/com/xuqm/sdk/im/api/ImApi.kt index 5240b48..f994f78 100644 --- a/sdk-im/src/main/java/com/xuqm/sdk/im/api/ImApi.kt +++ b/sdk-im/src/main/java/com/xuqm/sdk/im/api/ImApi.kt @@ -62,7 +62,7 @@ interface ImApi { @Query("endTime") endTime: String? = null, @Query("page") page: Int, @Query("size") size: Int, - ): ApiResponse> + ): ApiResponse> @GET("api/im/messages/group-history/{groupId}") suspend fun fetchGroupHistory( @@ -74,7 +74,7 @@ interface ImApi { @Query("endTime") endTime: String? = null, @Query("page") page: Int, @Query("size") size: Int, - ): ApiResponse> + ): ApiResponse> @GET("api/im/groups") suspend fun listGroups(@Query("appId") appId: String): ApiResponse>