From b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期三, 28 二月 2024 17:26:58 +0800
Subject: [PATCH] 1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段
---
app_base/src/main/java/com/android/app_base/base/viewmodel/BaseViewModel.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/app_base/src/main/java/com/android/app_base/base/viewmodel/BaseViewModel.java b/app_base/src/main/java/com/android/app_base/base/viewmodel/BaseViewModel.java
index 078d3c0..0acb457 100644
--- a/app_base/src/main/java/com/android/app_base/base/viewmodel/BaseViewModel.java
+++ b/app_base/src/main/java/com/android/app_base/base/viewmodel/BaseViewModel.java
@@ -12,6 +12,9 @@
import com.android.app_base.base.StateViewEnum;
import com.android.app_base.base.model.BaseModel;
+
+import org.reactivestreams.Subscriber;
+
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.disposables.Disposable;
@@ -28,7 +31,8 @@
/**
* 鎺у埗鐘舵�佽鍥剧殑LiveData
*/
- private MutableLiveData<StateViewEnum> stateViewLiveData;
+ protected MutableLiveData<StateViewEnum> stateViewLiveData = new MutableLiveData<>();
+ protected MutableLiveData<String> messageLiveData = new MutableLiveData<>();
//绠＄悊RxJava锛屼富瑕侀拡瀵筊xJava寮傛鎿嶄綔閫犳垚鐨勫唴瀛樻硠婕�
private CompositeDisposable mCompositeDisposable;
@@ -46,7 +50,6 @@
/**
* Rxjava鐨勫紓姝ユ搷浣滈兘瑕佽皟鐢ㄦ鏂规硶娣诲姞鍒� mCompositeDisposable閲岋紝
- * @param disposable
*/
protected void addSubscribe(Disposable disposable) {
if (mCompositeDisposable == null) {
@@ -64,6 +67,12 @@
}
return stateViewLiveData;
}
+ public MutableLiveData<String> getMessageLivaData(){
+ if(messageLiveData == null){
+ messageLiveData = new MutableLiveData<>();
+ }
+ return messageLiveData;
+ }
/**
* 鏇存敼鐘舵�佽鍥剧殑鐘舵��
*/
--
Gitblit v1.9.1