提交 5e71db2d 编写于 作者: J JessYan

Exclude AndroidEventBus on arms

上级 82f127c7
......@@ -99,8 +99,8 @@ dependencies {
compileOnly rootProject.ext.dependencies["javax.annotation"]
api rootProject.ext.dependencies["dagger2"]
annotationProcessor rootProject.ext.dependencies["dagger2-compiler"]
api rootProject.ext.dependencies["androideventbus"]
api 'org.greenrobot:eventbus:3.1.1'
compileOnly rootProject.ext.dependencies["androideventbus"]
compileOnly rootProject.ext.dependencies["eventbus"]
api rootProject.ext.dependencies["gson"]
//test
......
......@@ -20,7 +20,7 @@ import android.content.Intent;
import android.os.IBinder;
import android.support.annotation.Nullable;
import org.simple.eventbus.EventBus;
import com.jess.arms.integration.EventBusManager;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.disposables.Disposable;
......@@ -48,7 +48,7 @@ public abstract class BaseService extends Service {
public void onCreate() {
super.onCreate();
if (useEventBus())
EventBus.getDefault().register(this);
EventBusManager.getInstance().register(this);
init();
}
......@@ -56,7 +56,7 @@ public abstract class BaseService extends Service {
public void onDestroy() {
super.onDestroy();
if (useEventBus())
EventBus.getDefault().unregister(this);
EventBusManager.getInstance().unregister(this);
unDispose();//解除订阅
this.mCompositeDisposable = null;
}
......
......@@ -20,10 +20,9 @@ import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.jess.arms.integration.EventBusManager;
import com.jess.arms.utils.ArmsUtils;
import org.simple.eventbus.EventBus;
/**
* ================================================
* {@link ActivityDelegate} 默认实现类
......@@ -48,7 +47,7 @@ public class ActivityDelegateImpl implements ActivityDelegate {
//如果要使用 EventBus 请将此方法返回 true
if (iActivity.useEventBus()){
//注册到事件主线
EventBus.getDefault().register(mActivity);
EventBusManager.getInstance().register(mActivity);
}
//这里提供 AppComponent 对象给 BaseActivity 的子类, 用于 Dagger2 的依赖注入
......@@ -84,7 +83,7 @@ public class ActivityDelegateImpl implements ActivityDelegate {
public void onDestroy() {
//如果要使用 EventBus 请将此方法返回 true
if (iActivity != null && iActivity.useEventBus())
EventBus.getDefault().unregister(mActivity);
EventBusManager.getInstance().unregister(mActivity);
this.iActivity = null;
this.mActivity = null;
}
......
......@@ -21,10 +21,9 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.View;
import com.jess.arms.integration.EventBusManager;
import com.jess.arms.utils.ArmsUtils;
import org.simple.eventbus.EventBus;
import butterknife.ButterKnife;
import butterknife.Unbinder;
import timber.log.Timber;
......@@ -59,7 +58,7 @@ public class FragmentDelegateImpl implements FragmentDelegate {
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
if (iFragment.useEventBus())//如果要使用eventbus请将此方法返回true
EventBus.getDefault().register(mFragment);//注册到事件主线
EventBusManager.getInstance().register(mFragment);//注册到事件主线
iFragment.setupFragmentComponent(ArmsUtils.obtainAppComponentFromContext(mFragment.getActivity()));
}
......@@ -116,7 +115,7 @@ public class FragmentDelegateImpl implements FragmentDelegate {
@Override
public void onDestroy() {
if (iFragment != null && iFragment.useEventBus())//如果要使用eventbus请将此方法返回true
EventBus.getDefault().unregister(mFragment);//注册到事件主线
EventBusManager.getInstance().unregister(mFragment);//注册到事件主线
this.mUnbinder = null;
this.mFragmentManager = null;
this.mFragment = null;
......
......@@ -25,11 +25,10 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.SupportActivity;
import android.view.View;
import com.jess.arms.integration.EventBusManager;
import com.jess.arms.utils.Preconditions;
import com.trello.rxlifecycle2.RxLifecycle;
import org.simple.eventbus.EventBus;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Action;
......@@ -91,7 +90,7 @@ public class BasePresenter<M extends IModel, V extends IView> implements IPresen
}
}
if (useEventBus())//如果要使用 Eventbus 请将此方法返回 true
EventBus.getDefault().register(this);//注册 Eventbus
EventBusManager.getInstance().register(this);//注册 Eventbus
}
/**
......@@ -100,7 +99,7 @@ public class BasePresenter<M extends IModel, V extends IView> implements IPresen
@Override
public void onDestroy() {
if (useEventBus())//如果要使用 Eventbus 请将此方法返回 true
EventBus.getDefault().unregister(this);//解除注册 Eventbus
EventBusManager.getInstance().unregister(this);//解除注册 Eventbus
unDispose();//解除订阅
if (mModel != null)
mModel.onDestroy();
......
......@@ -81,6 +81,7 @@ ext {
"dagger2-compiler" : "com.google.dagger:dagger-compiler:${version["dagger2SdkVersion"]}",
"dagger2-android-processor": "com.google.dagger:dagger-android-processor:${version["dagger2SdkVersion"]}",
"androideventbus" : "org.simple:androideventbus:1.0.5.1",
"eventbus" : "org.greenrobot:eventbus:3.1.1",
"otto" : "com.squareup:otto:1.3.8",
"gson" : "com.google.code.gson:gson:2.8.2",
"multidex" : "com.android.support:multidex:1.0.1",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册