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/TourismExperienceActivityViewModel.java | 74 +++++++++++-------------------------
1 files changed, 23 insertions(+), 51 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivityViewModel.java
index e65b436..e256c17 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceActivityViewModel.java
@@ -14,6 +14,8 @@
import com.android.app_base.http.ResultData;
import com.android.app_base.utils.RxUtils;
import com.android.app_base.utils.Utils;
+import com.android.app_base.utils.rxbus.MessageEvent;
+import com.android.app_base.utils.rxbus.RxBus;
import com.application.zhangshi_app_android.bean.PageResponseBean;
import com.application.zhangshi_app_android.bean.TourismExperienceBean;
import com.application.zhangshi_app_android.bean.TourismExperienceRequestBean;
@@ -39,6 +41,7 @@
private MutableLiveData<TourismExperienceRequestBean> requestBeanLiveData;//璇锋眰鍙傛暟
private MutableLiveData<List<TourismExperienceBean>> finishDeleteListLiveData;//宸茬粡瀹屾垚鍒犻櫎鐨勬暟鎹紝鐢ㄤ簬adapter鐨剅emove鎿嶄綔
private MutableLiveData<Integer> operateTypeLiveData;//鎿嶄綔绫诲瀷 0 閫夋嫨鎿嶄綔 1.瀹屾垚 2.鍒犻櫎
+ private String cid;//瀹岀編鏃呴�攊d
public TourismExperienceActivityViewModel(@NonNull Application application) {
super(application);
@@ -56,48 +59,6 @@
if (getRequestBeanLiveData().getValue() == null){
getRequestBeanLiveData().setValue(new TourismExperienceRequestBean());
}
- getRequestBeanLiveData().getValue().setPageNum(1);
- model.getTourismExperience(getRequestBeanLiveData().getValue().toMap())
- .compose(RxUtils.schedulersTransformer())
- .subscribe(new Observer<ResultData<PageResponseBean<TourismExperienceBean>>>() {
- @Override
- public void onSubscribe(Disposable d) {
- addSubscribe(d);
- }
-
- @Override
- public void onNext(ResultData<PageResponseBean<TourismExperienceBean>> 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 getMoreTourismExperience() {
- if (getRequestBeanLiveData().getValue() == null){
- getRequestBeanLiveData().setValue(new TourismExperienceRequestBean());
- }
- getRequestBeanLiveData().getValue().setPageNum(getRequestBeanLiveData().getValue().getPageNum() + 1);
model.getTourismExperience(getRequestBeanLiveData().getValue().toMap())
.compose(RxUtils.schedulersTransformer())
.doFinally(new Action() {
@@ -106,20 +67,20 @@
changeStateView(StateViewEnum.DATA_FINISH);
}
})
- .subscribe(new Observer<ResultData<PageResponseBean<TourismExperienceBean>>>() {
+ .subscribe(new Observer<ResultData<List<TourismExperienceBean>>>() {
@Override
public void onSubscribe(Disposable d) {
addSubscribe(d);
}
@Override
- public void onNext(ResultData<PageResponseBean<TourismExperienceBean>> data) {
+ public void onNext(ResultData<List<TourismExperienceBean>> data) {
if (data.getCode() == CODE_SUCCESS){
- if (data.getData().getData().isEmpty()){
- messageLiveData.postValue("娌℃湁鏇村鏁版嵁浜�");
+ if (data.getData() == null || data.getData().isEmpty() ){
+ changeStateView(StateViewEnum.DATA_NULL);
}else {
changeStateView(StateViewEnum.HIDE);
- moreListLiveData.postValue(data.getData().getData());
+ dataListLiveData.postValue(data.getData());
}
}else {
messageLiveData.postValue(data.getMsg());
@@ -137,6 +98,7 @@
}
});
}
+
/**
* 鍒犻櫎澶氶�夐�変腑鐨勬暟鎹�
*/
@@ -162,6 +124,7 @@
messageLiveData.postValue("鍒犻櫎鎴愬姛");
finishDeleteListLiveData.postValue(checkListLiveData.getValue());
getCheckListLiveData().postValue(new ArrayList<>());
+ RxBus.getInstance().post(new MessageEvent(MessageEvent.EVENT_TOURISM_CONSUME_CHANGE,cid));
}else {
messageLiveData.postValue(stringResultData.getMsg());
}
@@ -197,6 +160,7 @@
list.add(tourismExperienceBean);
finishDeleteListLiveData.postValue(list);
messageLiveData.postValue("鍒犻櫎鎴愬姛");
+ RxBus.getInstance().post(new MessageEvent(MessageEvent.EVENT_TOURISM_CONSUME_CHANGE,cid));
}else {
messageLiveData.postValue(stringResultData.getMsg());
}
@@ -291,6 +255,14 @@
this.finishDeleteListLiveData = finishDeleteListLiveData;
}
+ public String getCid() {
+ return cid;
+ }
+
+ public void setCid(String cid) {
+ this.cid = cid;
+ }
+
/**
* 鏀瑰彉鎺掑簭
* @param b true 闄嶅簭 false 鍗囧簭
@@ -303,8 +275,8 @@
if (b) {
// 浠庢柊鍒版棫锛宯ull鎺掓渶鍚�
list.sort((o1, o2) -> {
- String happenTime1 = o1.getHappenTime();
- String happenTime2 = o2.getHappenTime();
+ String happenTime1 = o1.getHappenDate();
+ String happenTime2 = o2.getHappenDate();
if (TextUtils.isEmpty(happenTime1) && TextUtils.isEmpty(happenTime2)) {
return 0;
} else if (TextUtils.isEmpty(happenTime1)) {
@@ -323,8 +295,8 @@
} else {
// 浠庢棫鍒版柊锛宯ull鎺掓渶鍓�
list.sort((o1, o2) -> {
- String happenTime1 = o1.getHappenTime();
- String happenTime2 = o2.getHappenTime();
+ String happenTime1 = o1.getHappenDate();
+ String happenTime2 = o2.getHappenDate();
if (TextUtils.isEmpty(happenTime1) && TextUtils.isEmpty(happenTime2)) {
return 0;
} else if (TextUtils.isEmpty(happenTime1)) {
--
Gitblit v1.9.1