From a0dc6be52293a64ebfe38b8c2391dc7d2ffe63ae Mon Sep 17 00:00:00 2001 From: Linjiajia <319408893@qq.com> Date: 星期一, 15 五月 2023 20:05:27 +0800 Subject: [PATCH] 提交代码 --- app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivityViewModel.java | 94 ++++++++++++++++++++++++++++------------------ 1 files changed, 57 insertions(+), 37 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 d73e419..3f2c5b4 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; @@ -8,11 +9,13 @@ 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.ContactsBean; - +import com.application.zhangshi_app_android.bean.ContactsRequestBean; +import com.application.zhangshi_app_android.bean.ContactsResponseBean; import com.application.zhangshi_app_android.data.DataRepository; import java.util.HashMap; @@ -20,6 +23,7 @@ import io.reactivex.Observer; import io.reactivex.disposables.Disposable; + /** * @author Gss * @date 2023.04.18. 19:54 @@ -27,7 +31,8 @@ */ public class ContactsActivityViewModel extends BaseViewModel<DataRepository> { - private MutableLiveData<List<ContactsBean>> dataListLiveData;//鎵�鏈夋暟鎹� + private MutableLiveData<ContactsRequestBean> requestBeanLiveData;//璇锋眰鍙傛暟 + private MutableLiveData<List<ContactsDetailBean>> dataListLiveData;//鎵�鏈夋暟鎹� public ContactsActivityViewModel(@NonNull Application application) { @@ -41,51 +46,66 @@ public void getContacts(){ -// model.getFamilyContacts(new HashMap<>()) -// .compose(RxUtils.schedulersTransformer()) -// .subscribe(new Observer<ResultData<ContactsBean>>() { -// @Override -// public void onSubscribe(Disposable d) { -// addSubscribe(d); -// } -// -// @Override -// public void onNext(ResultData<ContactsBean> 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() { -// -// } -// }); + if (getRequestBeanLiveData().getValue() == null){ + getRequestBeanLiveData().setValue(new ContactsRequestBean()); + } + model.getContacts(getRequestBeanLiveData().getValue().toMap()) + .compose(RxUtils.schedulersTransformer()) + .subscribe(new Observer<ResultData<ContactsResponseBean>>() { + @Override + public void onSubscribe(Disposable d) { + addSubscribe(d); + } + + @Override + public void onNext(ResultData<ContactsResponseBean> 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 MutableLiveData<List<ContactsBean>> getDataListLiveData() { + public MutableLiveData<List<ContactsDetailBean>> getDataListLiveData() { if (dataListLiveData == null){ dataListLiveData = new MutableLiveData<>(); } return dataListLiveData; } - public void setDataListLiveData(MutableLiveData<List<ContactsBean>> 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 void setRequestBeanLiveData(MutableLiveData<ContactsRequestBean> requestBeanLiveData) { + this.requestBeanLiveData = requestBeanLiveData; + } } -- Gitblit v1.9.1