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/FamilyAssetsActivityViewModel.java | 180 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 145 insertions(+), 35 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivityViewModel.java
index 9dfd101..0b47b7c 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivityViewModel.java
@@ -3,6 +3,7 @@
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.MutableLiveData;
@@ -12,21 +13,19 @@
import com.android.app_base.base.viewmodel.BaseViewModel;
import com.android.app_base.http.ResultData;
import com.android.app_base.utils.RxUtils;
+import com.android.app_base.utils.Utils;
import com.application.zhangshi_app_android.bean.FamilyAssetsBean;
-import com.application.zhangshi_app_android.bean.FamilyAssetsResponseBean;
+import com.application.zhangshi_app_android.bean.FamilyAssetsRequestBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
-import com.application.zhangshi_app_android.bean.HomeDevicesBean;
+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.Comparator;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Action;
/**
* @author Ljj
@@ -34,10 +33,10 @@
* @desc
*/
public class FamilyAssetsActivityViewModel extends BaseViewModel<DataRepository> {
-
- private MutableLiveData<List<FamilyAssetsBean>> checkListLiveData;//閫変腑鐨勬暟鎹�
private MutableLiveData<List<FamilyAssetsBean>> dataListLiveData;//鎵�鏈夋暟鎹�
+ private MutableLiveData<List<FamilyAssetsBean>> moreListLiveData;//鍔犺浇鏇村鏁版嵁
+ private MutableLiveData<FamilyAssetsRequestBean> requestBeanLiveData;//璇锋眰鍙傛暟
public FamilyAssetsActivityViewModel(@NonNull Application application) {
super(application);
@@ -49,17 +48,24 @@
}
+ /**
+ * 鑾峰彇瀹跺涵璧勪骇
+ */
public void getFamilyAssets(){
- model.getFamilyAssets(new HashMap<>())
+ if (getRequestBeanLiveData().getValue() == null){
+ getRequestBeanLiveData().setValue(new FamilyAssetsRequestBean());
+ }
+ getRequestBeanLiveData().getValue().setPageNum(1);
+ model.getFamilyAssets(getRequestBeanLiveData().getValue().toMap())
.compose(RxUtils.schedulersTransformer())
- .subscribe(new Observer<ResultData<FamilyAssetsResponseBean>>() {
+ .subscribe(new Observer<ResultData<PageResponseBean<FamilyAssetsBean>>>() {
@Override
public void onSubscribe(Disposable d) {
addSubscribe(d);
}
@Override
- public void onNext(ResultData<FamilyAssetsResponseBean> data) {
+ public void onNext(ResultData<PageResponseBean<FamilyAssetsBean>> data) {
if (data.getCode() == CODE_SUCCESS){
if (data.getData().getData().isEmpty()){
changeStateView(StateViewEnum.DATA_NULL);
@@ -84,13 +90,54 @@
});
}
- public MutableLiveData<List<FamilyAssetsBean>> getCheckListLiveData() {
- return checkListLiveData;
+ /**
+ * 鍔犺浇鏇村
+ */
+ public void loadMoreFamilyAssets(){
+ if (getRequestBeanLiveData().getValue() == null){
+ getRequestBeanLiveData().setValue(new FamilyAssetsRequestBean());
+ }
+ getRequestBeanLiveData().getValue().setPageNum(getRequestBeanLiveData().getValue().getPageNum() + 1);
+ model.getFamilyAssets(getRequestBeanLiveData().getValue().toMap())
+ .compose(RxUtils.schedulersTransformer())
+ .doFinally(new Action() {
+ @Override
+ public void run() throws Exception {
+ changeStateView(StateViewEnum.DATA_FINISH);
+ }
+ })
+ .subscribe(new Observer<ResultData<PageResponseBean<FamilyAssetsBean>>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<PageResponseBean<FamilyAssetsBean>> 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 setCheckListLiveData(MutableLiveData<List<FamilyAssetsBean>> checkListLiveData) {
- this.checkListLiveData = checkListLiveData;
- }
public MutableLiveData<List<FamilyAssetsBean>> getDataListLiveData() {
if (dataListLiveData == null){
@@ -99,8 +146,33 @@
return dataListLiveData;
}
+ public MutableLiveData<FamilyAssetsRequestBean> getRequestBeanLiveData() {
+ if (requestBeanLiveData == null){
+ requestBeanLiveData = new MutableLiveData<>();
+ }
+ if (requestBeanLiveData.getValue() == null){
+ requestBeanLiveData.setValue(new FamilyAssetsRequestBean());
+ }
+ return requestBeanLiveData;
+ }
+
+ public void setRequestBeanLiveData(MutableLiveData<FamilyAssetsRequestBean> requestBeanLiveData) {
+ this.requestBeanLiveData = requestBeanLiveData;
+ }
+
public void setDataListLiveData(MutableLiveData<List<FamilyAssetsBean>> dataListLiveData) {
this.dataListLiveData = dataListLiveData;
+ }
+
+ public MutableLiveData<List<FamilyAssetsBean>> getMoreListLiveData() {
+ if (moreListLiveData == null){
+ moreListLiveData = new MutableLiveData<>();
+ }
+ return moreListLiveData;
+ }
+
+ public void setMoreListLiveData(MutableLiveData<List<FamilyAssetsBean>> moreListLiveData) {
+ this.moreListLiveData = moreListLiveData;
}
public void sortDataList(int type){
@@ -108,30 +180,68 @@
if (list == null || list.isEmpty()){
return;
}
-
- list.sort(new Comparator<FamilyAssetsBean>() {
- @Override
- public int compare(FamilyAssetsBean o1, FamilyAssetsBean 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 (type == 0){
+ System.out.println(dataListLiveData.getValue().size());
+ if (type == 0) {
+ // 浠庢柊鍒版棫锛宯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 if (type == 1) {
+ // 浠庢棫鍒版柊锛宯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;
- }
- });
+ });
+ }
dataListLiveData.postValue(list);
}
+ /**
+ * 鏈鏁版嵁 缃《
+ */
+ public void ownTop(){
+ List<FamilyAssetsBean> 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