詹子聪 před 5 roky
rodič
revize
3c8f6854ec

+ 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.ui.home.MainActivity"
+        <activity android:name=".main.ui.home.HomeActivity"
             android:configChanges="orientation|screenSize|keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

+ 4 - 5
app/src/main/java/com/miekir/newmvp/main/ui/home/MainActivity.java

@@ -4,17 +4,16 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-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.user.presenter.UserPresenter;
+import com.miekir.newmvp.main.ui.home.article.presenter.ArticlePresenter;
 
-public class MainActivity extends BaseMvpActivity implements View.OnClickListener, IMainView {
+public class HomeActivity extends BaseMvpActivity implements View.OnClickListener, IHomeView {
 
     @InjectPresenter
-    UserPresenter mUserPresenter;
+    ArticlePresenter mUserPresenter;
 
     @Override
     public int getLayoutId() {
@@ -35,7 +34,7 @@ public class MainActivity extends BaseMvpActivity implements View.OnClickListene
                 mUserPresenter.doWork();
                 break;
             case R.id.btn_jump:
-                startActivity(new Intent(MainActivity.this, MainActivity.class));
+                startActivity(new Intent(HomeActivity.this, HomeActivity.class));
                 break;
             default:
                 break;

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

@@ -9,6 +9,6 @@ import com.miekir.mvp.view.IView;
  * @date 2020/10/15 10:47
  * Description:
  */
-public interface IMainView extends IView {
+public interface IHomeView extends IView {
     void onMainResult();
 }

+ 14 - 0
app/src/main/java/com/miekir/newmvp/main/ui/home/article/bean/ArticleBean.java

@@ -0,0 +1,14 @@
+package com.miekir.newmvp.main.ui.home.article.bean;
+
+/**
+ * Copyright (C), 2019-2020, Miekir
+ *
+ * @author Miekir
+ * @date 2020/10/7 11:35
+ * Description:
+ */
+public class ArticleBean {
+    public int id;
+    public String title;
+    public String content;
+}

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

@@ -1,6 +1,6 @@
-package com.miekir.newmvp.main.user.model;
+package com.miekir.newmvp.main.ui.home.article.model;
 
-import com.miekir.newmvp.main.user.bean.UserBean;
+import com.miekir.newmvp.main.ui.home.article.bean.ArticleBean;
 
 /**
  * Copyright (C), 2019-2020, Miekir
@@ -9,7 +9,7 @@ import com.miekir.newmvp.main.user.bean.UserBean;
  * @date 2020/11/20 14:55
  * Description:
  */
-public interface IUserModel {
+public interface IArticleModel {
     /**
      * 获取数据
      * @param callback 回调
@@ -21,6 +21,6 @@ public interface IUserModel {
          * 数据回调
          * @param bean
          */
-        void onUserResult(UserBean bean);
+        void onUserResult(ArticleBean bean);
     }
 }

+ 4 - 4
app/src/main/java/com/miekir/newmvp/main/user/model/NetUserModel.java

@@ -1,8 +1,8 @@
-package com.miekir.newmvp.main.user.model;
+package com.miekir.newmvp.main.ui.home.article.model;
 
 import com.miekir.common.utils.LogTool;
 import com.miekir.mvp.model.BaseModel;
-import com.miekir.newmvp.main.user.bean.UserBean;
+import com.miekir.newmvp.main.ui.home.article.bean.ArticleBean;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
@@ -18,7 +18,7 @@ import io.reactivex.schedulers.Schedulers;
  * Description:
  */
 
-public class NetUserModel extends BaseModel implements IUserModel {
+public class LocalArticleModel extends BaseModel implements IArticleModel {
 
     @Override
     public void getData(UserCallback callback) {
@@ -29,7 +29,7 @@ public class NetUserModel extends BaseModel implements IUserModel {
         .subscribeOn(Schedulers.io())
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe(next -> {
-            UserBean bean = new UserBean(17, "Jason");
+            ArticleBean bean = new ArticleBean();
             callback.onUserResult(bean);
         }, error -> {
             LogTool.d(getClass().getName(), error.getMessage());

+ 4 - 4
app/src/main/java/com/miekir/newmvp/main/user/model/LocalUserModel.java

@@ -1,8 +1,8 @@
-package com.miekir.newmvp.main.user.model;
+package com.miekir.newmvp.main.ui.home.article.model;
 
 import com.miekir.common.utils.LogTool;
 import com.miekir.mvp.model.BaseModel;
-import com.miekir.newmvp.main.user.bean.UserBean;
+import com.miekir.newmvp.main.ui.home.article.bean.ArticleBean;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
@@ -18,7 +18,7 @@ import io.reactivex.schedulers.Schedulers;
  * Description:
  */
 
-public class LocalUserModel extends BaseModel implements IUserModel {
+public class NetArticleModel extends BaseModel implements IArticleModel {
 
     @Override
     public void getData(UserCallback callback) {
@@ -29,7 +29,7 @@ public class LocalUserModel extends BaseModel implements IUserModel {
         .subscribeOn(Schedulers.io())
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe(next -> {
-            UserBean bean = new UserBean(17, "Jason");
+            ArticleBean bean = new ArticleBean();
             callback.onUserResult(bean);
         }, error -> {
             LogTool.d(getClass().getName(), error.getMessage());

+ 11 - 11
app/src/main/java/com/miekir/newmvp/main/user/presenter/UserPresenter.java

@@ -1,12 +1,12 @@
-package com.miekir.newmvp.main.user.presenter;
+package com.miekir.newmvp.main.ui.home.article.presenter;
 
 import com.miekir.common.utils.LogTool;
 import com.miekir.mvp.constant.MvpRepository;
 import com.miekir.mvp.presenter.BasePresenter;
-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 com.miekir.newmvp.main.ui.home.article.model.IArticleModel;
+import com.miekir.newmvp.main.ui.home.article.model.LocalArticleModel;
+import com.miekir.newmvp.main.ui.home.article.model.NetArticleModel;
+import com.miekir.newmvp.main.ui.home.IHomeView;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
@@ -21,25 +21,25 @@ import io.reactivex.schedulers.Schedulers;
  * @date 2020/11/18 14:27
  * Description:
  */
-public class UserPresenter extends BasePresenter<IMainView> {
-    private IUserModel mModel;
+public class ArticlePresenter extends BasePresenter<IHomeView> {
+    private IArticleModel mModel;
 
     @Override
     public void onInit() {
-        mModel = new NetUserModel();
+        mModel = new NetArticleModel();
     }
 
     /**
      * 设置当前model
      * @param type model类型
      */
-    public UserPresenter with(int type) {
+    public ArticlePresenter with(int type) {
         switch (type) {
             case MvpRepository.REPO_NET:
-                mModel = new NetUserModel();
+                mModel = new NetArticleModel();
                 break;
             case MvpRepository.REPO_FILE:
-                mModel = new LocalUserModel();
+                mModel = new LocalArticleModel();
                 break;
             default:
                 break;

+ 0 - 34
app/src/main/java/com/miekir/newmvp/main/user/bean/UserBean.java

@@ -1,34 +0,0 @@
-package com.miekir.newmvp.main.user.bean;
-
-/**
- * Copyright (C), 2019-2020, Miekir
- *
- * @author Miekir
- * @date 2020/10/7 11:35
- * Description:
- */
-public class UserBean {
-    private int age;
-    private String name;
-
-    public UserBean(int age, String name) {
-        this.age = age;
-        this.name = name;
-    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public void setAge(int age) {
-        this.age = age;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

+ 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.ui.home.MainActivity"
+    tools:context=".main.ui.home.HomeActivity"
     android:orientation="vertical"
     android:gravity="center_horizontal">