From 2b6fd0451bfa358052ac9eb061ec1ed595587e9e Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 04 四月 2023 19:52:32 +0800
Subject: [PATCH] 改bug、
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java | 72 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java
index 75c5aef..e37573d 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java
@@ -11,19 +11,22 @@
import com.android.app_base.http.ResultData;
import com.android.app_base.manager.AppManager;
import com.android.app_base.utils.RxUtils;
-import com.android.app_base.utils.ToastUtils;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
+import com.application.zhangshi_app_android.bean.UploadFileResponseBean;
import com.application.zhangshi_app_android.data.DataRepository;
-import java.util.ArrayList;
-import java.util.List;
+import java.io.File;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
public class CreateFamilyProjectActivityViewModel extends BaseViewModel<DataRepository> {
private MutableLiveData<FamilyMemorabiliaBean> beanMutableLiveData;
+ private MutableLiveData<Boolean> typeLiveData;//true 缂栬緫鐘舵�� false 灞曠ず鐘舵��
public CreateFamilyProjectActivityViewModel(@NonNull Application application) {
super(application);
}
@@ -49,6 +52,7 @@
public void onNext(ResultData<String> stringResultData) {
if (stringResultData.getCode() == CODE_SUCCESS){
messageLiveData.postValue("娣诲姞鎴愬姛");
+ AppManager.getAppManager().finishCurrentActivity();
}else {
messageLiveData.postValue(stringResultData.getMsg());
}
@@ -136,10 +140,72 @@
if (beanMutableLiveData == null){
beanMutableLiveData = new MutableLiveData<>();
}
+ if (beanMutableLiveData.getValue() == null){
+ beanMutableLiveData.setValue(new FamilyMemorabiliaBean());
+ }
return beanMutableLiveData;
}
public void setBeanMutableLiveData(MutableLiveData<FamilyMemorabiliaBean> beanMutableLiveData) {
this.beanMutableLiveData = beanMutableLiveData;
}
+
+ public MutableLiveData<Boolean> getTypeLiveData() {
+ if (typeLiveData == null){
+ typeLiveData = new MutableLiveData<>();
+ }
+ return typeLiveData;
+ }
+
+ public void setTypeLiveData(MutableLiveData<Boolean> typeLiveData) {
+ this.typeLiveData = typeLiveData;
+ }
+
+ /**
+ * 涓婁紶鐢靛瓙鏂囦欢
+ */
+ public void uploadFile(File file) {
+ RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
+ MultipartBody.Part body = MultipartBody.Part.createFormData("uploadFile", file.getName(), requestBody);
+ model.uploadFile(body)
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new Observer<ResultData<UploadFileResponseBean>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<UploadFileResponseBean> resultData) {
+ if (resultData.getCode() == CODE_SUCCESS){
+ FamilyMemorabiliaBean bean = getBeanMutableLiveData().getValue();
+ String url;
+ if (bean != null){
+ url = bean.getUrl();
+ if (url == null){
+ url = resultData.getData().getUrl();
+ }else {
+ url = url + "," + resultData.getData().getUrl();
+ }
+ bean.setUrl(url);
+ beanMutableLiveData.postValue(bean);
+ }
+ }else {
+ messageLiveData.postValue(resultData.getMsg());
+ }
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+
+
}
--
Gitblit v1.9.1