v1.0.5 [CHG]最小依赖

HpWens · Apr 19, 2018 · 7c17881 · 7c17881
1 parent 859a9ad
commit 7c17881
Show file tree

Hide file tree

Showing 48 changed files with 1,442 additions and 828 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/meis/basemodule/MainActivity.java b/app/src/main/java/com/meis/basemodule/MainActivity.java
@@ -1,12 +1,11 @@
 package com.meis.basemodule;
 
-
 import android.content.Intent;
 import android.view.View;
 
-import com.meis.base.mei.MeiBaseActivity;
+import com.meis.basemodule.base.BaseActivity;
 
-public class MainActivity extends MeiBaseActivity {
+public class MainActivity extends BaseActivity {
 
     @Override
     protected int layoutResId() {
@@ -33,4 +32,5 @@ public void clickFragment(View view) {
     public void clickDialog(View view) {
         startActivity(new Intent(this, com.meis.basemodule.dialog.MainActivity.class));
     }
+
 }
diff --git a/app/src/main/java/com/meis/basemodule/activity/MainActivity.java b/app/src/main/java/com/meis/basemodule/activity/MainActivity.java
@@ -3,21 +3,21 @@
 import android.content.Intent;
 import android.view.View;
 
-import com.meis.base.mei.MeiBaseActivity;
 import com.meis.basemodule.R;
 import com.meis.basemodule.activity.ui.CustomEmptyActivity;
 import com.meis.basemodule.activity.ui.MultiListActivity;
 import com.meis.basemodule.activity.ui.PullRefreshActivity;
 import com.meis.basemodule.activity.ui.SingleListActivity;
 import com.meis.basemodule.activity.ui.StatusActivity;
 import com.meis.basemodule.activity.ui.TranslucentActivity;
+import com.meis.basemodule.base.BaseActivity;
 
 /**
  * author: ws4
  * created on: 2018/4/11 15:04
  * description:
  */
-public class MainActivity extends MeiBaseActivity {
+public class MainActivity extends BaseActivity {
     @Override
     protected void initView() {
 

diff --git a/app/src/main/java/com/meis/basemodule/activity/ui/CustomEmptyActivity.java b/app/src/main/java/com/meis/basemodule/activity/ui/CustomEmptyActivity.java
@@ -2,16 +2,16 @@
 
 import android.view.View;
 
-import com.meis.base.mei.MeiBaseActivity;
-import com.meis.base.mei.ViewState;
+import com.meis.base.mei.status.ViewState;
 import com.meis.basemodule.R;
+import com.meis.basemodule.base.BaseActivity;
 
 /**
  * author: ws4
  * created on: 2018/4/11 15:31
  * description:
  */
-public class CustomEmptyActivity extends MeiBaseActivity {
+public class CustomEmptyActivity extends BaseActivity {
     @Override
     protected void initView() {
 

diff --git a/app/src/main/java/com/meis/basemodule/activity/ui/MultiListActivity.java b/app/src/main/java/com/meis/basemodule/activity/ui/MultiListActivity.java
@@ -5,19 +5,19 @@
 import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.meis.base.mei.MeiBaseListActivity;
 import com.meis.base.mei.adapter.MeiBaseAdapter;
 import com.meis.base.mei.adapter.MeiBaseMixAdapter;
-import com.meis.base.mei.entity.Result;
 import com.meis.basemodule.R;
 import com.meis.basemodule.adapter.MultiAdapter;
 import com.meis.basemodule.adapter.MultiAdapter1;
 import com.meis.basemodule.adapter.MultiAdapter2;
 import com.meis.basemodule.adapter.MultiAdapter3;
+import com.meis.basemodule.base.BaseListActivity;
 import com.meis.basemodule.entity.MultiBean;
 import com.meis.basemodule.entity.MultiBean1;
 import com.meis.basemodule.entity.MultiBean2;
 import com.meis.basemodule.entity.MultiBean3;
+import com.meis.basemodule.entity.Result;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,14 +29,13 @@
  * created on: 2018/4/11 15:33
  * description:
  */
-public class MultiListActivity extends MeiBaseListActivity<Object> {
+public class MultiListActivity extends BaseListActivity<Object> {
 
     RecyclerView mRecyclerView;
     MeiBaseMixAdapter mAdapter;
 
     @Override
     protected void initData() {
-        super.initData();
         getToolbarView().setTitle(getResources().getString(R.string.mul_type));
         getToolbarView().setNavigationIcon(R.mipmap.ic_arrow_back_white_24dp);
         getToolbarView().setNavigationOnClickListener(new View.OnClickListener() {
@@ -100,12 +99,12 @@ public Observable<Result<List<Object>>> getData(int pageNo) {
     }
 
     @Override
-    protected boolean canLoadMore() {
+    public boolean canLoadMore() {
         return true;
     }
 
     @Override
-    protected boolean canPullToRefresh() {
+    public boolean canPullToRefresh() {
         return true;
     }
 

diff --git a/app/src/main/java/com/meis/basemodule/activity/ui/PullRefreshActivity.java b/app/src/main/java/com/meis/basemodule/activity/ui/PullRefreshActivity.java
@@ -7,13 +7,12 @@
 import android.view.View;
 import android.widget.Toast;
 
-import com.meis.base.mei.MeiBaseActivity;
-import com.meis.base.mei.PullToLoadMore;
-import com.meis.base.mei.PullToRefresh;
-import com.meis.base.mei.ViewState;
+import com.meis.base.mei.annotation.PullToLoadMore;
+import com.meis.base.mei.annotation.PullToRefresh;
 import com.meis.base.mei.header.DingDangHeader;
-import com.meis.base.mei.rxjava.UiSubscriber;
+import com.meis.base.mei.status.ViewState;
 import com.meis.basemodule.R;
+import com.meis.basemodule.base.BaseActivity;
 import com.scwang.smartrefresh.layout.header.BezierRadarHeader;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
 
@@ -24,7 +23,7 @@
  */
 @PullToRefresh
 @PullToLoadMore
-public class PullRefreshActivity extends MeiBaseActivity implements Toolbar.OnMenuItemClickListener {
+public class PullRefreshActivity extends BaseActivity implements Toolbar.OnMenuItemClickListener {
 
     @Override
     protected void initView() {
@@ -54,29 +53,29 @@ protected int layoutResId() {
     }
 
     @Override
-    protected void onRefreshing() {
+    public void onRefreshing() {
         super.onRefreshing();
-        postUiThread(2000, new UiSubscriber<Long>() {
+        postUiThread(new Runnable() {
             @Override
-            public void onCompleted() {
+            public void run() {
                 Toast.makeText(PullRefreshActivity.this, getResources().getString(R.string
                         .mei_refresh_success), Toast.LENGTH_SHORT).show();
                 PullRefreshActivity.this.setRefreshing(false);
             }
-        });
+        }, 2000);
     }
 
     @Override
-    protected void onLoadingMore() {
+    public void onLoadingMore() {
         super.onLoadingMore();
-        postUiThread(2000, new UiSubscriber<Long>() {
+        postUiThread(new Runnable() {
             @Override
-            public void onCompleted() {
+            public void run() {
                 Toast.makeText(PullRefreshActivity.this, getResources().getString(R.string
                         .mei_refresh_success), Toast.LENGTH_SHORT).show();
                 PullRefreshActivity.this.setLoadingMore(false);
             }
-        });
+        }, 2000);
     }
 
     @Override

diff --git a/app/src/main/java/com/meis/basemodule/activity/ui/SingleListActivity.java b/app/src/main/java/com/meis/basemodule/activity/ui/SingleListActivity.java
@@ -4,14 +4,13 @@
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
-import com.meis.base.mei.MeiBaseListActivity;
-import com.meis.base.mei.ViewState;
 import com.meis.base.mei.adapter.MeiBaseAdapter;
-import com.meis.base.mei.entity.Result;
-import com.meis.base.mei.rxjava.UiSubscriber;
+import com.meis.base.mei.status.ViewState;
 import com.meis.basemodule.R;
 import com.meis.basemodule.adapter.MeiSimpleAdapter;
+import com.meis.basemodule.base.BaseListActivity;
 import com.meis.basemodule.entity.Article;
+import com.meis.basemodule.entity.Result;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,14 +22,13 @@
  * created on: 2018/4/11 15:32
  * description:
  */
-public class SingleListActivity extends MeiBaseListActivity<Article> {
+public class SingleListActivity extends BaseListActivity<Article> {
 
     RecyclerView mRecyclerView;
     MeiSimpleAdapter mAdapter;
 
     @Override
     protected void initData() {
-        super.initData();
         getToolbarView().setTitle(getResources().getString(R.string.simple_type));
         getToolbarView().setNavigationIcon(R.mipmap.ic_arrow_back_white_24dp);
         getToolbarView().setNavigationOnClickListener(new View.OnClickListener() {
@@ -78,21 +76,21 @@ public Observable<Result<List<Article>>> getData(int pageNo) {
 
     @Override
     protected void loadPage(final int pageNo) {
-        postUiThread(2000, new UiSubscriber<Long>() {
+        postUiThread(new Runnable() {
             @Override
-            public void onCompleted() {
+            public void run() {
                 SingleListActivity.super.loadPage(pageNo);
             }
-        });
+        }, 2000);
     }
 
     @Override
-    protected boolean canLoadMore() {
+    public boolean canLoadMore() {
         return true;
     }
 
     @Override
-    protected boolean canPullToRefresh() {
+    public boolean canPullToRefresh() {
         return true;
     }
 

diff --git a/app/src/main/java/com/meis/basemodule/activity/ui/StatusActivity.java b/app/src/main/java/com/meis/basemodule/activity/ui/StatusActivity.java
@@ -7,16 +7,15 @@
 import android.view.View;
 import android.widget.Toast;
 
-import com.meis.base.mei.MeiBaseActivity;
-import com.meis.base.mei.ViewState;
+import com.meis.base.mei.status.ViewState;
 import com.meis.basemodule.R;
-
+import com.meis.basemodule.base.BaseActivity;
 /**
  * author: ws4
  * created on: 2018/4/11 15:31
  * description:
  */
-public class StatusActivity extends MeiBaseActivity implements Toolbar.OnMenuItemClickListener {
+public class StatusActivity extends BaseActivity implements Toolbar.OnMenuItemClickListener {
     @Override
     protected void initView() {
 

diff --git a/app/src/main/java/com/meis/basemodule/activity/ui/TranslucentActivity.java b/app/src/main/java/com/meis/basemodule/activity/ui/TranslucentActivity.java
@@ -3,17 +3,17 @@
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 
-import com.meis.base.mei.MeiBaseActivity;
 import com.meis.base.mei.utils.Eyes;
 import com.meis.basemodule.R;
+import com.meis.basemodule.base.BaseActivity;
 
 /**
  * desc:
  * author: ws
  * date: 2018/4/14.
  */
 
-public class TranslucentActivity extends MeiBaseActivity {
+public class TranslucentActivity extends BaseActivity {
 
     Toolbar mToolbar;