Merge pull request #1557 from AllenCoder/master

upgradle gradle version and fix issue
CymChad · Sep 17, 2017 · 2385c22 · 2385c22
2 parents 4548016 + 68cc05f
commit 2385c22
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -16,3 +16,6 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.enableBuildCache=true
+android.enableD8=true
+android.buildCacheDir=./build/buildCache/
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseViewHolder.java b/library/src/main/java/com/chad/library/adapter/base/BaseViewHolder.java
@@ -87,7 +87,10 @@ public BaseViewHolder(final View view) {
     }
 
     private int getClickPosition() {
-        return getLayoutPosition() - adapter.getHeaderLayoutCount();
+        if (getLayoutPosition()>=adapter.getHeaderLayoutCount()){
+            return getLayoutPosition() - adapter.getHeaderLayoutCount();
+        }
+        return 0;
     }
 
     public HashSet<Integer> getItemChildLongClickViewIds() {