From 31b7700b976a46901f67c5d7a00281ca4745fc9f Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期六, 07 十月 2023 21:44:35 +0800
Subject: [PATCH] 调整旅游模块功能
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivityViewModel.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 93 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivityViewModel.java
index c9961d4..6857a58 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivityViewModel.java
@@ -1,4 +1,5 @@
package com.application.zhangshi_app_android.ui.function;
+
import static com.android.app_base.base.BaseConfig.CODE_SUCCESS;
import android.app.Application;
@@ -6,26 +7,23 @@
import androidx.annotation.NonNull;
import androidx.lifecycle.MutableLiveData;
-import com.android.app_base.base.BaseConfig;
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.ContactsDetailBean;
-import com.application.zhangshi_app_android.bean.FamilyContactsBean;
-
+import com.application.zhangshi_app_android.bean.ContactsRequestBean;
+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.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 Gss
* @date 2023.04.18. 19:54
@@ -33,7 +31,9 @@
*/
public class ContactsActivityViewModel extends BaseViewModel<DataRepository> {
- private MutableLiveData<List<FamilyContactsBean>> dataListLiveData;//鎵�鏈夋暟鎹�
+ private MutableLiveData<ContactsRequestBean> requestBeanLiveData;//璇锋眰鍙傛暟
+ private MutableLiveData<List<ContactsDetailBean>> dataListLiveData;//鎵�鏈夋暟鎹�
+ private MutableLiveData<List<ContactsDetailBean>> moreListLiveData;//鍔犺浇鏇村鏁版嵁
public ContactsActivityViewModel(@NonNull Application application) {
@@ -45,18 +45,24 @@
return DataRepository.getInstance();
}
-
- public void getFamilyContacts(){
- model.getFamilyContacts(new HashMap<>())
+ /**
+ * 鑾峰彇閫氳褰�
+ */
+ public void getContacts(){
+ if (getRequestBeanLiveData().getValue() == null){
+ getRequestBeanLiveData().setValue(new ContactsRequestBean());
+ }
+ getRequestBeanLiveData().getValue().setPageNum(1);
+ model.getContacts(getRequestBeanLiveData().getValue().toMap())
.compose(RxUtils.schedulersTransformer())
- .subscribe(new Observer<ResultData<FamilyContactsBean>>() {
+ .subscribe(new Observer<ResultData<PageResponseBean<ContactsDetailBean>>>() {
@Override
public void onSubscribe(Disposable d) {
addSubscribe(d);
}
@Override
- public void onNext(ResultData<FamilyContactsBean> data) {
+ public void onNext(ResultData<PageResponseBean<ContactsDetailBean>> data) {
if (data.getCode() == CODE_SUCCESS){
if (data.getData().getData().isEmpty()){
changeStateView(StateViewEnum.DATA_NULL);
@@ -81,17 +87,87 @@
});
}
+ /**
+ * 鍔犺浇鏇村
+ */
+ public void loadMoreContacts(){
+ if (getRequestBeanLiveData().getValue() == null){
+ getRequestBeanLiveData().setValue(new ContactsRequestBean());
+ }
+ getRequestBeanLiveData().getValue().setPageNum(getRequestBeanLiveData().getValue().getPageNum() + 1);
+ model.getContacts(getRequestBeanLiveData().getValue().toMap())
+ .compose(RxUtils.schedulersTransformer())
+ .doFinally(new Action() {
+ @Override
+ public void run() throws Exception {
+ changeStateView(StateViewEnum.DATA_FINISH);
+ }
+ })
+ .subscribe(new Observer<ResultData<PageResponseBean<ContactsDetailBean>>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<PageResponseBean<ContactsDetailBean>> 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<FamilyContactsBean>> getDataListLiveData() {
+ public MutableLiveData<List<ContactsDetailBean>> getDataListLiveData() {
if (dataListLiveData == null){
dataListLiveData = new MutableLiveData<>();
}
return dataListLiveData;
}
- public void setDataListLiveData(MutableLiveData<List<FamilyContactsBean>> dataListLiveData) {
+ public void setDataListLiveData(MutableLiveData<List<ContactsDetailBean>> dataListLiveData) {
this.dataListLiveData = dataListLiveData;
}
+ public MutableLiveData<ContactsRequestBean> getRequestBeanLiveData() {
+ if (requestBeanLiveData == null){
+ requestBeanLiveData = new MutableLiveData<>();
+ requestBeanLiveData.setValue(new ContactsRequestBean());
+ }
+
+ return requestBeanLiveData;
+ }
+
+ public MutableLiveData<List<ContactsDetailBean>> getMoreListLiveData() {
+ if (moreListLiveData == null){
+ moreListLiveData = new MutableLiveData<>();
+ }
+ return moreListLiveData;
+ }
+
+ public void setMoreListLiveData(MutableLiveData<List<ContactsDetailBean>> moreListLiveData) {
+ this.moreListLiveData = moreListLiveData;
+ }
+
+ public void setRequestBeanLiveData(MutableLiveData<ContactsRequestBean> requestBeanLiveData) {
+ this.requestBeanLiveData = requestBeanLiveData;
+ }
}
--
Gitblit v1.9.1