diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index bfd488f..bab33f4 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.R import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter +import com.casic.br.extensions.combineImagePath import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant @@ -139,7 +140,7 @@ .into(userAvatarView) } else { Glide.with(this) - .load(currentUser.avatar) + .load(currentUser.avatar.combineImagePath()) .apply(RequestOptions.circleCropTransform()) .placeholder(R.mipmap.load_image_error) .into(userAvatarView) diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index bfd488f..bab33f4 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.R import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter +import com.casic.br.extensions.combineImagePath import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant @@ -139,7 +140,7 @@ .into(userAvatarView) } else { Glide.with(this) - .load(currentUser.avatar) + .load(currentUser.avatar.combineImagePath()) .apply(RequestOptions.circleCropTransform()) .placeholder(R.mipmap.load_image_error) .into(userAvatarView) diff --git a/app/src/main/java/com/casic/br/model/ImageResultModel.java b/app/src/main/java/com/casic/br/model/ImageResultModel.java new file mode 100644 index 0000000..06de7c8 --- /dev/null +++ b/app/src/main/java/com/casic/br/model/ImageResultModel.java @@ -0,0 +1,62 @@ +package com.casic.br.model; + +public class ImageResultModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private String fileId; + private String fileName; + + public String getFileId() { + return fileId; + } + + public void setFileId(String fileId) { + this.fileId = fileId; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + } +} diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index bfd488f..bab33f4 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.R import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter +import com.casic.br.extensions.combineImagePath import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant @@ -139,7 +140,7 @@ .into(userAvatarView) } else { Glide.with(this) - .load(currentUser.avatar) + .load(currentUser.avatar.combineImagePath()) .apply(RequestOptions.circleCropTransform()) .placeholder(R.mipmap.load_image_error) .into(userAvatarView) diff --git a/app/src/main/java/com/casic/br/model/ImageResultModel.java b/app/src/main/java/com/casic/br/model/ImageResultModel.java new file mode 100644 index 0000000..06de7c8 --- /dev/null +++ b/app/src/main/java/com/casic/br/model/ImageResultModel.java @@ -0,0 +1,62 @@ +package com.casic.br.model; + +public class ImageResultModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private String fileId; + private String fileName; + + public String getFileId() { + return fileId; + } + + public void setFileId(String fileId) { + this.fileId = fileId; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + } +} diff --git a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt index 6495d77..16b4e19 100644 --- a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt @@ -100,8 +100,5 @@ */ @Multipart @POST("/file/uploadFile") - suspend fun uploadImage( - @Header("token") token: String, - @Part file: MultipartBody.Part - ): String + suspend fun uploadImage(@Part file: MultipartBody.Part): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index bfd488f..bab33f4 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.R import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter +import com.casic.br.extensions.combineImagePath import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant @@ -139,7 +140,7 @@ .into(userAvatarView) } else { Glide.with(this) - .load(currentUser.avatar) + .load(currentUser.avatar.combineImagePath()) .apply(RequestOptions.circleCropTransform()) .placeholder(R.mipmap.load_image_error) .into(userAvatarView) diff --git a/app/src/main/java/com/casic/br/model/ImageResultModel.java b/app/src/main/java/com/casic/br/model/ImageResultModel.java new file mode 100644 index 0000000..06de7c8 --- /dev/null +++ b/app/src/main/java/com/casic/br/model/ImageResultModel.java @@ -0,0 +1,62 @@ +package com.casic.br.model; + +public class ImageResultModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private String fileId; + private String fileName; + + public String getFileId() { + return fileId; + } + + public void setFileId(String fileId) { + this.fileId = fileId; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + } +} diff --git a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt index 6495d77..16b4e19 100644 --- a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt @@ -100,8 +100,5 @@ */ @Multipart @POST("/file/uploadFile") - suspend fun uploadImage( - @Header("token") token: String, - @Part file: MultipartBody.Part - ): String + suspend fun uploadImage(@Part file: MultipartBody.Part): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt index 344bd26..a31d9c3 100644 --- a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt @@ -8,7 +8,7 @@ import okhttp3.MediaType.Companion.toMediaType import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody -import okhttp3.RequestBody +import okhttp3.RequestBody.Companion.asRequestBody import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject import java.io.File @@ -203,8 +203,8 @@ * 上传图片 */ suspend fun uploadImage(image: File): String { - val requestBody = RequestBody.create("image/png".toMediaTypeOrNull(), image) + val requestBody = image.asRequestBody("image/jpeg".toMediaTypeOrNull()) val imagePart = MultipartBody.Part.createFormData("file", image.name, requestBody) - return api.uploadImage(AuthenticationHelper.token!!, imagePart) + return api.uploadImage(imagePart) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index bfd488f..bab33f4 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.R import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter +import com.casic.br.extensions.combineImagePath import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant @@ -139,7 +140,7 @@ .into(userAvatarView) } else { Glide.with(this) - .load(currentUser.avatar) + .load(currentUser.avatar.combineImagePath()) .apply(RequestOptions.circleCropTransform()) .placeholder(R.mipmap.load_image_error) .into(userAvatarView) diff --git a/app/src/main/java/com/casic/br/model/ImageResultModel.java b/app/src/main/java/com/casic/br/model/ImageResultModel.java new file mode 100644 index 0000000..06de7c8 --- /dev/null +++ b/app/src/main/java/com/casic/br/model/ImageResultModel.java @@ -0,0 +1,62 @@ +package com.casic.br.model; + +public class ImageResultModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private String fileId; + private String fileName; + + public String getFileId() { + return fileId; + } + + public void setFileId(String fileId) { + this.fileId = fileId; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + } +} diff --git a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt index 6495d77..16b4e19 100644 --- a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt @@ -100,8 +100,5 @@ */ @Multipart @POST("/file/uploadFile") - suspend fun uploadImage( - @Header("token") token: String, - @Part file: MultipartBody.Part - ): String + suspend fun uploadImage(@Part file: MultipartBody.Part): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt index 344bd26..a31d9c3 100644 --- a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt @@ -8,7 +8,7 @@ import okhttp3.MediaType.Companion.toMediaType import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody -import okhttp3.RequestBody +import okhttp3.RequestBody.Companion.asRequestBody import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject import java.io.File @@ -203,8 +203,8 @@ * 上传图片 */ suspend fun uploadImage(image: File): String { - val requestBody = RequestBody.create("image/png".toMediaTypeOrNull(), image) + val requestBody = image.asRequestBody("image/jpeg".toMediaTypeOrNull()) val imagePart = MultipartBody.Part.createFormData("file", image.name, requestBody) - return api.uploadImage(AuthenticationHelper.token!!, imagePart) + return api.uploadImage(imagePart) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt index 71639b5..6cd793e 100644 --- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt +++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt @@ -66,7 +66,7 @@ .into(userAvatarView) } else { Glide.with(this) - .load(currentUser.avatar) + .load(currentUser.avatar.combineImagePath()) .apply(RequestOptions.circleCropTransform()) .placeholder(R.mipmap.load_image_error) .into(userAvatarView) @@ -136,7 +136,7 @@ uploadFileViewModel.resultModel.observe(this, { if (it.code == 200) { - val url = it.data.toString() + val url = it.data.fileId.toString() if (url.isNotBlank()) { Glide.with(this) .load(url.combineImagePath()) diff --git a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt index bfd488f..bab33f4 100644 --- a/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/fragment/MinePageFragment.kt @@ -7,6 +7,7 @@ import com.casic.br.R import com.casic.br.adapter.IconTextGridAdapter import com.casic.br.adapter.IconTextListAdapter +import com.casic.br.extensions.combineImagePath import com.casic.br.extensions.initLayoutImmersionBar import com.casic.br.utils.DeserializeModel import com.casic.br.utils.LocaleConstant @@ -139,7 +140,7 @@ .into(userAvatarView) } else { Glide.with(this) - .load(currentUser.avatar) + .load(currentUser.avatar.combineImagePath()) .apply(RequestOptions.circleCropTransform()) .placeholder(R.mipmap.load_image_error) .into(userAvatarView) diff --git a/app/src/main/java/com/casic/br/model/ImageResultModel.java b/app/src/main/java/com/casic/br/model/ImageResultModel.java new file mode 100644 index 0000000..06de7c8 --- /dev/null +++ b/app/src/main/java/com/casic/br/model/ImageResultModel.java @@ -0,0 +1,62 @@ +package com.casic.br.model; + +public class ImageResultModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private String fileId; + private String fileName; + + public String getFileId() { + return fileId; + } + + public void setFileId(String fileId) { + this.fileId = fileId; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + } +} diff --git a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt index 6495d77..16b4e19 100644 --- a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitService.kt @@ -100,8 +100,5 @@ */ @Multipart @POST("/file/uploadFile") - suspend fun uploadImage( - @Header("token") token: String, - @Part file: MultipartBody.Part - ): String + suspend fun uploadImage(@Part file: MultipartBody.Part): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt index 344bd26..a31d9c3 100644 --- a/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/utils/retrofit/RetrofitServiceManager.kt @@ -8,7 +8,7 @@ import okhttp3.MediaType.Companion.toMediaType import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody -import okhttp3.RequestBody +import okhttp3.RequestBody.Companion.asRequestBody import okhttp3.RequestBody.Companion.toRequestBody import org.json.JSONObject import java.io.File @@ -203,8 +203,8 @@ * 上传图片 */ suspend fun uploadImage(image: File): String { - val requestBody = RequestBody.create("image/png".toMediaTypeOrNull(), image) + val requestBody = image.asRequestBody("image/jpeg".toMediaTypeOrNull()) val imagePart = MultipartBody.Part.createFormData("file", image.name, requestBody) - return api.uploadImage(AuthenticationHelper.token!!, imagePart) + return api.uploadImage(imagePart) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/view/EditUserActivity.kt b/app/src/main/java/com/casic/br/view/EditUserActivity.kt index 71639b5..6cd793e 100644 --- a/app/src/main/java/com/casic/br/view/EditUserActivity.kt +++ b/app/src/main/java/com/casic/br/view/EditUserActivity.kt @@ -66,7 +66,7 @@ .into(userAvatarView) } else { Glide.with(this) - .load(currentUser.avatar) + .load(currentUser.avatar.combineImagePath()) .apply(RequestOptions.circleCropTransform()) .placeholder(R.mipmap.load_image_error) .into(userAvatarView) @@ -136,7 +136,7 @@ uploadFileViewModel.resultModel.observe(this, { if (it.code == 200) { - val url = it.data.toString() + val url = it.data.fileId.toString() if (url.isNotBlank()) { Glide.with(this) .load(url.combineImagePath()) diff --git a/app/src/main/java/com/casic/br/vm/UploadFileViewModel.kt b/app/src/main/java/com/casic/br/vm/UploadFileViewModel.kt index 6ed765d..0adee6f 100644 --- a/app/src/main/java/com/casic/br/vm/UploadFileViewModel.kt +++ b/app/src/main/java/com/casic/br/vm/UploadFileViewModel.kt @@ -4,7 +4,7 @@ import com.casic.br.base.BaseApplication import com.casic.br.extensions.separateResponseCode import com.casic.br.extensions.toErrorMessage -import com.casic.br.model.CommonResultModel +import com.casic.br.model.ImageResultModel import com.casic.br.utils.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -17,7 +17,7 @@ class UploadFileViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val resultModel = MutableLiveData() + val resultModel = MutableLiveData() fun uploadImage(image: File) = launch({ loadState.value = LoadState.Loading @@ -25,8 +25,8 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type + resultModel.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail