diff --git a/.gitignore b/.gitignore
index 9db27fe16..daaaeb246 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,14 @@ proguard/
 .gradle
 .idea
 build
+<<<<<<< HEAD
+/build.gradle
+/.idea/
+
+build.gradle
+
+.idea/misc.xml
+=======
 .DS_Store
 local.properties
 # build files
@@ -35,3 +43,4 @@ output/
 # android studio
 *.iml
 .idea
+>>>>>>> CymChad/master
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5da2d0e36..49c97e723 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,8 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="/Applications/gradle/gradle-2.12" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 12022d146..000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="Bundled (Maven 3)" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-          <State>
-            <id>Android</id>
-          </State>
-          <State>
-            <id>Android Lint</id>
-          </State>
-          <State>
-            <id>Java</id>
-          </State>
-          <State>
-            <id>Java language level migration aidsJava</id>
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>Android</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 11866156d..4dbaf56fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.1.0'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7bb141534..c4a6d7e5e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 17 11:45:15 CST 2016
+#Sun Jun 19 09:50:29 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java b/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java
index c11d9e1f1..ab753e559 100755
--- a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java
+++ b/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java
@@ -111,6 +111,10 @@ public void setOnLoadMoreListener(RequestLoadMoreListener requestLoadMoreListene
         this.mRequestLoadMoreListener = requestLoadMoreListener;
     }
 
+    /**
+     * Sets the duration of the animation.
+     * @param duration The length of the animation, in milliseconds.
+     */
     public void setDuration(int duration) {
         mDuration = duration;
     }
