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 |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 51b3ab8..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;
@@ -123,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);
     }
@@ -202,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