From 9eef1c69f214882b5ada2dae2a55df21bdd3058b Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期一, 26 六月 2023 16:02:48 +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 | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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 7e4d36b..5ae379f 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;
@@ -21,7 +19,6 @@
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.widget.LoadingDialog;
-import org.greenrobot.eventbus.EventBus;
import java.util.Locale;
@@ -107,15 +104,15 @@
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)
@@ -165,7 +162,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