From 67d5d12cb8475b8bc56665d113ec375778a114ca Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 12 Apr 2024 14:39:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=E4=B8=BB=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/community/publish/presenter/PublishPresenter.java | 1 - .../java/com/yizhuan/xchat_android_core/file/FileModel.java | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/presenter/PublishPresenter.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/presenter/PublishPresenter.java index dca3d9237..cd5d2007f 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/presenter/PublishPresenter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/presenter/PublishPresenter.java @@ -135,7 +135,6 @@ public class PublishPresenter extends BaseMvpPresenter { .flatMap((Function>) path -> FileModel.get().uploadFile(path)) .compose(bindUntilEvent(PresenterEvent.DESTROY)) - .observeOn(AndroidSchedulers.mainThread()) .subscribe(new DontWarnObserver() { @Override public void acceptThrowable(String url, Throwable throwable) { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/file/FileModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/file/FileModel.java index c9261bfb2..21a4513a6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/file/FileModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/file/FileModel.java @@ -18,6 +18,7 @@ import java.io.File; import java.util.UUID; import io.reactivex.Single; +import io.reactivex.android.schedulers.AndroidSchedulers; import retrofit2.http.GET; public class FileModel extends BaseModel implements IFileModel { @@ -57,7 +58,8 @@ public class FileModel extends BaseModel implements IFileModel { } File finalFile = file; String outName = UUID.randomUUID().toString() + PathUtils.INSTANCE.getSuffixType(finalFile.getName()); - return getCosToken().flatMap(token -> CosClient.INSTANCE.upload(AppUtils.getApp(), finalFile, outName, token).map(cosXmlResult -> cosXmlResult.accessUrl)); + return getCosToken().flatMap(token -> CosClient.INSTANCE.upload(AppUtils.getApp(), finalFile, outName, token).map(cosXmlResult -> cosXmlResult.accessUrl)) + .observeOn(AndroidSchedulers.mainThread()); } @Override