From 0cb65eeaed5966737fda0842a18cef432131b189 Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Fri, 7 Nov 2025 13:47:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../remax/visualnovel/api/service/ChatService.kt | 3 ++- .../visualnovel/repository/api/ChatRepository.kt | 16 ++++++++-------- .../java/com/remax/visualnovel/utils/FileUtil.kt | 5 ++++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/api/service/ChatService.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/api/service/ChatService.kt index b8c0d30..c7430e3 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/api/service/ChatService.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/api/service/ChatService.kt @@ -186,7 +186,8 @@ interface ChatService { @Multipart @POST(BuildConfig.API_BASE + "/file/bgImage/upload") fun uploadCustomBgPic( - @PartMap params: Map, + //@PartMap params: Map, + @Part("userId") userId: RequestBody, @Part file: MultipartBody.Part ): ResponseNew diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/repository/api/ChatRepository.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/repository/api/ChatRepository.kt index 78ba317..2c15927 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/repository/api/ChatRepository.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/repository/api/ChatRepository.kt @@ -1,7 +1,6 @@ package com.remax.visualnovel.repository.api import android.net.Uri -import androidx.core.net.toFile import com.remax.visualnovel.api.service.ChatService import com.remax.visualnovel.entity.request.ChatSetting import com.remax.visualnovel.entity.request.ParamBgUpload @@ -9,9 +8,12 @@ import com.remax.visualnovel.entity.request.ParamLanguage import com.remax.visualnovel.entity.request.ParamSoundList import com.remax.visualnovel.entity.request.ParamUserid import com.remax.visualnovel.entity.request.SimpleDataDTO +import com.remax.visualnovel.entity.response.RespBgUpload +import com.remax.visualnovel.entity.response.basenew.ApiFailedResponse import com.remax.visualnovel.repository.api.base.BaseRepositoryNew import com.remax.visualnovel.ui.wallet.manager.WalletManager import com.remax.visualnovel.utils.FileUtil +import com.remax.visualnovel.utils.FileUtil.toFile import okhttp3.MediaType.Companion.toMediaType import okhttp3.RequestBody import okhttp3.RequestBody.Companion.toRequestBody @@ -56,13 +58,11 @@ class ChatRepository @Inject constructor(private val chatService: ChatService) : fileUri: Uri, param: ParamBgUpload ) = executeHttp { - /*val file = fileUri.toFile()?: - return ApiFailedResponse(1, message = "File not exist")*/ - - val params = mutableMapOf() - params["userId"] = param.userId.toRequestBody(("text/plain").toMediaType()) - val filePart = FileUtil.createFilePart("file", fileUri.toFile()) - chatService.uploadCustomBgPic(params, filePart) + /*val params = mutableMapOf() + params["userId"] = param.userId.toRequestBody(("text/plain").toMediaType())*/ + val idBody = param.userId.toRequestBody(("text/plain").toMediaType()) + val filePart = FileUtil.createFilePart("file", fileUri.toFile)?: return@executeHttp ApiFailedResponse(1, message = "File not exist") + chatService.uploadCustomBgPic(idBody, filePart) } diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/utils/FileUtil.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/utils/FileUtil.kt index 55b283b..b5196f8 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/utils/FileUtil.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/utils/FileUtil.kt @@ -37,7 +37,10 @@ object FileUtil { } } - fun createFilePart(partName: String, file: File): MultipartBody.Part { + fun createFilePart(partName: String, file: File?): MultipartBody.Part? { + if (file == null) { + return null + } val mediaType = getMimeType(file) return MultipartBody.Part.createFormData( partName,