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 | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 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..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;
@@ -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.ContactsResponseBean;
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;
+
/**
* @author Gss
* @date 2023.04.18. 19:54
@@ -33,7 +31,8 @@
*/
public class ContactsActivityViewModel extends BaseViewModel<DataRepository> {
- private MutableLiveData<List<FamilyContactsBean>> dataListLiveData;//鎵�鏈夋暟鎹�
+ private MutableLiveData<ContactsRequestBean> requestBeanLiveData;//璇锋眰鍙傛暟
+ private MutableLiveData<List<ContactsDetailBean>> dataListLiveData;//鎵�鏈夋暟鎹�
public ContactsActivityViewModel(@NonNull Application application) {
@@ -46,17 +45,20 @@
}
- public void getFamilyContacts(){
- model.getFamilyContacts(new HashMap<>())
+ public void getContacts(){
+ if (getRequestBeanLiveData().getValue() == null){
+ getRequestBeanLiveData().setValue(new ContactsRequestBean());
+ }
+ model.getContacts(getRequestBeanLiveData().getValue().toMap())
.compose(RxUtils.schedulersTransformer())
- .subscribe(new Observer<ResultData<FamilyContactsBean>>() {
+ .subscribe(new Observer<ResultData<ContactsResponseBean>>() {
@Override
public void onSubscribe(Disposable d) {
addSubscribe(d);
}
@Override
- public void onNext(ResultData<FamilyContactsBean> data) {
+ public void onNext(ResultData<ContactsResponseBean> data) {
if (data.getCode() == CODE_SUCCESS){
if (data.getData().getData().isEmpty()){
changeStateView(StateViewEnum.DATA_NULL);
@@ -83,15 +85,27 @@
- 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 void setRequestBeanLiveData(MutableLiveData<ContactsRequestBean> requestBeanLiveData) {
+ this.requestBeanLiveData = requestBeanLiveData;
+ }
}
--
Gitblit v1.9.1