参数更改
This commit is contained in:
parent
a6ccbfa2ba
commit
0cb65eeaed
|
|
@ -186,7 +186,8 @@ interface ChatService {
|
||||||
@Multipart
|
@Multipart
|
||||||
@POST(BuildConfig.API_BASE + "/file/bgImage/upload")
|
@POST(BuildConfig.API_BASE + "/file/bgImage/upload")
|
||||||
fun uploadCustomBgPic(
|
fun uploadCustomBgPic(
|
||||||
@PartMap params: Map<String, RequestBody>,
|
//@PartMap params: Map<String, RequestBody>,
|
||||||
|
@Part("userId") userId: RequestBody,
|
||||||
@Part file: MultipartBody.Part
|
@Part file: MultipartBody.Part
|
||||||
): ResponseNew<RespBgUpload>
|
): ResponseNew<RespBgUpload>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
package com.remax.visualnovel.repository.api
|
package com.remax.visualnovel.repository.api
|
||||||
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import androidx.core.net.toFile
|
|
||||||
import com.remax.visualnovel.api.service.ChatService
|
import com.remax.visualnovel.api.service.ChatService
|
||||||
import com.remax.visualnovel.entity.request.ChatSetting
|
import com.remax.visualnovel.entity.request.ChatSetting
|
||||||
import com.remax.visualnovel.entity.request.ParamBgUpload
|
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.ParamSoundList
|
||||||
import com.remax.visualnovel.entity.request.ParamUserid
|
import com.remax.visualnovel.entity.request.ParamUserid
|
||||||
import com.remax.visualnovel.entity.request.SimpleDataDTO
|
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.repository.api.base.BaseRepositoryNew
|
||||||
import com.remax.visualnovel.ui.wallet.manager.WalletManager
|
import com.remax.visualnovel.ui.wallet.manager.WalletManager
|
||||||
import com.remax.visualnovel.utils.FileUtil
|
import com.remax.visualnovel.utils.FileUtil
|
||||||
|
import com.remax.visualnovel.utils.FileUtil.toFile
|
||||||
import okhttp3.MediaType.Companion.toMediaType
|
import okhttp3.MediaType.Companion.toMediaType
|
||||||
import okhttp3.RequestBody
|
import okhttp3.RequestBody
|
||||||
import okhttp3.RequestBody.Companion.toRequestBody
|
import okhttp3.RequestBody.Companion.toRequestBody
|
||||||
|
|
@ -56,13 +58,11 @@ class ChatRepository @Inject constructor(private val chatService: ChatService) :
|
||||||
fileUri: Uri,
|
fileUri: Uri,
|
||||||
param: ParamBgUpload
|
param: ParamBgUpload
|
||||||
) = executeHttp {
|
) = executeHttp {
|
||||||
/*val file = fileUri.toFile()?:
|
/*val params = mutableMapOf<String, RequestBody>()
|
||||||
return ApiFailedResponse(1, message = "File not exist")*/
|
params["userId"] = param.userId.toRequestBody(("text/plain").toMediaType())*/
|
||||||
|
val idBody = param.userId.toRequestBody(("text/plain").toMediaType())
|
||||||
val params = mutableMapOf<String, RequestBody>()
|
val filePart = FileUtil.createFilePart("file", fileUri.toFile)?: return@executeHttp ApiFailedResponse<RespBgUpload>(1, message = "File not exist")
|
||||||
params["userId"] = param.userId.toRequestBody(("text/plain").toMediaType())
|
chatService.uploadCustomBgPic(idBody, filePart)
|
||||||
val filePart = FileUtil.createFilePart("file", fileUri.toFile())
|
|
||||||
chatService.uploadCustomBgPic(params, filePart)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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)
|
val mediaType = getMimeType(file)
|
||||||
return MultipartBody.Part.createFormData(
|
return MultipartBody.Part.createFormData(
|
||||||
partName,
|
partName,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue