Kaynağa Gözat

规范结构

詹子聪 5 yıl önce
ebeveyn
işleme
ca66c1910e

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".main.view.MainActivity"
+        <activity android:name=".main.ui.home.MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

+ 1 - 1
app/src/main/java/com/miekir/newmvp/main/view/IMainView.java

@@ -1,4 +1,4 @@
-package com.miekir.newmvp.main.view;
+package com.miekir.newmvp.main.ui.home;
 
 import com.miekir.mvp.view.IView;
 

+ 4 - 7
app/src/main/java/com/miekir/newmvp/main/view/MainActivity.java

@@ -1,4 +1,4 @@
-package com.miekir.newmvp.main.view;
+package com.miekir.newmvp.main.ui.home;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -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.UserPresenter;
+import com.miekir.newmvp.main.user.presenter.UserPresenter;
 
 public class MainActivity extends BaseMvpActivity implements View.OnClickListener, IMainView {
 
     @InjectPresenter
-    UserPresenter presenter;
+    UserPresenter mUserPresenter;
 
     @Override
     public int getLayoutId() {
@@ -23,9 +23,6 @@ public class MainActivity extends BaseMvpActivity implements View.OnClickListene
 
     @Override
     public void initViews(Bundle savedInstanceState) {
-        TextView tv_name = findViewById(R.id.tv_name);
-        tv_name.setText("MainActivity");
-
         findViewById(R.id.btn_task).setOnClickListener(this);
         findViewById(R.id.btn_jump).setOnClickListener(this);
     }
@@ -35,7 +32,7 @@ public class MainActivity extends BaseMvpActivity implements View.OnClickListene
         switch (v.getId()) {
             case R.id.btn_task:
                 // 点击之后,后台执行耗时操作
-                presenter.doWork();
+                mUserPresenter.doWork();
                 break;
             case R.id.btn_jump:
                 startActivity(new Intent(MainActivity.this, MainActivity.class));

+ 1 - 1
app/src/main/java/com/miekir/newmvp/main/bean/UserBean.java

@@ -1,4 +1,4 @@
-package com.miekir.newmvp.main.bean;
+package com.miekir.newmvp.main.user.bean;
 
 /**
  * Copyright (C), 2019-2020, Miekir

+ 2 - 2
app/src/main/java/com/miekir/newmvp/main/model/user/IUserModel.java

@@ -1,6 +1,6 @@
-package com.miekir.newmvp.main.model.user;
+package com.miekir.newmvp.main.user.model;
 
-import com.miekir.newmvp.main.bean.UserBean;
+import com.miekir.newmvp.main.user.bean.UserBean;
 
 /**
  * Copyright (C), 2019-2020, Miekir

+ 3 - 3
app/src/main/java/com/miekir/newmvp/main/model/user/UserFileModel.java

@@ -1,8 +1,8 @@
-package com.miekir.newmvp.main.model.user;
+package com.miekir.newmvp.main.user.model;
 
 import com.miekir.common.utils.LogTool;
 import com.miekir.mvp.model.BaseModel;
-import com.miekir.newmvp.main.bean.UserBean;
+import com.miekir.newmvp.main.user.bean.UserBean;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
@@ -18,7 +18,7 @@ import io.reactivex.schedulers.Schedulers;
  * Description:
  */
 
-public class UserFileModel extends BaseModel implements IUserModel {
+public class LocalUserModel extends BaseModel implements IUserModel {
 
     @Override
     public void getData(UserCallback callback) {

+ 3 - 3
app/src/main/java/com/miekir/newmvp/main/model/user/UserNetModel.java

@@ -1,8 +1,8 @@
-package com.miekir.newmvp.main.model.user;
+package com.miekir.newmvp.main.user.model;
 
 import com.miekir.common.utils.LogTool;
 import com.miekir.mvp.model.BaseModel;
-import com.miekir.newmvp.main.bean.UserBean;
+import com.miekir.newmvp.main.user.bean.UserBean;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
@@ -18,7 +18,7 @@ import io.reactivex.schedulers.Schedulers;
  * Description:
  */
 
-public class UserNetModel extends BaseModel implements IUserModel {
+public class NetUserModel extends BaseModel implements IUserModel {
 
     @Override
     public void getData(UserCallback callback) {

+ 17 - 16
app/src/main/java/com/miekir/newmvp/main/presenter/UserPresenter.java

@@ -1,12 +1,12 @@
-package com.miekir.newmvp.main.presenter;
+package com.miekir.newmvp.main.user.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.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 com.miekir.newmvp.main.user.model.IUserModel;
+import com.miekir.newmvp.main.user.model.LocalUserModel;
+import com.miekir.newmvp.main.user.model.NetUserModel;
+import com.miekir.newmvp.main.ui.home.IMainView;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
@@ -24,32 +24,33 @@ import io.reactivex.schedulers.Schedulers;
 public class UserPresenter extends BasePresenter<IMainView> {
     private IUserModel mModel;
 
+    @Override
+    public void onInit() {
+        mModel = new NetUserModel();
+    }
+
     /**
-     * 设置当前仓库
-     * @param type 仓库
+     * 设置当前model
+     * @param type model类型
      */
-    public void setRepoType(int type) {
+    public UserPresenter with(int type) {
         switch (type) {
             case MvpRepository.REPO_NET:
-                mModel = new UserNetModel();
+                mModel = new NetUserModel();
                 break;
             case MvpRepository.REPO_FILE:
-                mModel = new UserFileModel();
+                mModel = new LocalUserModel();
                 break;
             default:
                 break;
         }
-    }
-
-    @Override
-    public void onInit() {
-        mModel = new UserNetModel();
+        return this;
     }
 
     /**
      * 让具体的Model去执行任务
      */
-    public void getUserData() {
+    public void fetchUserData() {
         mModel.getData(bean -> {
             // 执行完毕,回调
             getCallbackView().onMainResult();

+ 1 - 1
app/src/main/res/layout/activity_main.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".main.view.MainActivity"
+    tools:context=".main.ui.home.MainActivity"
     android:orientation="vertical"
     android:gravity="center_horizontal">