Merge remote-tracking branch 'CymChad/master'

CymChad · May 6, 2016 · c994e71 · c994e71
2 parents 1e40b31 + 6fb7bf2
commit c994e71
Show file tree

Hide file tree

Showing 15 changed files with 137 additions and 180 deletions.
diff --git a/README-cn.md b/README-cn.md
@@ -32,7 +32,7 @@
 然后在dependencies添加:
 ```
 	dependencies {
-	        compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:v1.5.8'
+	        compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:v1.6.2'
 	}
 ```
 

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ Add it in your root build.gradle at the end of repositories:
 Add the dependency
 ```
 	dependencies {
-	        compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:v1.5.8'
+	        compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:v1.6.2'
 	}
 ```
 

diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/PullToRefreshUseActivity.java
@@ -63,7 +63,6 @@ public void onLoadMoreRequested() {
             mRecyclerView.post(new Runnable() {
                 @Override
                 public void run() {
-                   // mQuickAdapter.isNextLoad(false);
                     mQuickAdapter.notifyDataChangedAfterLoadMore(false);
                 }
             });
@@ -74,7 +73,6 @@ public void run() {
                 public void run() {
                     DataServer.addData(mQuickAdapter.getData(), PAGE_SIZE);
                     mCurrentCounter = mQuickAdapter.getItemCount();
-                  //  mQuickAdapter.isNextLoad(true);
                     mQuickAdapter.notifyDataChangedAfterLoadMore(true);
 
                 }
@@ -99,7 +97,6 @@ private void initAdapter() {
         mQuickAdapter.openLoadAnimation();
         mRecyclerView.setAdapter(mQuickAdapter);
         mCurrentCounter = mQuickAdapter.getItemCount();
-       // mQuickAdapter.setOnLoadMoreListener(PAGE_SIZE, this);
         mQuickAdapter.setOnLoadMoreListener(this);
         mQuickAdapter.openLoadMore(PAGE_SIZE,true);//or call mQuickAdapter.setPageSize(PAGE_SIZE);  mQuickAdapter.openLoadMore(true);
         addHeadView();

diff --git a/...rc/main/java/com/chad/baserecyclerviewadapterhelper/adapter/MultipleItemQuickAdapter.java b/...rc/main/java/com/chad/baserecyclerviewadapterhelper/adapter/MultipleItemQuickAdapter.java
@@ -24,7 +24,7 @@ public MultipleItemQuickAdapter(Context context, List data) {
     protected void convert(BaseViewHolder helper, MultipleItem item) {
         switch (helper.getItemViewType()) {
             case MultipleItem.TEXT:
-                helper.setImageUrl(R.id.tv, item.getContent());
+                helper.setText(R.id.tv, item.getContent());
                 break;
             case MultipleItem.IMG:
                 helper.setImageUrl(R.id.iv, item.getContent());

diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animation/CustomAnimation.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/animation/CustomAnimation.java
@@ -9,7 +9,7 @@
 /**
  * https://github.com/CymChad/BaseRecyclerViewAdapterHelper
  */
-public class CustomAnimation extends BaseAnimation {
+public class CustomAnimation implements BaseAnimation {
 
     @Override
     public Animator[] getAnimators(View view) {

diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseMultiItemQuickAdapter.java b/library/src/main/java/com/chad/library/adapter/base/BaseMultiItemQuickAdapter.java
@@ -2,45 +2,42 @@
 
 import android.content.Context;
 import android.util.SparseArray;
-import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup;
 
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
  * https://github.com/CymChad/BaseRecyclerViewAdapterHelper
  */
 public abstract class BaseMultiItemQuickAdapter<T extends MultiItemEntity> extends BaseQuickAdapter {
-    protected List<T> mData;
+
+    /**
+     * layouts indexed with their types
+     */
     private SparseArray<Integer> layouts;
 
     /**
      * Same as QuickAdapter#QuickAdapter(Context,int) but with
      * some initialization data.
+     *
      * @param context The context.
      * @param data    A new list is created out of this one to avoid mutable list
      */
     public BaseMultiItemQuickAdapter(Context context, List<T> data) {
         super(context, data);
-        this.mData = data == null ? new ArrayList<T>() : new ArrayList<T>(data);
-        this.mContext = context;
     }
 
     @Override
     protected int getDefItemViewType(int position) {
-        return mData.get(position).getItemType();
+        return ((MultiItemEntity) mData.get(position)).getItemType();
     }
 
 
     @Override
     protected BaseViewHolder onCreateDefViewHolder(ViewGroup parent, int viewType) {
-        int layoutId = getLayoutId(viewType);
-        View view = LayoutInflater.from(parent.getContext()).inflate(layoutId, parent, false);
-        return new BaseViewHolder(mContext, view);
+        return createBaseViewHolder(parent, getLayoutId(viewType));
     }
 
     private int getLayoutId(int viewType) {
@@ -54,6 +51,7 @@ protected void addItmeType(int type, int layoutResId) {
         layouts.put(type, layoutResId);
     }
 
+
     @Override
     protected void convert(BaseViewHolder helper, Object item) {
         convert(helper, (T) item);