詹子聪 5 tahun lalu
induk
melakukan
18fbade459

+ 14 - 0
mvp/src/main/java/com/miekir/mvp/view/ICommonView.java

@@ -0,0 +1,14 @@
+package com.miekir.mvp.view;
+
+/**
+ *
+ *
+ * @author Miekir
+ * @date 2020/7/8 19:44
+ */
+public interface ICommonView<T> extends IView {
+    default void onCommonResult(boolean success, String message, T resultBean) {
+        //要在实现类显示调用ICommonView.super.onCommonResult(success, message, resultBean);才会生效
+        //dismissLoading();
+    }
+}

+ 6 - 8
network/src/main/java/com/miekir/network/widget/observe/MvpObserver.java

@@ -14,24 +14,22 @@ import io.reactivex.observers.DisposableObserver;
  * 用于可见,可手动取消的网络任务
  */
 public abstract class MvpObserver<T> extends DisposableObserver<T> {
-    private boolean mWithLoading;
     private BasePresenter<?> mPresenter;
 
-    public MvpObserver(final BasePresenter<?> presenter) {
-        this(presenter, false);
+    public MvpObserver() {
+        this(null);
     }
 
-    public MvpObserver(final BasePresenter<?> presenter, final boolean withLoading) {
-        mWithLoading = withLoading;
+    public MvpObserver(final BasePresenter<?> presenter) {
         mPresenter = presenter;
-        if (mPresenter != null && withLoading) {
+        if (mPresenter != null) {
             presenter.showProgress();
         }
     }
 
     @Override
     public void onNext(T t) {
-        if (mPresenter != null && mWithLoading) {
+        if (mPresenter != null) {
             mPresenter.hideProgress();
         }
         onSuccess(Code.SUCCESS, t);
@@ -42,7 +40,7 @@ public abstract class MvpObserver<T> extends DisposableObserver<T> {
 
     @Override
     public void onError(Throwable e) {
-        if (mWithLoading) {
+        if (mPresenter != null) {
             mPresenter.hideProgress();
         }
         e.printStackTrace();

+ 6 - 8
network/src/main/java/com/miekir/network/widget/observe/NetMvpObserver.java

@@ -15,24 +15,22 @@ import io.reactivex.observers.DisposableObserver;
  */
 public abstract class NetMvpObserver<T> extends DisposableObserver<BaseResponse<T>> {
 
-    private boolean mWithLoading;
     private BasePresenter<?> mPresenter;
 
-    public NetMvpObserver(final BasePresenter<?> presenter) {
-        this(presenter, false);
+    public NetMvpObserver() {
+        this(null);
     }
 
-    public NetMvpObserver(final BasePresenter<?> presenter, final boolean withLoading) {
-        mWithLoading = withLoading;
+    public NetMvpObserver(final BasePresenter<?> presenter) {
         mPresenter = presenter;
-        if (withLoading) {
+        if (mPresenter != null) {
             presenter.showProgress();
         }
     }
 
     @Override
     public void onNext(@NonNull BaseResponse<T> response) {
-        if (mPresenter != null && mWithLoading) {
+        if (mPresenter != null) {
             mPresenter.hideProgress();
         }
         try {
@@ -54,7 +52,7 @@ public abstract class NetMvpObserver<T> extends DisposableObserver<BaseResponse<
 
     @Override
     public void onError(@NonNull Throwable e) {
-        if (mPresenter != null && mWithLoading) {
+        if (mPresenter != null) {
             mPresenter.hideProgress();
         }
         e.printStackTrace();