修改解决滑动冲突的方式

ooftf · Mar 29, 2018 · f6e33ef · f6e33ef
1 parent 5d4f9d9
commit f6e33ef
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/lib/src/main/java/com/ooftf/vertical/VerticalPagerLayout.kt b/lib/src/main/java/com/ooftf/vertical/VerticalPagerLayout.kt
@@ -104,19 +104,19 @@ class VerticalPagerLayout : FrameLayout {
     private fun judgeIntercept(ev: MotionEvent): Boolean {
         val currentPage = getCurrentPage()
         val currentView = viewForPosition(currentPage)
-        var scrollEdgeEngine = mScrollEdgeAnalyzer(currentPage, currentView)
-        if (scrollEdgeEngine.isTop() && ev.y - lastY > TRIGGER_INTERCEPT_VALUE) {//顶部
-            return true
-        }
-        if (scrollEdgeEngine.isBottom() && ev.y - lastY < -TRIGGER_INTERCEPT_VALUE) {//底部
-            return true
+        mScrollEdgeAnalyzer?.let {
+            var scrollEdgeEngine = it(currentPage, currentView)
+            if (scrollEdgeEngine.isTop() && ev.y - lastY > TRIGGER_INTERCEPT_VALUE) {//顶部
+                return true
+            }
+            if (scrollEdgeEngine.isBottom() && ev.y - lastY < -TRIGGER_INTERCEPT_VALUE) {//底部
+                return true
+            }
         }
         return false
     }
 
-    var mScrollEdgeAnalyzer: (Int, View) -> EdgeWrapper = { i: Int, scrollView: View ->
-        ScrollEdgeEngine(scrollView)
-    }
+    var mScrollEdgeAnalyzer: ((Int, View) -> EdgeWrapper)? = null
 
     fun setScrollEdgeAnalyzer(scrollEdgeAnalyzer: (Int, View) -> EdgeWrapper) {
         this.mScrollEdgeAnalyzer = scrollEdgeAnalyzer