@@ -156,25 +160,61 @@ public void setPageSize(int pageSize) {
     public int getPageSize() {
         return this.pageSize;
     }
-
+    /**
+     * Register a callback to be invoked when an item in this AdapterView has
+     * been clicked.
+     *
+     * @param onRecyclerViewItemClickListener The callback that will be invoked.
+     */
     public void setOnRecyclerViewItemClickListener(OnRecyclerViewItemClickListener onRecyclerViewItemClickListener) {
         this.onRecyclerViewItemClickListener = onRecyclerViewItemClickListener;
     }
-
+    /**
+     * Interface definition for a callback to be invoked when an item in this
+     * AdapterView has been clicked.
+     */
     public interface OnRecyclerViewItemClickListener {
+        /**
+         * Callback method to be invoked when an item in this AdapterView has
+         * been clicked.
+         * @param view The view within the AdapterView that was clicked (this
+         *            will be a view provided by the adapter)
+         * @param position The position of the view in the adapter.
+         */
         public void onItemClick(View view, int position);
     }
-
+    /**
+     * Register a callback to be invoked when an item in this AdapterView has
+     * been clicked and held
+     *
+     * @param onRecyclerViewItemLongClickListener The callback that will run
+     */
     public void setOnRecyclerViewItemLongClickListener(OnRecyclerViewItemLongClickListener onRecyclerViewItemLongClickListener) {
         this.onRecyclerViewItemLongClickListener = onRecyclerViewItemLongClickListener;
     }
 
+    /**
+     * Interface definition for a callback to be invoked when an item in this
+     * view has been clicked and held
+     */
     public interface OnRecyclerViewItemLongClickListener {
+        /**
+         * callback method to be invoked when an item in this view has been
+         * click and held
+         * @param view The view whihin the AbsListView that was clicked
+         * @param position The position of the view int the adapter
+         * @return true if the callback consumed the long click ,false otherwise
+         */
         public boolean onItemLongClick(View view, int position);
     }
 
     private OnRecyclerViewItemChildClickListener mChildClickListener;
-
+    /**
+     * Register a callback to be invoked when childView in this AdapterView has
+     * been clicked and held
+     * {@link OnRecyclerViewItemChildClickListener}
+     * @param childClickListener The callback that will run
+     */
     public void setOnRecyclerViewItemChildClickListener(OnRecyclerViewItemChildClickListener childClickListener) {
         this.mChildClickListener = childClickListener;
     }
@@ -217,13 +257,21 @@ public BaseQuickAdapter(View contentView, List<T> data) {
         mContentView = contentView;
     }
 
-
+    /**
+     * remove the item associated with the specified position of adapter
+     * @param position
+     */
     public void remove(int position) {
         mData.remove(position);
         notifyItemRemoved(position + getHeaderViewsCount());
 
     }
 
+    /**
+     *  insert  a item associated with the specified position of adapter
+     * @param position
+     * @param item
+     */
     public void add(int position, T item) {
         mData.add(position, item);
         notifyItemInserted(position);
@@ -255,7 +303,18 @@ public void addData(List<T> data) {
         notifyDataSetChanged();
     }
 
+    /**
+     * set a loadingView
+     * @param loadingView
+     */
+    public void setLoadingView(View loadingView) {
+        this.mLoadingView = loadingView;
+    }
 
+    /**
+     * Get the data of list
+     * @return
+     */
     public List getData() {
         return mData;
     }
@@ -271,18 +330,33 @@ public T getItem(int position) {
         return mData.get(position);
     }
 
+    /**
+     * if setHeadView will be return 1 if not will be return 0
+     * @return
+     */
     public int getHeaderViewsCount() {
         return mHeaderView == null ? 0 : 1;
     }
-
+    /**
+     * if mFooterView will be return 1 or not will be return 0
+     * @return
+     */
     public int getFooterViewsCount() {
         return mFooterView == null ? 0 : 1;
     }
-
+    /**
+     * if mEmptyView will be return 1 or not will be return 0
+     * @return
+     */
     public int getmEmptyViewCount() {
         return mEmptyView == null ? 0 : 1;
     }
 
+    /**
+     * returns the number of item that will be created
+     *
+     * @return
+     */
     @Override
     public int getItemCount() {
         int i = isLoadMore() ? 1 : 0;
@@ -356,7 +430,7 @@ public int getItemViewType(int position) {
             else if ((!mFootAndEmptyEnable || !mHeadAndEmptyEnable) && position == 1 && mFooterView != null) {
                 return FOOTER_VIEW;
             }
-        } else if (mEmptyView != null && getItemCount() == (mHeadAndEmptyEnable ? 2 : 1) && mEmptyEnable) {
+        } else if (mData.size() == 0 &&mEmptyView != null && getItemCount() == (mHeadAndEmptyEnable ? 2 : 1) && mEmptyEnable) {
             return EMPTY_VIEW;
         } else if (position == mData.size() + getHeaderViewsCount()) {
             if (mNextLoadEnable)
@@ -398,9 +472,6 @@ public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 
     }
 
-    public void setLoadingView(View loadingView) {
-        this.mLoadingView = loadingView;
-    }
 
     private BaseViewHolder getLoadingView(ViewGroup parent) {
         if (mLoadingView == null) {
@@ -579,15 +650,32 @@ private void addAnimation(RecyclerView.ViewHolder holder) {
         }
     }
 
+    /**
+     *
+     * @param anim
+     * @param index
+     */
     protected void startAnim(Animator anim, int index) {
         anim.setDuration(mDuration).start();
         anim.setInterpolator(mInterpolator);
     }
 
+    /**
+     * Determine whether it is loaded more
+     * @return
+     */
     private boolean isLoadMore() {
         return mNextLoadEnable && pageSize != -1 && mRequestLoadMoreListener != null && mData.size() >= pageSize;
     }
 
+    /**
+     *
+     * @param layoutResId ID for an XML layout resource to load
+     * @param parent Optional view to be the parent of the generated hierarchy or else simply an object that
+     *        provides a set of LayoutParams values for root of the returned
+     *        hierarchy
+     * @return  view will be return
+     */
     protected View getItemView(int layoutResId, ViewGroup parent) {
         return mLayoutInflater.inflate(layoutResId, parent, false);
     }
@@ -647,11 +735,17 @@ public void openLoadAnimation(BaseAnimation animation) {
         this.mCustomAnimation = animation;
     }
 
+    /**
+     * To open the animation when loading
+     */
     public void openLoadAnimation() {
         this.mOpenAnimationEnable = true;
     }
 
-
+    /**
+     * {@link #addAnimation(RecyclerView.ViewHolder)}
+     * @param firstOnly true just show anim when first loading false show anim when load the data every time
+     */
     public void isFirstOnly(boolean firstOnly) {
         this.mFirstOnlyEnable = firstOnly;
     }
@@ -664,7 +758,12 @@ public void isFirstOnly(boolean firstOnly) {
      */
     protected abstract void convert(BaseViewHolder helper, T item);
 
-
+    /**
+     * Get the row id associated with the specified position in the list.
+     *
+     * @param position The position of the item within the adapter's data set whose row id we want.
+     * @return The id of the item at the specified position.
+     */
     @Override
     public long getItemId(int position) {
         return position;