From 1df231fd6aafa221aef3532d069c7e27d4331be7 Mon Sep 17 00:00:00 2001 From: Linjiajia <319408893@qq.com> Date: 星期日, 27 八月 2023 19:21:01 +0800 Subject: [PATCH] 功能全部完成 --- app/src/main/java/com/application/zhangshi_app_android/ui/function/IncomeAndExpensesDetailActivityViewModel.java | 285 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 233 insertions(+), 52 deletions(-) diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/IncomeAndExpensesDetailActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/IncomeAndExpensesDetailActivityViewModel.java index d8c576e..19bc48f 100644 --- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/IncomeAndExpensesDetailActivityViewModel.java +++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/IncomeAndExpensesDetailActivityViewModel.java @@ -7,19 +7,28 @@ import androidx.annotation.NonNull; import androidx.lifecycle.MutableLiveData; +import com.android.app_base.base.StateViewEnum; import com.android.app_base.base.viewmodel.BaseViewModel; 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.rxbus.RxBus; +import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean; import com.application.zhangshi_app_android.bean.IncomeAndExpensesBean; import com.application.zhangshi_app_android.bean.UploadFileResponseBean; import com.application.zhangshi_app_android.data.DataRepository; import java.io.File; +import java.util.ArrayList; +import java.util.List; +import io.reactivex.Observable; +import io.reactivex.ObservableSource; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; +import io.reactivex.functions.Action; +import io.reactivex.functions.Consumer; +import io.reactivex.functions.Function; import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.RequestBody; @@ -33,6 +42,7 @@ private MutableLiveData<IncomeAndExpensesBean> beanLiveData; private MutableLiveData<Boolean> typeLiveData;//true 缂栬緫鐘舵�� false 灞曠ず鐘舵�� + private final List<String> uploadFileList = new ArrayList<>();//闇�瑕佷笂浼犵殑鏂囦欢鍒楄〃 public IncomeAndExpensesDetailActivityViewModel(@NonNull Application application) { super(application); @@ -47,36 +57,117 @@ * 娣诲姞 鏀舵敮鍙拌处 */ public void add() { - System.out.println(beanLiveData.getValue()); - model.addIncomeAndExpenses(beanLiveData.getValue()) - .compose(RxUtils.schedulersTransformer()) - .subscribe(new Observer<ResultData<String>>() { - @Override - public void onSubscribe(Disposable d) { - addSubscribe(d); - } + if (uploadFileList.size() > 0) { + List<Observable<String>> observables = new ArrayList<>(); + for (String path : uploadFileList) { + File file = new File(path); + RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file); + MultipartBody.Part body = MultipartBody.Part.createFormData("uploadFile", file.getName(), requestBody); + Observable<String> uploadObservable = model.uploadFile(body) + .flatMap(new Function<ResultData<UploadFileResponseBean>, ObservableSource<String>>() { + @Override + public ObservableSource<String> apply(ResultData<UploadFileResponseBean> resultData) throws Exception { + if (resultData.getCode() == CODE_SUCCESS) { + IncomeAndExpensesBean bean = getBeanLiveData().getValue(); + if (bean != null) { + String urls = bean.getUrl(); + //鏇挎崲鍥剧墖鍦板潃 + urls = urls.replace(path, resultData.getData().getUrl()); + bean.setUrl(urls); + getBeanLiveData().postValue(bean); + } + return Observable.just(path); + } else { + return Observable.error(new Exception(resultData.getMsg())); + } + } + }); - @Override - public void onNext(ResultData<String> stringResultData) { - if (stringResultData.getCode() == CODE_SUCCESS){ - AppManager.getAppManager().finishCurrentActivity(); - RxBus.getInstance().post(beanLiveData.getValue()); - messageLiveData.postValue("娣诲姞鎴愬姛"); - }else { - messageLiveData.postValue(stringResultData.getMsg()); + observables.add(uploadObservable); + } + Observable.zip(observables, result -> result) + .flatMap(new Function<Object[], Observable<ResultData<String>>>() { + @Override + public Observable<ResultData<String>> apply(Object[] objects) throws Exception { + //绉婚櫎宸茬粡涓婁紶鐨勬枃浠� + //鎶妎bjects鏁扮粍杞崲鎴恖ist锛岀劧鍚庣Щ闄� + for (Object object : objects) { + uploadFileList.remove((String) object); + } + return model.addIncomeAndExpenses(beanLiveData.getValue()); } - } + }) + .doOnSubscribe(new Consumer<Disposable>() { + @Override + public void accept(Disposable disposable) throws Exception { + changeStateView(StateViewEnum.DIALOG_LOADING); + } + }) + .doFinally(new Action() { + @Override + public void run() throws Exception { + changeStateView(StateViewEnum.DIALOG_DISMISS); + } + }) + .compose(RxUtils.schedulersTransformer()) + .subscribe(new Observer<ResultData<String>>() { + @Override + public void onSubscribe(Disposable d) { + addSubscribe(d); + } - @Override - public void onError(Throwable e) { - messageLiveData.postValue(e.getMessage()); - } + @Override + public void onNext(ResultData<String> stringResultData) { + if (stringResultData.getCode() == CODE_SUCCESS) { + AppManager.getAppManager().finishCurrentActivity(); + RxBus.getInstance().post(beanLiveData.getValue()); + messageLiveData.postValue("娣诲姞鎴愬姛"); + } else { + messageLiveData.postValue(stringResultData.getMsg()); + } + } - @Override - public void onComplete() { + @Override + public void onError(Throwable e) { + messageLiveData.postValue(e.getMessage()); + } - } - }); + @Override + public void onComplete() { + + } + }); + }else { + model.addIncomeAndExpenses(beanLiveData.getValue()) + .compose(RxUtils.schedulersTransformer()) + .subscribe(new Observer<ResultData<String>>() { + @Override + public void onSubscribe(Disposable d) { + addSubscribe(d); + } + + @Override + public void onNext(ResultData<String> stringResultData) { + if (stringResultData.getCode() == CODE_SUCCESS){ + AppManager.getAppManager().finishCurrentActivity(); + RxBus.getInstance().post(beanLiveData.getValue()); + messageLiveData.postValue("娣诲姞鎴愬姛"); + }else { + messageLiveData.postValue(stringResultData.getMsg()); + } + } + + @Override + public void onError(Throwable e) { + messageLiveData.postValue(e.getMessage()); + } + + @Override + public void onComplete() { + + } + }); + } } /** * 鍒犻櫎 鏀舵敮鍙拌处 @@ -116,39 +207,121 @@ }); } /** - * 淇敼灏忓尰鐢� + * 淇敼 鏀舵敮鍙拌处 */ public void update() { - model.updateIncomeAndExpenses(beanLiveData.getValue()) - .compose(RxUtils.schedulersTransformer()) - .subscribe(new Observer<ResultData<String>>() { - @Override - public void onSubscribe(Disposable d) { - addSubscribe(d); - } + if (uploadFileList.size() > 0){ + List<Observable<String>> observables = new ArrayList<>(); + for (String path : uploadFileList) { + File file = new File(path); + RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file); + MultipartBody.Part body = MultipartBody.Part.createFormData("uploadFile", file.getName(), requestBody); + Observable<String> uploadObservable = model.uploadFile(body) + .flatMap(new Function<ResultData<UploadFileResponseBean>, ObservableSource<String>>() { + @Override + public ObservableSource<String> apply(ResultData<UploadFileResponseBean> resultData) throws Exception { + if (resultData.getCode() == CODE_SUCCESS){ + IncomeAndExpensesBean bean = getBeanLiveData().getValue(); + if (bean != null){ + String urls = bean.getUrl(); + //鏇挎崲鍥剧墖鍦板潃 + urls = urls.replace(path,resultData.getData().getUrl()); + bean.setUrl(urls); + getBeanLiveData().postValue(bean); + } + return Observable.just(path); + }else { + return Observable.error(new Exception(resultData.getMsg())); + } + } + }); - @Override - public void onNext(ResultData<String> stringResultData) { - if (stringResultData.getCode() == CODE_SUCCESS){ - AppManager.getAppManager().finishCurrentActivity(); - RxBus.getInstance().post(beanLiveData.getValue()); - messageLiveData.postValue("淇敼鎴愬姛"); - }else { - messageLiveData.postValue(stringResultData.getMsg()); + observables.add(uploadObservable); + } + Observable.zip(observables,result -> result) + .flatMap(new Function<Object[], Observable<ResultData<String>>>() { + @Override + public Observable<ResultData<String>> apply(Object[] objects) throws Exception { + //绉婚櫎宸茬粡涓婁紶鐨勬枃浠� + //鎶妎bjects鏁扮粍杞崲鎴恖ist锛岀劧鍚庣Щ闄� + for (Object object : objects) { + uploadFileList.remove((String) object); + } + return model.updateIncomeAndExpenses(beanLiveData.getValue()); } - } + }) + .doOnSubscribe(new Consumer<Disposable>() { + @Override + public void accept(Disposable disposable) throws Exception { + changeStateView(StateViewEnum.DIALOG_LOADING); + } + }) + .doFinally(new Action() { + @Override + public void run() throws Exception { + changeStateView(StateViewEnum.DIALOG_DISMISS); + } + }) + .compose(RxUtils.schedulersTransformer()) + .subscribe(new Observer<ResultData<String>>() { + @Override + public void onSubscribe(Disposable d) { + addSubscribe(d); + } - @Override - public void onError(Throwable e) { - messageLiveData.postValue(e.getMessage()); - } + @Override + public void onNext(ResultData<String> stringResultData) { + if (stringResultData.getCode() == CODE_SUCCESS){ + AppManager.getAppManager().finishCurrentActivity(); + RxBus.getInstance().post(beanLiveData.getValue()); + messageLiveData.postValue("淇敼鎴愬姛"); + }else { + messageLiveData.postValue(stringResultData.getMsg()); + } + } - @Override - public void onComplete() { + @Override + public void onError(Throwable e) { + messageLiveData.postValue(e.getMessage()); + } - } - }); - } + @Override + public void onComplete() { + + } + }); + }else { + model.updateIncomeAndExpenses(beanLiveData.getValue()) + .compose(RxUtils.schedulersTransformer()) + .subscribe(new Observer<ResultData<String>>() { + @Override + public void onSubscribe(Disposable d) { + addSubscribe(d); + } + + @Override + public void onNext(ResultData<String> stringResultData) { + if (stringResultData.getCode() == CODE_SUCCESS){ + AppManager.getAppManager().finishCurrentActivity(); + RxBus.getInstance().post(beanLiveData.getValue()); + messageLiveData.postValue("淇敼鎴愬姛"); + }else { + messageLiveData.postValue(stringResultData.getMsg()); + } + } + + @Override + public void onError(Throwable e) { + messageLiveData.postValue(e.getMessage()); + } + + @Override + public void onComplete() { + + } + }); + } + } /** * 涓婁紶鐢靛瓙鏂囦欢 @@ -219,4 +392,12 @@ } return beanLiveData; } -} + + public List<String> getUploadFileList() { + return uploadFileList; + } + + public void addUploadFile(String url) { + uploadFileList.add(url); + } +} \ No newline at end of file -- Gitblit v1.9.1