詹子聪 5 rokov pred
rodič
commit
e32f685189

+ 4 - 1
mvp/src/main/java/com/miekir/mvp/jetpack/RawLiveData.java

@@ -34,6 +34,10 @@ public class RawLiveData<T> extends MutableLiveData<T> {
 
 
     protected BaseObserver<T> mObserver;
     protected BaseObserver<T> mObserver;
     public void cancelObserve() {
     public void cancelObserve() {
+        if (mObserver == null) {
+            return;
+        }
+        mPresenter.getLiveDataList().remove(this);
         mObserver.setLiveData(null);
         mObserver.setLiveData(null);
         removeObserver(mObserver);
         removeObserver(mObserver);
         mObserver = null;
         mObserver = null;
@@ -60,7 +64,6 @@ public class RawLiveData<T> extends MutableLiveData<T> {
             mPresenter.dismissLoading();
             mPresenter.dismissLoading();
         }
         }
 
 
-        mPresenter.getLiveDataList().remove(this);
         postValue(dataBean);
         postValue(dataBean);
     }
     }
 }
 }