From 82e57df230ecb744af6c8865f80870ba03c86d89 Mon Sep 17 00:00:00 2001 From: Linjiajia <319408893@qq.com> Date: 星期二, 25 七月 2023 22:18:27 +0800 Subject: [PATCH] 基本功能完成 --- app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaDetailActivityViewModel.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaDetailActivityViewModel.java similarity index 93% rename from app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java rename to app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaDetailActivityViewModel.java index e37573d..539c971 100644 --- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java +++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaDetailActivityViewModel.java @@ -11,6 +11,7 @@ import com.android.app_base.http.ResultData; import com.android.app_base.manager.AppManager; import com.android.app_base.utils.RxUtils; +import com.android.app_base.utils.rxbus.RxBus; import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean; import com.application.zhangshi_app_android.bean.UploadFileResponseBean; import com.application.zhangshi_app_android.data.DataRepository; @@ -23,11 +24,11 @@ import okhttp3.MultipartBody; import okhttp3.RequestBody; -public class CreateFamilyProjectActivityViewModel extends BaseViewModel<DataRepository> { +public class FamilyMemorabiliaDetailActivityViewModel extends BaseViewModel<DataRepository> { private MutableLiveData<FamilyMemorabiliaBean> beanMutableLiveData; private MutableLiveData<Boolean> typeLiveData;//true 缂栬緫鐘舵�� false 灞曠ず鐘舵�� - public CreateFamilyProjectActivityViewModel(@NonNull Application application) { + public FamilyMemorabiliaDetailActivityViewModel(@NonNull Application application) { super(application); } @@ -51,8 +52,9 @@ @Override public void onNext(ResultData<String> stringResultData) { if (stringResultData.getCode() == CODE_SUCCESS){ - messageLiveData.postValue("娣诲姞鎴愬姛"); AppManager.getAppManager().finishCurrentActivity(); + RxBus.getInstance().post(beanMutableLiveData.getValue()); + messageLiveData.postValue("娣诲姞鎴愬姛"); }else { messageLiveData.postValue(stringResultData.getMsg()); } @@ -84,8 +86,9 @@ @Override public void onNext(ResultData<String> stringResultData) { if (stringResultData.getCode() == CODE_SUCCESS){ - messageLiveData.postValue("鍒犻櫎鎴愬姛"); AppManager.getAppManager().finishCurrentActivity(); + RxBus.getInstance().post(beanMutableLiveData.getValue()); + messageLiveData.postValue("鍒犻櫎鎴愬姛"); }else { messageLiveData.postValue(stringResultData.getMsg()); } @@ -117,8 +120,9 @@ @Override public void onNext(ResultData<String> stringResultData) { if (stringResultData.getCode() == CODE_SUCCESS){ - messageLiveData.postValue("淇敼鎴愬姛"); AppManager.getAppManager().finishCurrentActivity(); + RxBus.getInstance().post(beanMutableLiveData.getValue()); + messageLiveData.postValue("淇敼鎴愬姛"); }else { messageLiveData.postValue(stringResultData.getMsg()); } -- Gitblit v1.9.1