From efafbbf142c81c233c71de636a2d3ce9dc2124f0 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 12 九月 2023 19:20:05 +0800
Subject: [PATCH] 修复bug
---
app_base/src/main/java/com/android/app_base/base/view/BaseActivity.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/app_base/src/main/java/com/android/app_base/base/view/BaseActivity.java b/app_base/src/main/java/com/android/app_base/base/view/BaseActivity.java
index 73f922c..aa5a3ff 100644
--- a/app_base/src/main/java/com/android/app_base/base/view/BaseActivity.java
+++ b/app_base/src/main/java/com/android/app_base/base/view/BaseActivity.java
@@ -23,6 +23,7 @@
import com.android.app_base.base.action.ClickAction;
import com.android.app_base.base.viewmodel.BaseViewModel;
import com.android.app_base.base.StateViewEnum;
+import com.android.app_base.base.viewmodel.SimpleViewModel;
import com.blankj.utilcode.util.ToastUtils;
import com.gyf.immersionbar.ImmersionBar;
import com.hjq.bar.TitleBar;
@@ -57,11 +58,6 @@
initView();
//椤甸潰浜嬩欢鐩戝惉鐨勬柟娉曪紝鐢ㄤ簬ViewModel灞傝浆鍒癡iew灞傜殑浜嬩欢娉ㄥ唽
initLiveDataObserve();
-
- }
- @Override
- protected void onResume() {
- super.onResume();
//椤甸潰鏁版嵁鍒濆鍖栨柟娉�
initData();
}
@@ -128,8 +124,8 @@
if (type instanceof ParameterizedType){
vmClass = (Class) ((ParameterizedType) type).getActualTypeArguments()[1];
} else {
- //濡傛灉娌℃湁鎸囧畾娉涘瀷鍙傛暟锛屽垯榛樿浣跨敤BaseViewModel
- vmClass = (Class<VM>) BaseViewModel.class;
+ //濡傛灉娌℃湁鎸囧畾娉涘瀷鍙傛暟锛屽垯榛樿浣跨敤SimpleViewModel
+ vmClass = (Class<VM>) SimpleViewModel.class;
}
return new ViewModelProvider(this, (ViewModelProvider.Factory) ViewModelProvider.AndroidViewModelFactory.getInstance(getApplication())).get(vmClass);
}
@@ -151,6 +147,9 @@
break;
case DATA_LOADING:
dataLoading();
+ break;
+ case DATA_FINISH:
+ dataFinish();
break;
case DATA_ERROR:
dataError();
@@ -176,6 +175,9 @@
}
});
}
+
+
+
/**
* 缂虹渷椤电瓑鐘舵�佽鍥剧殑鏇存柊
* 鏈夐渶姹傜殑锛屽湪瀛愮被閫夋嫨閲嶅啓
@@ -185,6 +187,8 @@
protected void dialogDismiss() {
}
protected void dataLoading() {
+ }
+ protected void dataFinish() {
}
protected void dataError() {
}
@@ -199,12 +203,14 @@
* 鍒濆鍖栨矇娴稿紡鐘舵�佹爮
*/
protected void initStatusBar(){
+ if (getTitleBar() != null) {
+ getTitleBar().setOnTitleBarListener(this);
+ }
if (isStatusBarImmersionEnabled()) {
getImmersionBarConfig().init();
// 璁剧疆鏍囬鏍忔矇娴�()
if (getTitleBar() != null) {
ImmersionBar.setTitleBar(this, getTitleBar());
- getTitleBar().setOnTitleBarListener(this);
}
}
}
--
Gitblit v1.9.1