Skip to content

Commit

Permalink
1.修复点击事件被拦截的问题。2.去掉manifest中的多余信息。3.升级gradle以及依赖版本。4.升级version code(3…
Browse files Browse the repository at this point in the history
…->4) 以及 version name(1.0.3->1.0.4)
  • Loading branch information
Aspsine committed Jan 3, 2017
1 parent 5429387 commit a82beb0
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 34 deletions.
17 changes: 8 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 24
buildToolsVersion '24.0.1'
compileSdkVersion 25
buildToolsVersion '25.0.2'

defaultConfig {
applicationId "com.aspsine.swipetoloadlayout"
minSdkVersion 10
targetSdkVersion 24
versionCode 3
versionName "1.0.3"
targetSdkVersion 25
versionCode 4
versionName "1.0.4"
}
buildTypes {
release {
Expand All @@ -27,10 +27,9 @@ dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
compile project(':library')
compile 'com.android.support:appcompat-v7:24.1.1'
compile 'com.android.support:recyclerview-v7:24.1.1'
compile 'com.android.support:support-v4:24.1.1'
compile 'com.android.support:design:24.1.1'
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:recyclerview-v7:25.1.0'
compile 'com.android.support:design:25.1.0'
compile 'com.google.code.gson:gson:2.4'
compile 'com.mcxiaoke.volley:library-aar:1.0.1'
compile 'com.squareup.picasso:picasso:2.5.2'
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.0'
classpath 'com.android.tools.build:gradle:2.2.3'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Sep 02 10:00:37 CST 2015
#Wed Jan 04 00:31:07 CST 2017
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.14.1-all.zip
14 changes: 7 additions & 7 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 24
buildToolsVersion '24.0.1'
compileSdkVersion 25
buildToolsVersion '25.0.2'

defaultConfig {
minSdkVersion 8
targetSdkVersion 24
versionCode 3
versionName "1.0.3"
minSdkVersion 9
targetSdkVersion 25
versionCode 4
versionName "1.0.4"
}
buildTypes {
release {
Expand All @@ -21,5 +21,5 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
compile 'com.android.support:support-v4:24.1.1'
compile 'com.android.support:support-compat:25.1.0'
}
8 changes: 2 additions & 6 deletions library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.aspsine.swipetoloadlayout" >
<manifest package="com.aspsine.swipetoloadlayout">

<application
android:allowBackup="true"
android:label="@string/app_name" >
</application>
<application></application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,8 @@ public boolean onInterceptTouchEvent(MotionEvent event) {
final float xInitDiff = x - mInitDownX;
mLastY = y;
mLastX = x;
boolean moved = Math.abs(yInitDiff) > Math.abs(xInitDiff);
boolean moved = Math.abs(yInitDiff) > Math.abs(xInitDiff)
&& Math.abs(yInitDiff) > mTouchSlop;
boolean triggerCondition =
// refresh trigger condition
(yInitDiff > 0 && moved && onCheckCanRefresh()) ||
Expand Down
5 changes: 0 additions & 5 deletions library/src/main/res/values/dimens.xml

This file was deleted.

3 changes: 0 additions & 3 deletions library/src/main/res/values/strings.xml

This file was deleted.

1 comment on commit a82beb0

@Aspsine
Copy link
Owner Author

@Aspsine Aspsine commented on a82beb0 Jan 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. fix android:allowBackup="true" #83
  2. fix 点击事件偶尔被拦截的bug

Please sign in to comment.