From 1ad33847e84874d4fec803190e92b8e3f49a59fe Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 28 三月 2023 19:00:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_android
---
app_base/src/main/java/com/android/app_base/base/view/BaseActivity.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 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 2fb56c9..300fbaa 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
@@ -19,10 +19,13 @@
import androidx.lifecycle.ViewModelProvider;
import com.android.app_base.action.TitleBarAction;
+import com.android.app_base.base.BaseApplication;
+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.utils.ScreenSizeUtils;
+import com.blankj.utilcode.util.ToastUtils;
import com.gyf.immersionbar.ImmersionBar;
-import com.hjq.bar.OnTitleBarListener;
import com.hjq.bar.TitleBar;
import java.lang.reflect.ParameterizedType;
@@ -31,7 +34,7 @@
/**
* Activity鍩虹被,鎵�鏈夌殑 Activity 閮借缁ф壙姝ょ被
*/
-public abstract class BaseActivity<V extends ViewDataBinding,VM extends BaseViewModel> extends AppCompatActivity implements TitleBarAction{
+public abstract class BaseActivity<V extends ViewDataBinding,VM extends BaseViewModel> extends AppCompatActivity implements TitleBarAction, ClickAction {
protected V binding;
protected VM viewModel;
private int viewModelId;
@@ -46,10 +49,6 @@
private ImmersionBar mImmersionBar;
- @Override
- protected void onResume() {
- super.onResume();
- }
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -60,11 +59,16 @@
initParam();
//椤甸潰view鍒濆鍖栨柟娉�
initView();
- //椤甸潰鏁版嵁鍒濆鍖栨柟娉�
- initData();
//椤甸潰浜嬩欢鐩戝惉鐨勬柟娉曪紝鐢ㄤ簬ViewModel灞傝浆鍒癡iew灞傜殑浜嬩欢娉ㄥ唽
initLiveDataObserve();
}
+ @Override
+ protected void onResume() {
+ super.onResume();
+ //椤甸潰鏁版嵁鍒濆鍖栨柟娉�
+ initData();
+ }
+
@Override
protected void onDestroy() {
@@ -160,6 +164,12 @@
}
}
});
+ viewModel.getMessageLivaData().observe(this, new Observer<String>() {
+ @Override
+ public void onChanged(String message) {
+ ToastUtils.showShort(message);
+ }
+ });
}
/**
* 缂虹渷椤电瓑鐘舵�佽鍥剧殑鏇存柊
@@ -233,12 +243,6 @@
return mTitleBar;
}
- @Override
- public void onLeftClick(TitleBar titleBar) {
- TitleBarAction.super.onLeftClick(titleBar);
- onBackPressed();
- }
-
/**
* 鑾峰彇鏍瑰竷灞�鐨刬d锛岀敱瀛愮被瀹炵幇杩斿洖
* @return layout鐨刬d
@@ -288,6 +292,7 @@
InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
if (manager != null && manager.isActive(view)) {
manager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+ view.clearFocus();
}
}
}
--
Gitblit v1.9.1