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/HundredWishActivityViewModel.java | 209 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 181 insertions(+), 28 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/HundredWishActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HundredWishActivityViewModel.java
index 831bd6f..4e7ea82 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/HundredWishActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HundredWishActivityViewModel.java
@@ -1,17 +1,30 @@
package com.application.zhangshi_app_android.ui.function;
+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;
+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.android.app_base.utils.Utils;
import com.application.zhangshi_app_android.bean.HundredWishBean;
-import com.application.zhangshi_app_android.bean.PropertyBean;
+import com.application.zhangshi_app_android.bean.HundredWishRequestBean;
+import com.application.zhangshi_app_android.bean.PageResponseBean;
import com.application.zhangshi_app_android.data.DataRepository;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Action;
/**
* @author Ljj
@@ -20,6 +33,8 @@
*/
public class HundredWishActivityViewModel extends BaseViewModel<DataRepository> {
private MutableLiveData<List<HundredWishBean>> dataListLiveData;
+ private MutableLiveData<List<HundredWishBean>> moreListLiveData;//鍔犺浇鏇村鏁版嵁
+ private MutableLiveData<HundredWishRequestBean> requestBeanLiveData;//璇锋眰鍙傛暟
public HundredWishActivityViewModel(@NonNull Application application) {
super(application);
@@ -29,42 +44,180 @@
protected DataRepository initModel() {
return DataRepository.getInstance();
}
+ /**
+ * 鑾峰彇鏁版嵁
+ */
+ public void getProperty() {
+ if (getRequestBeanLiveData().getValue() == null){
+ getRequestBeanLiveData().setValue(new HundredWishRequestBean());
+ }
+ getRequestBeanLiveData().getValue().setPageNum(1);
+ model.getHundredWish(getRequestBeanLiveData().getValue().toMap())
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new Observer<ResultData<PageResponseBean<HundredWishBean>>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+ @Override
+ public void onNext(ResultData<PageResponseBean<HundredWishBean>> data) {
+ if (data.getCode() == CODE_SUCCESS){
+ if (data.getData().getData().isEmpty()){
+ changeStateView(StateViewEnum.DATA_NULL);
+ }else {
+ changeStateView(StateViewEnum.HIDE);
+ dataListLiveData.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 getMoreProperty(){
+ if (getRequestBeanLiveData().getValue() == null){
+ getRequestBeanLiveData().setValue(new HundredWishRequestBean());
+ }
+ getRequestBeanLiveData().getValue().setPageNum(getRequestBeanLiveData().getValue().getPageNum() + 1);
+ model.getHundredWish(getRequestBeanLiveData().getValue().toMap())
+ .compose(RxUtils.schedulersTransformer())
+ .doFinally(new Action() {
+ @Override
+ public void run() throws Exception {
+ changeStateView(StateViewEnum.DATA_FINISH);
+ }
+ })
+ .subscribe(new Observer<ResultData<PageResponseBean<HundredWishBean>>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<PageResponseBean<HundredWishBean>> 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 MutableLiveData<List<HundredWishBean>> getDataListLiveData() {
- if (dataListLiveData == null) {
+ if (dataListLiveData == null){
dataListLiveData = new MutableLiveData<>();
}
return dataListLiveData;
}
-
public void setDataListLiveData(MutableLiveData<List<HundredWishBean>> dataListLiveData) {
this.dataListLiveData = dataListLiveData;
}
-
- public void getHundredWish() {
- List<HundredWishBean> beans = new ArrayList<>();
- for (int i = 0; i < 10; i++) {
- HundredWishBean bean = new HundredWishBean();
- bean.setTitle("鏍囬");
- bean.setCreateTime("2020-01-01");
- bean.setReason("濮嬩簬浣曞洜");
- bean.setBeneficiary("鍙楁儬浜�");
- bean.setHeir("缁ф壙浜�");
- bean.setDifficulty("瀹炵幇闅惧害");
- bean.setIsEffective(1);
- bean.setRemark("澶囨敞");
- beans.add(bean);
+ public MutableLiveData<HundredWishRequestBean> getRequestBeanLiveData() {
+ if (requestBeanLiveData == null){
+ requestBeanLiveData = new MutableLiveData<>();
}
- HundredWishBean bean = new HundredWishBean();
- bean.setTitle("鏍囬aaaaaaaaaaaaaa");
- bean.setCreateTime("2020-01-01");
- bean.setReason("濮嬩簬浣曞洜");
- bean.setBeneficiary("鍙楁儬浜�");
- bean.setHeir("缁ф壙浜�");
- bean.setDifficulty("瀹炵幇闅惧害");
- bean.setIsEffective(1);
- bean.setRemark("澶囨敞");
- beans.add(bean);
- dataListLiveData.setValue(beans);
+ if (requestBeanLiveData.getValue() == null){
+ requestBeanLiveData.setValue(new HundredWishRequestBean());
+ }
+ return requestBeanLiveData;
+ }
+
+ public void setRequestBeanLiveData(MutableLiveData<HundredWishRequestBean> requestBeanLiveData) {
+ this.requestBeanLiveData = requestBeanLiveData;
+ }
+
+
+
+ public MutableLiveData<List<HundredWishBean>> getMoreListLiveData() {
+ if (moreListLiveData == null){
+ moreListLiveData = new MutableLiveData<>();
+ }
+ return moreListLiveData;
+ }
+
+ public void setMoreListLiveData(MutableLiveData<List<HundredWishBean>> moreListLiveData) {
+ this.moreListLiveData = moreListLiveData;
+ }
+
+ /**
+ * 鎺掑簭
+ * @param type 0 浠庢柊鍒版棫 1 浠庢棫鍒版柊
+ */
+ public void sortDataList(int type){
+ List<HundredWishBean> list = dataListLiveData.getValue();
+ if (list == null || list.isEmpty()){
+ return;
+ }
+ 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);
+ }
+ 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;
+ }
+ });
+ }
+ dataListLiveData.setValue(list);
}
}
--
Gitblit v1.9.1