diff --git a/library/build.gradle b/library/build.gradle index f82e813..866f674 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -14,7 +14,7 @@ android { buildToolsVersion '25.0.1' defaultConfig { - minSdkVersion 12 + minSdkVersion 14 targetSdkVersion 25 versionCode 6 versionName "1.06" diff --git a/library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/BallPulseView.java b/library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/BallPulseView.java index 7444af6..da522d6 100644 --- a/library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/BallPulseView.java +++ b/library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/BallPulseView.java @@ -1,4 +1,4 @@ -package com.lcodecore.tkrefreshlayout.Footer; +package com.lcodecore.tkrefreshlayout.footer; import android.animation.ValueAnimator; import android.content.Context; diff --git a/library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/LoadingView.java b/library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/LoadingView.java index 02f193a..3f3a6e6 100644 --- a/library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/LoadingView.java +++ b/library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/LoadingView.java @@ -1,4 +1,4 @@ -package com.lcodecore.tkrefreshlayout.Footer; +package com.lcodecore.tkrefreshlayout.footer; import android.content.Context; import android.graphics.drawable.AnimationDrawable; diff --git a/library/src/main/java/com/lcodecore/tkrefreshlayout/TwinklingRefreshLayout.java b/library/src/main/java/com/lcodecore/tkrefreshlayout/TwinklingRefreshLayout.java index d944ec3..f921680 100644 --- a/library/src/main/java/com/lcodecore/tkrefreshlayout/TwinklingRefreshLayout.java +++ b/library/src/main/java/com/lcodecore/tkrefreshlayout/TwinklingRefreshLayout.java @@ -162,7 +162,6 @@ protected void onFinishInflate() { super.onFinishInflate(); //获得子控件 //onAttachedToWindow方法中mChildView始终是第0个child,把header、footer放到构造函数中,mChildView最后被inflate - //TODO 可能引入新问题:1.fixedHeader显示异常 2.悬浮刷新不可见 mChildView = getChildAt(3); cp.init(); @@ -239,56 +238,6 @@ public boolean dispatchTouchEvent(MotionEvent event) { return super.dispatchTouchEvent(event); } - /*TODO 保留方案,解决refresh在滚动中刷新失效问题 - private float mTouchX, mTouchY; - private boolean intercepted = false; - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - switch (ev.getAction()) { - case MotionEvent.ACTION_DOWN: - mTouchX = ev.getX(); - mTouchY = ev.getY(); - break; - case MotionEvent.ACTION_MOVE: - float dx = ev.getX() - mTouchX; - float dy = ev.getY() - mTouchY; - if (Math.abs(dx) <= Math.abs(dy)) {//滑动允许最大角度为45度 - //ListView向上滚动时这里执行不到,想办法拦截掉这个事件,不让它向下传递 - //模拟拦截事件 - if (!intercepted){ - if (dy > 0 && !ScrollingUtil.canChildScrollUp(cp.getScrollableView()) && cp.allowPullDown()){ - cp.setStatePTD(); - intercepted = true; - }else if (dy < 0 && !ScrollingUtil.canChildScrollDown(cp.getScrollableView()) && cp.allowPullUp()) { - cp.setStatePBU(); - intercepted = true; - }else return super.dispatchTouchEvent(ev); - } - - //事件已拦截到 - if (cp.isStatePTD()){ - dy = Math.min(cp.getMaxHeadHeight() * 2, dy); - dy = Math.max(0, dy); - cp.getAnimProcessor().scrollHeadByMove(dy); - }else if(cp.isStatePBU()){ - dy = Math.min(cp.getBottomHeight() * 2, Math.abs(dy)); - dy = Math.max(0, dy); - cp.getAnimProcessor().scrollBottomByMove(dy); - } - } - break; - case MotionEvent.ACTION_CANCEL: - case MotionEvent.ACTION_UP: - if (cp.isStatePTD()) { - cp.getAnimProcessor().dealPullDownRelease(); - } else if (cp.isStatePBU()) { - cp.getAnimProcessor().dealPullUpRelease(); - } - intercepted = false; - break; - } - return super.dispatchTouchEvent(ev); - }*/ /** * 拦截事件