From efafbbf142c81c233c71de636a2d3ce9dc2124f0 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 12 九月 2023 19:20:05 +0800
Subject: [PATCH] 修复bug
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/IncomeAndExpensesActivityViewModel.java | 329 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 306 insertions(+), 23 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/IncomeAndExpensesActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/IncomeAndExpensesActivityViewModel.java
index 6d68d42..7d57b37 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/IncomeAndExpensesActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/IncomeAndExpensesActivityViewModel.java
@@ -3,26 +3,30 @@
import static com.android.app_base.base.BaseConfig.CODE_SUCCESS;
import android.app.Application;
+import android.text.TextUtils;
import androidx.annotation.NonNull;
+import androidx.lifecycle.LiveData;
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.utils.RxUtils;
-import com.application.zhangshi_app_android.bean.CleanStorageBean;
-import com.application.zhangshi_app_android.bean.HomeDevicesResponseBean;
+import com.android.app_base.utils.Utils;
+import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
import com.application.zhangshi_app_android.bean.IncomeAndExpensesBean;
-import com.application.zhangshi_app_android.bean.IncomeAndExpensesResponseBean;
+import com.application.zhangshi_app_android.bean.IncomeAndExpensesRequestBean;
+import com.application.zhangshi_app_android.bean.PageResponseBean;
import com.application.zhangshi_app_android.data.DataRepository;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Date;
import java.util.List;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Action;
/**
* @author Ljj
@@ -30,7 +34,13 @@
* @desc
*/
public class IncomeAndExpensesActivityViewModel extends BaseViewModel<DataRepository> {
- private MutableLiveData<List<IncomeAndExpensesBean>> dataListLiveData;
+ private MutableLiveData<List<IncomeAndExpensesBean>> dataListLiveData;//鍒楄〃鏁版嵁
+ private MutableLiveData<List<IncomeAndExpensesBean>> checkListLiveData;//閫変腑鐨勬暟鎹�
+ private MutableLiveData<List<IncomeAndExpensesBean>> moreListLiveData;//涓嬫媺鍔犺浇鏁版嵁
+ private MutableLiveData<IncomeAndExpensesRequestBean> requestBeanLiveData;//璇锋眰鍙傛暟
+ private MutableLiveData<List<IncomeAndExpensesBean>> finishDeleteListLiveData;//宸茬粡瀹屾垚鍒犻櫎鐨勬暟鎹紝鐢ㄤ簬adapter鐨剅emove鎿嶄綔
+
+ private MutableLiveData<Integer> operateTypeLiveData;//鎿嶄綔绫诲瀷 0 閫夋嫨鎿嶄綔 1.瀹屾垚 2.鍒犻櫎
public IncomeAndExpensesActivityViewModel(@NonNull Application application) {
super(application);
@@ -41,36 +51,32 @@
return DataRepository.getInstance();
}
- public MutableLiveData<List<IncomeAndExpensesBean>> getDataListLiveData() {
- if (dataListLiveData == null) {
- dataListLiveData = new MutableLiveData<>();
- }
- return dataListLiveData;
- }
-
- public void setDataListLiveData(MutableLiveData<List<IncomeAndExpensesBean>> dataListLiveData) {
- this.dataListLiveData = dataListLiveData;
- }
-
+ /**
+ * 鑾峰彇鏁版嵁
+ */
public void getIncomeAndExpenses() {
- model.getIncomeAndExpenses(new HashMap<>())
+ if (getRequestBeanLiveData().getValue() == null) {
+ getRequestBeanLiveData().setValue(new IncomeAndExpensesRequestBean());
+ }
+ getRequestBeanLiveData().getValue().setPageNum(1);
+ model.getIncomeAndExpenses(getRequestBeanLiveData().getValue().toMap())
.compose(RxUtils.schedulersTransformer())
- .subscribe(new Observer<ResultData<IncomeAndExpensesResponseBean>>() {
+ .subscribe(new Observer<ResultData<PageResponseBean<IncomeAndExpensesBean>>>() {
@Override
public void onSubscribe(Disposable d) {
addSubscribe(d);
}
@Override
- public void onNext(ResultData<IncomeAndExpensesResponseBean> data) {
- if (data.getCode() == CODE_SUCCESS){
- if (data.getData().getData().isEmpty()){
+ public void onNext(ResultData<PageResponseBean<IncomeAndExpensesBean>> data) {
+ if (data.getCode() == CODE_SUCCESS) {
+ if (data.getData().getData().isEmpty()) {
changeStateView(StateViewEnum.DATA_NULL);
- }else {
+ } else {
changeStateView(StateViewEnum.HIDE);
dataListLiveData.postValue(data.getData().getData());
}
- }else {
+ } else {
messageLiveData.postValue(data.getMsg());
}
}
@@ -86,4 +92,281 @@
}
});
}
+
+ /**
+ * 鍔犺浇鏇村
+ */
+ public void getMoreIncomeAndExpenses() {
+ if (getRequestBeanLiveData().getValue() == null) {
+ getRequestBeanLiveData().setValue(new IncomeAndExpensesRequestBean());
+ }
+ getRequestBeanLiveData().getValue().setPageNum(getRequestBeanLiveData().getValue().getPageNum() + 1);
+ model.getIncomeAndExpenses(getRequestBeanLiveData().getValue().toMap())
+ .compose(RxUtils.schedulersTransformer())
+ .doFinally(new Action() {
+ @Override
+ public void run() throws Exception {
+ changeStateView(StateViewEnum.DATA_FINISH);
+ }
+ })
+ .subscribe(new Observer<ResultData<PageResponseBean<IncomeAndExpensesBean>>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<PageResponseBean<IncomeAndExpensesBean>> data) {
+ if (data.getCode() == CODE_SUCCESS) {
+ if (data.getData().getData().isEmpty()) {
+ messageLiveData.postValue("娌℃湁鏇村鏁版嵁浜�");
+ } else {
+ changeStateView(StateViewEnum.HIDE);
+ moreListLiveData.postValue(data.getData().getData());
+ }
+ } else {
+ messageLiveData.postValue(data.getMsg());
+ }
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+
+ /**
+ * 鍒犻櫎澶氶�夐�変腑鐨勬暟鎹�
+ */
+ public void deleteCheckList() {
+ List<IncomeAndExpensesBean> deleteList = getCheckListLiveData().getValue();
+ if (deleteList == null) {
+ return;
+ }
+ StringBuffer sb = new StringBuffer();
+ deleteList.forEach(IncomeAndExpensesBean -> sb.append(IncomeAndExpensesBean.getId()).append(","));
+ sb.deleteCharAt(sb.length() - 1);
+ model.deleteIncomeAndExpenses(sb.toString())
+ .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) {
+ finishDeleteListLiveData.postValue(checkListLiveData.getValue());
+ messageLiveData.postValue("鍒犻櫎鎴愬姛");
+ getCheckListLiveData().postValue(new ArrayList<>());
+ } else {
+ messageLiveData.postValue(stringResultData.getMsg());
+ }
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+
+ /**
+ * 鍒犻櫎鍗曚釜鏁版嵁
+ */
+ public void deleteItem(IncomeAndExpensesBean IncomeAndExpensesBean) {
+ model.deleteIncomeAndExpenses(String.valueOf(IncomeAndExpensesBean.getId()))
+ .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) {
+ List<IncomeAndExpensesBean> list = new ArrayList<>();
+ list.add(IncomeAndExpensesBean);
+ finishDeleteListLiveData.postValue(list);
+ messageLiveData.postValue("鍒犻櫎鎴愬姛");
+ } else {
+ messageLiveData.postValue(stringResultData.getMsg());
+ }
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+
+ public MutableLiveData<List<IncomeAndExpensesBean>> getCheckListLiveData() {
+ if (checkListLiveData == null) {
+ checkListLiveData = new MutableLiveData<>();
+ checkListLiveData.postValue(new ArrayList<>());
+ }
+ if (checkListLiveData.getValue() == null) {
+ checkListLiveData.postValue(new ArrayList<>());
+ }
+ return checkListLiveData;
+ }
+
+ public void setCheckListLiveData(MutableLiveData<List<IncomeAndExpensesBean>> checkListLiveData) {
+ this.checkListLiveData = checkListLiveData;
+ }
+
+ @NonNull
+ public MutableLiveData<IncomeAndExpensesRequestBean> getRequestBeanLiveData() {
+ if (requestBeanLiveData == null) {
+ requestBeanLiveData = new MutableLiveData<>();
+ }
+ if (requestBeanLiveData.getValue() == null) {
+ requestBeanLiveData.setValue(new IncomeAndExpensesRequestBean());
+ }
+ return requestBeanLiveData;
+ }
+
+ public void setRequestBeanLiveData(MutableLiveData<IncomeAndExpensesRequestBean> requestBeanLiveData) {
+ this.requestBeanLiveData = requestBeanLiveData;
+ }
+
+ public MutableLiveData<List<IncomeAndExpensesBean>> getDataListLiveData() {
+ if (dataListLiveData == null) {
+ dataListLiveData = new MutableLiveData<>();
+ }
+ return dataListLiveData;
+ }
+
+ public void setDataListLiveData(MutableLiveData<List<IncomeAndExpensesBean>> dataListLiveData) {
+ this.dataListLiveData = dataListLiveData;
+ }
+
+ @NonNull
+ public MutableLiveData<List<IncomeAndExpensesBean>> getMoreListLiveData() {
+ if (moreListLiveData == null) {
+ moreListLiveData = new MutableLiveData<>();
+ }
+ return moreListLiveData;
+ }
+
+ public void setMoreListLiveData(MutableLiveData<List<IncomeAndExpensesBean>> moreListLiveData) {
+ this.moreListLiveData = moreListLiveData;
+ }
+
+ @NonNull
+ public MutableLiveData<Integer> getOperateTypeLiveData() {
+ if (operateTypeLiveData == null) {
+ operateTypeLiveData = new MutableLiveData<>();
+ operateTypeLiveData.setValue(0);
+ }
+ return operateTypeLiveData;
+ }
+
+ public void setOperateTypeLiveData(MutableLiveData<Integer> operateTypeLiveData) {
+ this.operateTypeLiveData = operateTypeLiveData;
+ }
+
+ public LiveData<List<IncomeAndExpensesBean>> getFinishDeleteListLiveData() {
+ if (finishDeleteListLiveData == null) {
+ finishDeleteListLiveData = new MutableLiveData<>();
+ }
+ return finishDeleteListLiveData;
+ }
+
+ public void setFinishDeleteListLiveData(MutableLiveData<List<IncomeAndExpensesBean>> finishDeleteListLiveData) {
+ this.finishDeleteListLiveData = finishDeleteListLiveData;
+ }
+
+ /**
+ * 鏀瑰彉鎺掑簭
+ *
+ * @param b true 闄嶅簭 false 鍗囧簭
+ */
+ public void changeOrder(boolean b) {
+ List<IncomeAndExpensesBean> list = getDataListLiveData().getValue();
+ if (list == null || list.isEmpty()) {
+ return;
+ }
+ if (b) {
+ // 浠庢柊鍒版棫锛宯ull鎺掓渶鍚�
+ list.sort((o1, o2) -> {
+ String happenTime1 = o1.getHappenTime();
+ String happenTime2 = o2.getHappenTime();
+ if (TextUtils.isEmpty(happenTime1) && TextUtils.isEmpty(happenTime2)) {
+ return 0;
+ } else if (TextUtils.isEmpty(happenTime1)) {
+ return 1;
+ } else if (TextUtils.isEmpty(happenTime2)) {
+ return -1;
+ } else {
+ Date date1 = Utils.parseDate(happenTime1);
+ Date date2 = Utils.parseDate(happenTime2);
+ if (date1 != null && date2 != null) {
+ return date2.compareTo(date1);
+ }
+ return 0;
+ }
+ });
+ } else {
+ // 浠庢棫鍒版柊锛宯ull鎺掓渶鍓�
+ list.sort((o1, o2) -> {
+ String happenTime1 = o1.getHappenTime();
+ String happenTime2 = o2.getHappenTime();
+ if (TextUtils.isEmpty(happenTime1) && TextUtils.isEmpty(happenTime2)) {
+ return 0;
+ } else if (TextUtils.isEmpty(happenTime1)) {
+ return -1;
+ } else if (TextUtils.isEmpty(happenTime2)) {
+ return 1;
+ } else {
+ Date date1 = Utils.parseDate(happenTime1);
+ Date date2 = Utils.parseDate(happenTime2);
+ if (date1 != null && date2 != null) {
+ return date1.compareTo(date2);
+ }
+ return 0;
+ }
+ });
+ }
+ getDataListLiveData().setValue(list);
+ }
+
+ /**
+ * 鏈鏁版嵁 缃《
+ */
+ public void ownTop(){
+ List<IncomeAndExpensesBean> list = getDataListLiveData().getValue();
+ if (list == null || list.isEmpty()){
+ return;
+ }
+ //鏍规嵁ownData鍊间负1鐨� 鏀惧埌鍓嶉潰
+ list.sort((o1, o2) -> {
+ if (o1.getOwnData() == 1 && o2.getOwnData() == 0) {
+ return -1;
+ } else if (o1.getOwnData() == 0 && o2.getOwnData() == 1) {
+ return 1;
+ }
+ return 0;
+ });
+ getDataListLiveData().setValue(list);
+ }
}
--
Gitblit v1.9.1