解决了回调的问题

app/src/main/java/com/miekir/newmvp/MainActivity.java

@@ -8,6 +8,7 @@ import android.widget.Toast;
 
 import androidx.lifecycle.Observer;
 
+import com.miekir.mvp.bean.DataResult;
 import com.miekir.mvp.model.DataMethod;
 import com.miekir.mvp.presenter.InjectPresenter;
 import com.miekir.mvp.jetpack.MvpObserver;
@@ -15,7 +16,7 @@ import com.miekir.mvp.view.BaseMvpActivity;
 
 import java.util.List;
 
-public class MainActivity extends BaseMvpActivity {
+public class MainActivity extends BaseMvpActivity implements View.OnClickListener {
     @InjectPresenter
     TestPresenter presenter;
 
@@ -29,18 +30,7 @@ public class MainActivity extends BaseMvpActivity {
         TextView tv_name = findViewById(R.id.tv_name);
         tv_name.setText("MainActivity");
 
-        findViewById(R.id.view_test).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                // 点击之后，后台执行耗时操作
-                presenter.go().observeOnce(new MvpObserver<TestBean1>() {
-                    @Override
-                    public void onDataChanged(TestBean1 testBean1) {
-                        Toast.makeText(getApplicationContext(), "hello", Toast.LENGTH_SHORT).show();
-                    }
-                });
-            }
-        });
+        findViewById(R.id.view_test).setOnClickListener(this);
 
         findViewById(R.id.btn_test).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -51,8 +41,20 @@ public class MainActivity extends BaseMvpActivity {
         });
     }
 
-    @DataMethod(dataSource = TestPresenter.SOURCE_LOGIN_RESULT)
-    public void onDataCome(int code, String msg, List<TestBean1> data) {
-        Toast.makeText(this, data.get(0).getName(), Toast.LENGTH_SHORT).show();
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.view_test:
+                // 点击之后，后台执行耗时操作
+                presenter.go().observeOnce(new MvpObserver<DataResult<List<TestBean1>>>() {
+                    @Override
+                    public void onDataChanged(DataResult<List<TestBean1>> result) {
+                        Toast.makeText(getApplicationContext(), result.getBean().get(0).getName(), Toast.LENGTH_SHORT).show();
+                    }
+                });
+                break;
+            default:
+                break;
+        }
     }
 }

app/src/main/java/com/miekir/newmvp/TestPresenter.java

@@ -1,5 +1,7 @@
 package com.miekir.newmvp;
 
+import com.miekir.mvp.bean.DataResult;
+import com.miekir.mvp.jetpack.ResultLiveData;
 import com.miekir.mvp.presenter.BasePresenter;
 import com.miekir.mvp.jetpack.MvpLiveData;
 
