完善调用结构

app/src/main/java/com/miekir/newmvp/main/bean/MainBean.java

@@ -7,11 +7,11 @@ package com.miekir.newmvp.main.bean;
  * @date 2020/10/7 11:35
  * Description:
  */
-public class MainBean {
+public class UserBean {
     private int age;
     private String name;
 
-    public MainBean(int age, String name) {
+    public UserBean(int age, String name) {
         this.age = age;
         this.name = name;
     }

app/src/main/java/com/miekir/newmvp/main/model/IMainModel.java

@@ -1,6 +1,6 @@
-package com.miekir.newmvp.main.model;
+package com.miekir.newmvp.main.model.user;
 
-import com.miekir.newmvp.main.bean.MainBean;
+import com.miekir.newmvp.main.bean.UserBean;
 
 /**
  * Copyright (C), 2019-2020, Miekir
@@ -9,18 +9,18 @@ import com.miekir.newmvp.main.bean.MainBean;
  * @date 2020/11/20 14:55
  * Description:
  */
-public interface IMainModel {
+public interface IUserModel {
     /**
      * 获取数据
      * @param callback 回调
      */
-    void goGetData(IDataCallback callback);
+    void getData(UserCallback callback);
 
-    interface IDataCallback {
+    interface UserCallback {
         /**
          * 数据回调
          * @param bean
          */
-        void onDataGet(MainBean bean);
+        void onUserResult(UserBean bean);
     }
 }

app/src/main/java/com/miekir/newmvp/main/model/MainFileModel.java

@@ -1,8 +1,8 @@
-package com.miekir.newmvp.main.model;
+package com.miekir.newmvp.main.model.user;
 
 import com.miekir.common.utils.LogTool;
 import com.miekir.mvp.model.BaseModel;
-import com.miekir.newmvp.main.bean.MainBean;
+import com.miekir.newmvp.main.bean.UserBean;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
@@ -18,10 +18,10 @@ import io.reactivex.schedulers.Schedulers;
  * Description:
  */
 
-public class MainFileModel extends BaseModel implements IMainModel {
+public class UserFileModel extends BaseModel implements IUserModel {
 
     @Override
-    public void goGetData(IDataCallback callback) {
+    public void getData(UserCallback callback) {
         Disposable disposable = Observable.create((ObservableOnSubscribe<String>) emitter -> {
             emitter.onNext("");
             emitter.onComplete();
@@ -29,8 +29,8 @@ public class MainFileModel extends BaseModel implements IMainModel {
         .subscribeOn(Schedulers.io())
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe(next -> {
-            MainBean bean = new MainBean(17, "Jason");
-            callback.onDataGet(bean);
+            UserBean bean = new UserBean(17, "Jason");
+            callback.onUserResult(bean);
         }, error -> {
             LogTool.d(getClass().getName(), error.getMessage());
         });

app/src/main/java/com/miekir/newmvp/main/model/MainNetModel.java

@@ -1,8 +1,8 @@
-package com.miekir.newmvp.main.model;
+package com.miekir.newmvp.main.model.user;
 
 import com.miekir.common.utils.LogTool;
 import com.miekir.mvp.model.BaseModel;
-import com.miekir.newmvp.main.bean.MainBean;
+import com.miekir.newmvp.main.bean.UserBean;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
@@ -18,10 +18,10 @@ import io.reactivex.schedulers.Schedulers;
  * Description:
  */
 
-public class MainNetModel extends BaseModel implements IMainModel {
+public class UserNetModel extends BaseModel implements IUserModel {
 
     @Override
-    public void goGetData(IDataCallback callback) {
+    public void getData(UserCallback callback) {
         Disposable disposable = Observable.create((ObservableOnSubscribe<String>) emitter -> {
             emitter.onNext("");
             emitter.onComplete();
@@ -29,8 +29,8 @@ public class MainNetModel extends BaseModel implements IMainModel {
         .subscribeOn(Schedulers.io())
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe(next -> {
-            MainBean bean = new MainBean(17, "Jason");
-            callback.onDataGet(bean);
+            UserBean bean = new UserBean(17, "Jason");
+            callback.onUserResult(bean);
         }, error -> {
             LogTool.d(getClass().getName(), error.getMessage());
         });

app/src/main/java/com/miekir/newmvp/main/presenter/MainPresenter.java

@@ -1,10 +1,11 @@
 package com.miekir.newmvp.main.presenter;
 
 import com.miekir.common.utils.LogTool;
+import com.miekir.mvp.constant.MvpRepository;
 import com.miekir.mvp.presenter.BasePresenter;
-import com.miekir.newmvp.main.model.IMainModel;
-import com.miekir.newmvp.main.model.MainFileModel;
-import com.miekir.newmvp.main.model.MainNetModel;
+import com.miekir.newmvp.main.model.user.IUserModel;
+import com.miekir.newmvp.main.model.user.UserFileModel;
+import com.miekir.newmvp.main.model.user.UserNetModel;
 import com.miekir.newmvp.main.view.IMainView;
 
 import io.reactivex.Observable;
@@ -20,22 +21,20 @@ import io.reactivex.schedulers.Schedulers;
  * @date 2020/11/18 14:27
  * Description:
  */
-public class MainPresenter extends BasePresenter<IMainView> {
-    public static final int REPO_NET = 1;
-    public static final int REPO_FILE = 2;
-    private IMainModel mMainModel;
+public class UserPresenter extends BasePresenter<IMainView> {
+    private IUserModel mModel;
 
     /**
      * 设置当前仓库
-     * @param repository 仓库
+     * @param type 仓库
      */
-    public void setRepository(int repository) {
-        switch (repository) {
-            case REPO_NET:
-                mMainModel = new MainNetModel();
+    public void setRepoType(int type) {
+        switch (type) {
+            case MvpRepository.REPO_NET:
+                mModel = new UserNetModel();
                 break;
-            case REPO_FILE:
-                mMainModel = new MainFileModel();
+            case MvpRepository.REPO_FILE:
+                mModel = new UserFileModel();
                 break;
             default:
                 break;
@@ -44,14 +43,14 @@ public class MainPresenter extends BasePresenter<IMainView> {
 
     @Override
     public void onInit() {
-        mMainModel = new MainNetModel();
+        mModel = new UserNetModel();
     }
 
     /**
      * 让具体的Model去执行任务
      */
-    public void getData() {
-        mMainModel.goGetData(bean -> {
+    public void getUserData() {
+        mModel.getData(bean -> {
             // 执行完毕，回调
             getCallbackView().onMainResult();
         });

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

@@ -9,12 +9,12 @@ import android.widget.TextView;
 import com.miekir.mvp.presenter.InjectPresenter;
 import com.miekir.mvp.view.BaseMvpActivity;
 import com.miekir.newmvp.R;
-import com.miekir.newmvp.main.presenter.MainPresenter;
+import com.miekir.newmvp.main.presenter.UserPresenter;
 
 public class MainActivity extends BaseMvpActivity implements View.OnClickListener, IMainView {
 
     @InjectPresenter
-    MainPresenter presenter;
+    UserPresenter presenter;
 
     @Override
     public int getLayoutId() {

mvp/src/main/java/com/miekir/mvp/constant/MvpRepository.java

@@ -0,0 +1,13 @@
+package com.miekir.mvp.constant;
+
+/**
+ * Copyright (C), 2019-2020, Miekir
+ *
+ * @author Miekir
+ * @date 2020/11/20 21:25
+ * Description:
+ */
+public interface MvpRepository {
+    int REPO_NET = 0;
+    int REPO_FILE = 1;
+}