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/FamilyMemorabiliaActivityViewModel.java | 189 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 137 insertions(+), 52 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivityViewModel.java
index b363acd..ba3fb67 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivityViewModel.java
@@ -3,29 +3,25 @@
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.FamilyAssetsBean;
+import com.android.app_base.utils.Utils;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaRequestBean;
-import com.application.zhangshi_app_android.bean.FamilyMemorabiliaResponseBean;
+import com.application.zhangshi_app_android.bean.PageResponseBean;
import com.application.zhangshi_app_android.data.DataRepository;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
@@ -40,10 +36,10 @@
private MutableLiveData<List<FamilyMemorabiliaBean>> checkListLiveData;//閫変腑鐨勬暟鎹�
private MutableLiveData<List<FamilyMemorabiliaBean>> dataListLiveData;//鎵�鏈夋暟鎹�
- private MutableLiveData<Integer> operateTypeLiveData;//鎿嶄綔绫诲瀷 0 閫夋嫨鎿嶄綔 1.瀹屾垚 2.鍒犻櫎
-
- private MutableLiveData<FamilyMemorabiliaRequestBean> requestBeanMutableLiveData;//璇锋眰鍙傛暟
+ private MutableLiveData<Integer> operateTypeLiveData;//鍙充笂瑙掓搷浣滄 鎿嶄綔绫诲瀷 0 寮瑰嚭閫夋嫨鎿嶄綔 1.瀹屾垚 2.鍒犻櫎
+ private MutableLiveData<FamilyMemorabiliaRequestBean> requestBeanLiveData;//璇锋眰鍙傛暟
private MutableLiveData<List<FamilyMemorabiliaBean>> moreListLiveData;//涓嬫媺鍔犺浇鏁版嵁
+ private MutableLiveData<List<FamilyMemorabiliaBean>> finishDeleteListLiveData;//宸茬粡瀹屾垚鍒犻櫎鐨勬暟鎹紝鐢ㄤ簬adapter鐨剅emove鎿嶄綔
public FamilyMemorabiliaActivityViewModel(@NonNull Application application) {
super(application);
}
@@ -56,17 +52,20 @@
* 鑾峰彇瀹跺ぇ浜嬭
*/
public void getFamilyMemorabilia() {
- System.out.println(getRequestBeanMutableLiveData().getValue());
- model.getFamilyMemorabilia(getRequestBeanMutableLiveData().getValue().getMap())
+ if (getRequestBeanLiveData().getValue() == null){
+ getRequestBeanLiveData().setValue(new FamilyMemorabiliaRequestBean());
+ }
+ getRequestBeanLiveData().getValue().setPageNum(1);
+ model.getFamilyMemorabilia(getRequestBeanLiveData().getValue().toMap())
.compose(RxUtils.schedulersTransformer())
- .subscribe(new Observer<ResultData<FamilyMemorabiliaResponseBean>>() {
+ .subscribe(new Observer<ResultData<PageResponseBean<FamilyMemorabiliaBean>>>() {
@Override
public void onSubscribe(Disposable d) {
addSubscribe(d);
}
@Override
- public void onNext(ResultData<FamilyMemorabiliaResponseBean> data) {
+ public void onNext(ResultData<PageResponseBean<FamilyMemorabiliaBean>> data) {
if (data.getCode() == CODE_SUCCESS){
if (data.getData().getData().isEmpty()){
changeStateView(StateViewEnum.DATA_NULL);
@@ -91,11 +90,14 @@
});
}
/**
- * 鑾峰彇瀹跺ぇ浜嬭 鍔犺浇鏇村
+ * 鍔犺浇鏇村
*/
public void getMoreFamilyMemorabilia() {
- requestBeanMutableLiveData.getValue().setPageNum(requestBeanMutableLiveData.getValue().getPageNum() + 1);
- model.getFamilyMemorabilia(getRequestBeanMutableLiveData().getValue().getMap())
+ if (getRequestBeanLiveData().getValue() == null){
+ getRequestBeanLiveData().setValue(new FamilyMemorabiliaRequestBean());
+ }
+ getRequestBeanLiveData().getValue().setPageNum(getRequestBeanLiveData().getValue().getPageNum() + 1);
+ model.getFamilyMemorabilia(getRequestBeanLiveData().getValue().toMap())
.compose(RxUtils.schedulersTransformer())
.doFinally(new Action() {
@Override
@@ -103,14 +105,14 @@
changeStateView(StateViewEnum.DATA_FINISH);
}
})
- .subscribe(new Observer<ResultData<FamilyMemorabiliaResponseBean>>() {
+ .subscribe(new Observer<ResultData<PageResponseBean<FamilyMemorabiliaBean>>>() {
@Override
public void onSubscribe(Disposable d) {
addSubscribe(d);
}
@Override
- public void onNext(ResultData<FamilyMemorabiliaResponseBean> data) {
+ public void onNext(ResultData<PageResponseBean<FamilyMemorabiliaBean>> data) {
if (data.getCode() == CODE_SUCCESS){
if (data.getData().getData().isEmpty()){
messageLiveData.postValue("娌℃湁鏇村鏁版嵁浜�");
@@ -137,7 +139,7 @@
/**
* 鍒犻櫎瀹跺ぇ浜嬭
*/
- public void delete() {
+ public void deleteCheckList() {
List<FamilyMemorabiliaBean> deleteList = getCheckListLiveData().getValue();
if (deleteList == null){
return;
@@ -145,7 +147,6 @@
StringBuffer sb = new StringBuffer();
deleteList.forEach(familyMemorabiliaBean -> sb.append(familyMemorabiliaBean.getId()).append(","));
sb.deleteCharAt(sb.length()-1);
- System.out.println();
model.deleteFamilyMemorabilia(sb.toString())
.compose(RxUtils.schedulersTransformer())
.subscribe(new Observer<ResultData<String>>() {
@@ -157,13 +158,44 @@
@Override
public void onNext(ResultData<String> stringResultData) {
if (stringResultData.getCode() == CODE_SUCCESS){
- List<FamilyMemorabiliaBean> list = getDataListLiveData().getValue();
- if (list != null) {
- list.removeAll(getCheckListLiveData().getValue());
- }
- getDataListLiveData().postValue(list);
messageLiveData.postValue("鍒犻櫎鎴愬姛");
+ finishDeleteListLiveData.postValue(checkListLiveData.getValue());
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(FamilyMemorabiliaBean bean) {
+ model.deleteFamilyMemorabilia(String.valueOf(bean.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<FamilyMemorabiliaBean> list = new ArrayList<>();
+ list.add(bean);
+ finishDeleteListLiveData.postValue(list);
+ messageLiveData.postValue("鍒犻櫎鎴愬姛");
}else {
messageLiveData.postValue(stringResultData.getMsg());
}
@@ -196,18 +228,19 @@
this.checkListLiveData = checkListLiveData;
}
- public MutableLiveData<FamilyMemorabiliaRequestBean> getRequestBeanMutableLiveData() {
- if (requestBeanMutableLiveData == null){
- requestBeanMutableLiveData = new MutableLiveData<>();
+ @NonNull
+ public MutableLiveData<FamilyMemorabiliaRequestBean> getRequestBeanLiveData() {
+ if (requestBeanLiveData == null){
+ requestBeanLiveData = new MutableLiveData<>();
}
- if (requestBeanMutableLiveData.getValue() == null){
- requestBeanMutableLiveData.setValue(new FamilyMemorabiliaRequestBean());
+ if (requestBeanLiveData.getValue() == null){
+ requestBeanLiveData.setValue(new FamilyMemorabiliaRequestBean());
}
- return requestBeanMutableLiveData;
+ return requestBeanLiveData;
}
- public void setRequestBeanMutableLiveData(MutableLiveData<FamilyMemorabiliaRequestBean> requestBeanMutableLiveData) {
- this.requestBeanMutableLiveData = requestBeanMutableLiveData;
+ public void setRequestBeanLiveData(MutableLiveData<FamilyMemorabiliaRequestBean> requestBeanLiveData) {
+ this.requestBeanLiveData = requestBeanLiveData;
}
public MutableLiveData<List<FamilyMemorabiliaBean>> getDataListLiveData() {
@@ -221,6 +254,7 @@
this.dataListLiveData = dataListLiveData;
}
+ @NonNull
public MutableLiveData<List<FamilyMemorabiliaBean>> getMoreListLiveData() {
if (moreListLiveData == null){
moreListLiveData = new MutableLiveData<>();
@@ -232,6 +266,7 @@
this.moreListLiveData = moreListLiveData;
}
+ @NonNull
public MutableLiveData<Integer> getOperateTypeLiveData() {
if (operateTypeLiveData == null){
operateTypeLiveData = new MutableLiveData<>();
@@ -244,6 +279,17 @@
this.operateTypeLiveData = operateTypeLiveData;
}
+ public LiveData<List<FamilyMemorabiliaBean>> getFinishDeleteListLiveData() {
+ if (finishDeleteListLiveData == null){
+ finishDeleteListLiveData = new MutableLiveData<>();
+ }
+ return finishDeleteListLiveData;
+ }
+
+ public void setFinishDeleteListLiveData(MutableLiveData<List<FamilyMemorabiliaBean>> finishDeleteListLiveData) {
+ this.finishDeleteListLiveData = finishDeleteListLiveData;
+ }
+
/**
* 鏀瑰彉鎺掑簭
* @param b true 闄嶅簭 false 鍗囧簭
@@ -253,28 +299,67 @@
if (list == null || list.isEmpty()){
return;
}
- list.sort(new Comparator<FamilyMemorabiliaBean>() {
- @Override
- public int compare(FamilyMemorabiliaBean o1, FamilyMemorabiliaBean o2) {
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd", java.util.Locale.getDefault());
- Date date1 = null;
- Date date2 = null;
- try {
- date1 = format.parse(o1.getCreateTime());
- date2 = format.parse(o2.getCreateTime());
- } catch (ParseException e) {
- throw new RuntimeException(e);
- }
- if (date1 != null && date2 != null) {
- if (b){
+ 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);
- }else {
+ }
+ 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;
}
- return 0;
+ });
+ }
+ getDataListLiveData().setValue(list);
+ }
+
+ /**
+ * 鏈鏁版嵁 缃《
+ */
+ public void ownTop(){
+ List<FamilyMemorabiliaBean> 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().postValue(list);
+ getDataListLiveData().setValue(list);
}
}
--
Gitblit v1.9.1