From 013ed0a39d69a4c5a77dcba25c1c036c17ebc0c9 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 9 Apr 2024 15:00:10 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=9B=9E=E8=B0=83=E4=B8=8D=E5=9C=A8?= =?UTF-8?q?=E4=B8=BB=E7=BA=BF=E7=A8=8B=E5=AF=BC=E8=87=B4=E7=9A=84=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E7=89=B9=E6=9D=83=E5=8D=A1=E6=B5=81=E7=A8=8B=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98=EF=BC=88=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E7=BB=9F=E4=B8=80=E5=9B=9E=E8=B0=83=E4=B8=BB=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/community/publish/presenter/PublishPresenter.java | 1 - core/src/main/java/com/nnbc123/core/file/FileModel.java | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/module_community/java/com/nnbc123/app/community/publish/presenter/PublishPresenter.java b/app/src/module_community/java/com/nnbc123/app/community/publish/presenter/PublishPresenter.java index bd82b28c8..eeeb6c62a 100644 --- a/app/src/module_community/java/com/nnbc123/app/community/publish/presenter/PublishPresenter.java +++ b/app/src/module_community/java/com/nnbc123/app/community/publish/presenter/PublishPresenter.java @@ -133,7 +133,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/nnbc123/core/file/FileModel.java b/core/src/main/java/com/nnbc123/core/file/FileModel.java index 70b1a9461..11a474205 100644 --- a/core/src/main/java/com/nnbc123/core/file/FileModel.java +++ b/core/src/main/java/com/nnbc123/core/file/FileModel.java @@ -14,6 +14,7 @@ import com.nnbc123.library.net.rxnet.RxNet; 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 { @@ -52,7 +53,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