From 63b0ee228bf52e8e9c4d7fc51a1117543c9a67af Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期一, 03 七月 2023 19:02:40 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP
---
app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
index 1cd2301..82120dc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
@@ -3,11 +3,9 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.view.WindowManager;
import android.widget.FrameLayout;
import androidx.annotation.NonNull;
@@ -17,10 +15,15 @@
import androidx.lifecycle.Lifecycle;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.bean.BaseEventBus;
import com.hdl.photovoltaic.listener.BaseView;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.widget.LoadingDialog;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
import java.util.Locale;
@@ -90,7 +93,8 @@
protected void onLazyInitView(Bundle savedInstanceState) {
onBindView(savedInstanceState);
-// registerEventBus();
+ //娉ㄥ唽EventBus
+ registerEventBus();
}
@@ -101,26 +105,27 @@
isFirst = true;
//闅愯棌Loading
hideLoading();
-// unregisterEventBus();
+ //娉ㄩ攢EventBus
+ unregisterEventBus();
}
protected void unregisterEventBus() {
-// if (EventBus.getDefault().isRegistered(this)) {
-// EventBus.getDefault().unregister(this);
-// }
+ if (EventBus.getDefault().isRegistered(this)) {
+ EventBus.getDefault().unregister(this);
+ }
}
protected void registerEventBus() {
-// if (!EventBus.getDefault().isRegistered(this)) {
-// EventBus.getDefault().register(this);
-// }
+ if (!EventBus.getDefault().isRegistered(this)) {
+ EventBus.getDefault().register(this);
+ }
}
-// @Subscribe(threadMode = ThreadMode.MAIN)
-// public void onEventMessage(BaseEvent event) {
-//
-// }
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEventMessage(BaseEventBus eventBus) {
+
+ }
/**
* 鏄剧ずView
@@ -164,7 +169,7 @@
*/
protected LoadingDialog getLoadingDialog() {
if (loadingDialog == null && _mActivity != null) {
- loadingDialog = new LoadingDialog(_mActivity, R.style.Custom_AlertDialog);
+ loadingDialog = new LoadingDialog(_mActivity, R.style.Custom_Dialog);
}
return loadingDialog;
}
--
Gitblit v1.8.0