|
@@ -3,12 +3,11 @@ package com.miekir.mvp.view;
|
|
|
import android.os.Bundle;
|
|
import android.os.Bundle;
|
|
|
import android.util.Log;
|
|
import android.util.Log;
|
|
|
|
|
|
|
|
-import androidx.lifecycle.LiveData;
|
|
|
|
|
import androidx.lifecycle.MutableLiveData;
|
|
import androidx.lifecycle.MutableLiveData;
|
|
|
import androidx.lifecycle.Observer;
|
|
import androidx.lifecycle.Observer;
|
|
|
|
|
|
|
|
import com.miekir.mvp.base.BaseActivity;
|
|
import com.miekir.mvp.base.BaseActivity;
|
|
|
-import com.miekir.mvp.base.BaseResult;
|
|
|
|
|
|
|
+import com.miekir.mvp.base.DataResult;
|
|
|
import com.miekir.mvp.presenter.BasePresenter;
|
|
import com.miekir.mvp.presenter.BasePresenter;
|
|
|
import com.miekir.mvp.presenter.InjectPresenter;
|
|
import com.miekir.mvp.presenter.InjectPresenter;
|
|
|
|
|
|
|
@@ -44,20 +43,19 @@ public abstract class BaseMVPActivity extends BaseActivity implements IView {
|
|
|
if (injectPresenter != null) {
|
|
if (injectPresenter != null) {
|
|
|
try {
|
|
try {
|
|
|
//创建一个观察者去更新UI
|
|
//创建一个观察者去更新UI
|
|
|
- final Observer<BaseResult> observer = new Observer<BaseResult>() {
|
|
|
|
|
|
|
+ final Observer<DataResult> observer = new Observer<DataResult>() {
|
|
|
@Override
|
|
@Override
|
|
|
- public void onChanged(final BaseResult result) {
|
|
|
|
|
- Log.e("mmmmm", "code: " + result.getCode());
|
|
|
|
|
|
|
+ public void onChanged(final DataResult result) {
|
|
|
|
|
+ onDataResult(result);
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
-
|
|
|
|
|
- MutableLiveData<BaseResult> liveData = new MutableLiveData<BaseResult>();
|
|
|
|
|
|
|
+ MutableLiveData<DataResult> liveData = new MutableLiveData<DataResult>();
|
|
|
liveData.observe(this, observer);
|
|
liveData.observe(this, observer);
|
|
|
|
|
|
|
|
-
|
|
|
|
|
Class<? extends BasePresenter> type = (Class<? extends BasePresenter>) field.getType();
|
|
Class<? extends BasePresenter> type = (Class<? extends BasePresenter>) field.getType();
|
|
|
BasePresenter mInjectPresenter = type.newInstance();
|
|
BasePresenter mInjectPresenter = type.newInstance();
|
|
|
- mInjectPresenter.attachView(this, liveData);
|
|
|
|
|
|
|
+ mInjectPresenter.attachView(this);
|
|
|
|
|
+ mInjectPresenter.setLiveData(liveData);
|
|
|
field.setAccessible(true);
|
|
field.setAccessible(true);
|
|
|
field.set(this, mInjectPresenter);
|
|
field.set(this, mInjectPresenter);
|
|
|
mInjectPresenters.add(mInjectPresenter);
|
|
mInjectPresenters.add(mInjectPresenter);
|
|
@@ -84,5 +82,6 @@ public abstract class BaseMVPActivity extends BaseActivity implements IView {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+ public abstract void onDataResult(DataResult result);
|
|
|
|
|
|
|
|
}
|
|
}
|