@@ -14,27 +16,25 @@ import java.util.List;
  * Description:注意ViewModel的类必须是public的，否则无法创建实例
  */
 public class TestPresenter extends BasePresenter {
-    public static final int SOURCE_LOGIN_RESULT = 3;
 
     @Override
     public void init() {
 
     }
 
-    public MvpLiveData<TestBean1> go() {
+    public ResultLiveData<List<TestBean1>> go() {
         showLoading();
-        final MvpLiveData<TestBean1> specificLiveData = new MvpLiveData<>();
+        final ResultLiveData<List<TestBean1>> specificLiveData = new ResultLiveData<>();
 
         new Thread(new Runnable() {
             @Override
             public void run() {
                 try {
                     Thread.sleep(5000);
-                    List<TestBean1> testBean1List = new ArrayList<>();
-                    testBean1List.add(new TestBean1(3, "ViewModel Jason"));
-                    // 这里还有问题，就是post的错误没法被正确的方法接收
-                    //postFail("错误", SOURCE_LOGIN_RESULT);
-                    specificLiveData.postValue(null);
+                    TestBean1 bean = new TestBean1(3, "ViewModel Jason");
+                    List<TestBean1> list = new ArrayList<>();
+                    list.add(bean);
+                    specificLiveData.postSuccess(list);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

mvp/src/main/java/com/miekir/mvp/bean/DataResult.java

@@ -1,5 +1,7 @@
 package com.miekir.mvp.bean;
 
+import com.miekir.mvp.constant.BaseMvpResponse;
+
 /**
  * Copyright (C), 2019-2020, Miekir
  *
@@ -7,17 +9,15 @@ package com.miekir.mvp.bean;
  * @date 2020/10/6 21:30
  * Description:
  */
-public class DataResult {
+public class DataResult<D> {
     private int responseCode;
     private String message;
-    private Object bean;
-    private int dataSource;
+    private D bean;
 
-    public DataResult(int responseCode, String message, Object bean, int dataSource) {
+    public DataResult(int responseCode, String message, D bean) {
         this.responseCode = responseCode;
         this.message = message;
         this.bean = bean;
-        this.dataSource = dataSource;
     }
 
     public int getResponseCode() {
@@ -36,19 +36,15 @@ public class DataResult {
         this.message = message;
     }
 
-    public Object getBean() {
+    public D getBean() {
         return bean;
     }
 
-    public void setBean(Object bean) {
+    public void setBean(D bean) {
         this.bean = bean;
     }
 
-    public int getDataSource() {
-        return dataSource;
-    }
-
-    public void setDataSource(int dataSource) {
-        this.dataSource = dataSource;
+    public boolean isSuccess() {
+        return responseCode == BaseMvpResponse.SUCCESS;
     }
 }

mvp/src/main/java/com/miekir/mvp/jetpack/MvpLiveData.java

@@ -1,9 +1,21 @@
 package com.miekir.mvp.jetpack;
 
-import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.Observer;
+import com.miekir.mvp.bean.DataResult;
+import com.miekir.mvp.constant.BaseMvpResponse;
 
+//得到一个LiveData，用于传递Observer参数的形式，这里暂时用不到
+//private <T> MutableLiveData<T> observeOnce(final Observer<T> observer) {
+//final MutableLiveData<T> specificLiveData = new MutableLiveData<>();
+//        specificLiveData.observeForever(new Observer<T>() {
+//@Override
+//public void onChanged(T t) {
+//specificLiveData.removeObserver(this);
+//observer.onChanged(t);
+//}
+//});
+//return specificLiveData;
+//}
 /**
  * Copyright (C), 2019-2020, Miekir
  *
@@ -12,21 +24,6 @@ import androidx.lifecycle.Observer;
  * Description:
  */
 public class MvpLiveData<T> extends MutableLiveData<T> {
-    /**
-     * 得到一个LiveData，用于传递Observer参数的形式，这里暂时用不到
-     */
-    private <T> MutableLiveData<T> observeOnce(final Observer<T> observer) {
-        final MutableLiveData<T> specificLiveData = new MutableLiveData<>();
-        specificLiveData.observeForever(new Observer<T>() {
-            @Override
-            public void onChanged(T t) {
-                specificLiveData.removeObserver(this);
-                observer.onChanged(t);
-            }
-        });
-        return specificLiveData;
-    }
-
     /**
      * 只监听一次的LiveData
      * @param observer
@@ -35,10 +32,4 @@ public class MvpLiveData<T> extends MutableLiveData<T> {
         observer.setLiveData(this);
         observeForever(observer);
     }
-
-
-    @Override
-    public void observeForever(@NonNull Observer<? super T> observer) {
-        super.observeForever(observer);
-    }
 }

mvp/src/main/java/com/miekir/mvp/jetpack/MvpObserver.java

@@ -15,6 +15,10 @@ public abstract class MvpObserver<T> implements Observer<T> {
         this.liveData = liveData;
     }
 
+    /**
+     * 数据发生改变，被观察者观察到
+     * @param t 发生变化的数据
+     */
     public abstract void onDataChanged(T t);
 
     @Override

mvp/src/main/java/com/miekir/mvp/jetpack/ResultLiveData.java

@@ -0,0 +1,26 @@
+package com.miekir.mvp.jetpack;
+
+import com.miekir.mvp.bean.DataResult;
+import com.miekir.mvp.constant.BaseMvpResponse;
+
+/**
+ * Copyright (C), 2019-2020, Miekir
+ *
+ * @author Miekir
+ * @date 2020/11/14 21:36
+ * Description:
+ */
+public class ResultLiveData<D> extends MvpLiveData<DataResult<D>> {
+    public void post(int responseCode, String message, D dataBean) {
+        postValue(new DataResult<D>(responseCode, message, dataBean));
+    }
+
+    public void postSuccess(D dataBean) {
+        post(BaseMvpResponse.SUCCESS, "", dataBean);
+    }
+
+    public void postFail(String message) {
+        post(BaseMvpResponse.FAIL, message, null);
+    }
+
+}

mvp/src/main/java/com/miekir/mvp/presenter/BasePresenter.java

@@ -52,43 +52,32 @@ public abstract class BasePresenter extends ViewModel {
         if (dialogLiveData == null) {
             return;
         }
-        dialogLiveData.postValue(new DataResult(0, message, null, DialogAction.DIALOG_SHOW));
+        // todo 解决加载框的问题
+        //dialogLiveData.postValue(new DataResult(0, message, null, DialogAction.DIALOG_SHOW));
     }
 
     public void dismissLoading() {
         if (dialogLiveData == null) {
             return;
         }
-        dialogLiveData.postValue(new DataResult(0, null, null, DialogAction.DIALOG_DISMISS));
+        // todo 解决加载框的问题
+        //dialogLiveData.postValue(new DataResult(0, null, null, DialogAction.DIALOG_DISMISS));
     }
 
-    public void post(int responseCode, String message, Object dataBean, int sourceCode) {
-        if (liveData == null) {
-            return;
-        }
-
-        liveData.postValue(new DataResult(responseCode, message, dataBean, sourceCode));
-    }
-
-    public void postSuccess(Object dataBean, int sourceCode) {
-        post(BaseMvpResponse.SUCCESS, "", dataBean, sourceCode);
-    }
-
-    public void postFail(String message, int sourceCode) {
-        post(BaseMvpResponse.FAIL, message, null, sourceCode);
-    }
+    /**
+     * 初始化
+     */
+    public abstract void init();
 
+    /**
+     * 视图被销毁时
+     */
     public void detachView() {
         liveData = null;
         dialogLiveData = null;
         onTaskCancel();
     }
 
-    /**
-     * 初始化
-     */
-    public abstract void init();
-
     /**
      * 当任务被取消时
      */

mvp/src/main/java/com/miekir/mvp/view/ViewHelper.java

@@ -148,11 +148,12 @@ public class ViewHelper {
                 final Observer<DataResult> dialogObserver = new Observer<DataResult>() {
                     @Override
                     public void onChanged(final DataResult result) {
-                        if (result.getDataSource() == DialogAction.DIALOG_SHOW) {
-                            iView.onLoadTimeChange(true, result.getMessage());
-                        } else if (result.getDataSource() == DialogAction.DIALOG_DISMISS) {
-                            iView.onLoadTimeChange(false, result.getMessage());
-                        }
+                        // todo 加载框的问题
+//                        if (result.getDataSource() == DialogAction.DIALOG_SHOW) {
+//                            iView.onLoadTimeChange(true, result.getMessage());
+//                        } else if (result.getDataSource() == DialogAction.DIALOG_DISMISS) {
+//                            iView.onLoadTimeChange(false, result.getMessage());
+//                        }
                     }
                 };
 
@@ -194,9 +195,11 @@ public class ViewHelper {
             if (dataMethod != null) {
                 dataSource = dataMethod.dataSource();
             }
-            if (dataSource != result.getDataSource()) {
-                continue;
-            }
+
+            // todo 加载框的问题
+//            if (dataSource != result.getDataSource()) {
+//                continue;
+//            }
 
             // 判断方法的第三个参数类型是否是回调对象的父类
             Class<?> methodParamClass = method.getParameterTypes()[2];