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/AnnualHealthStatusDetailActivityViewModel.java | 325 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 232 insertions(+), 93 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusDetailActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusDetailActivityViewModel.java
index 9a50334..5e84a96 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusDetailActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusDetailActivityViewModel.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.AnnualHealthStatusBean;
+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.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,8 @@
private MutableLiveData<AnnualHealthStatusBean> beanLiveData;
private MutableLiveData<Boolean> typeLiveData;//true 缂栬緫鐘舵�� false 灞曠ず鐘舵��
+ private final List<String> uploadFileList = new ArrayList<>();//闇�瑕佷笂浼犵殑鏂囦欢鍒楄〃
+
public AnnualHealthStatusDetailActivityViewModel(@NonNull Application application) {
super(application);
@@ -47,36 +58,118 @@
* 娣诲姞
*/
public void add() {
- System.out.println(beanLiveData.getValue());
- model.addAnnualHealthStatus(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) {
+ AnnualHealthStatusBean bean = getBeanLiveData().getValue();
+ if (bean != null) {
+ String urls = bean.getUrl();
+ //鏇挎崲鍥剧墖鍦板潃
+ urls = urls.replace(path, resultData.getData().getUrl());
+ bean.setUrl(urls);
+ beanLiveData.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.addAnnualHealthStatus(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.addAnnualHealthStatus(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() {
+
+ }
+ });
+ }
+
}
/**
* 鍒犻櫎
@@ -119,82 +212,120 @@
* 淇敼
*/
public void update() {
- model.updateAnnualHealthStatus(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() {
-
- }
- });
- }
-
- /**
- * 涓婁紶鐢靛瓙鏂囦欢
- */
- 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){
- AnnualHealthStatusBean bean = beanLiveData.getValue();
- String url;
- if (bean != null){
- url = bean.getUrl();
- if (url == null){
- url = resultData.getData().getUrl();
+ 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){
+ AnnualHealthStatusBean bean = getBeanLiveData().getValue();
+ if (bean != null){
+ String urls = bean.getUrl();
+ //鏇挎崲鍥剧墖鍦板潃
+ urls = urls.replace(path,resultData.getData().getUrl());
+ bean.setUrl(urls);
+ beanLiveData.postValue(bean);
+ }
+ return Observable.just(path);
}else {
- url = url + "," + resultData.getData().getUrl();
+ return Observable.error(new Exception(resultData.getMsg()));
}
- bean.setUrl(url);
- beanLiveData.postValue(bean);
}
- }else {
- messageLiveData.postValue(resultData.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.updateAnnualHealthStatus(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.updateAnnualHealthStatus(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() {
+
+ }
+ });
+ }
}
+
+
public MutableLiveData<Boolean> getTypeLiveData() {
if (typeLiveData == null){
typeLiveData = new MutableLiveData<>();
@@ -219,4 +350,12 @@
public void setBeanLiveData(MutableLiveData<AnnualHealthStatusBean> beanLiveData) {
this.beanLiveData = beanLiveData;
}
+
+ public List<String> getUploadFileList() {
+ return uploadFileList;
+ }
+
+ public void addUploadFile(String url) {
+ uploadFileList.add(url);
+ }
}
--
Gitblit v1.9.1