Merge pull request #5 from JarvisGG/issues2

fix-空白区域出发滑动，无法响应点击事件
JarvisGG · Jan 18, 2019 · 911025d · 911025d
2 parents eaa0492 + f9650a4
commit 911025d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
diff --git a/library/src/main/java/jarvis/com/library/NestedTouchScrollingLayout.java b/library/src/main/java/jarvis/com/library/NestedTouchScrollingLayout.java
@@ -267,10 +267,33 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
         }
     }
 
+    private boolean isTouchUnderChildView(MotionEvent event) {
+        View targetChildView = getChildAt(0);
+        float translationX = targetChildView.getTranslationX();
+        float translationY = targetChildView.getTranslationY();
+        float x = event.getX();
+        float y = event.getY();
+        return x >= targetChildView.getLeft() + translationX &&
+                x <= targetChildView.getRight() + translationX &&
+                y >= targetChildView.getTop() + translationY &&
+                y <= targetChildView.getBottom() + translationY;
+    }
+
+    /**
+     * 不拦截 Touch 事件的几种情况
+     * 1.不开启父亲布局拦截.
+     * 2.当前子 View 为 null
+     * 3.当前 Touch 事件没用作用到子 View
+     * @param event
+     * @return
+     */
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         float velocityY = 0;
-        if (getChildAt(0) == null || !isParentDispatchTouchEvent) {
+
+        if (!isParentDispatchTouchEvent ||
+                getChildAt(0) == null ||
+                !isTouchUnderChildView(event)) {
             return super.onTouchEvent(event);
         }
         if (isAnimating()) {