From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivityViewModel.java | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivityViewModel.java
index 016d0de..1ad74bc 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivityViewModel.java
@@ -28,13 +28,6 @@
* @desc 鎴愰暱缁忓巻 viewModel
*/
public class GrowthExperienceActivityViewModel extends BaseViewModel<DataRepository> {
- private MutableLiveData<GrowthExperienceBean> beanMutableLiveData;
- private MutableLiveData<List<GrowthExperienceBean>> checkListLiveData;
- private MutableLiveData<List<GrowthExperienceBean>> dataListLiveData;
- private MutableLiveData<String> stringMutableLiveData;
-
-
-
public GrowthExperienceActivityViewModel(@NonNull Application application) {
super(application);
@@ -44,10 +37,4 @@
return DataRepository.getInstance();
}
- @Override
- public void onCreate(@NonNull LifecycleOwner owner) {
- super.onCreate(owner);
- GrowthExperienceActivityViewModel viewModel=new ViewModelProvider(this).get(GrowthExperienceActivityViewModel.class);
- DataBindingUtil.setContentView(this, R.layout.activity_growth_experience).setViewModel(viewModel);
- }
}
--
Gitblit v1.9.1