ElasticLayout增加OnScrollListener

lang-v · Oct 18, 2020 · 8f019ee · 8f019ee
1 parent ba893c0
commit 8f019ee
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 35 deletions.
diff --git a/elasticviewlibrary/src/main/java/sl/view/elasticviewlibrary/ElasticLayout.kt b/elasticviewlibrary/src/main/java/sl/view/elasticviewlibrary/ElasticLayout.kt
@@ -89,33 +89,9 @@ class ElasticLayout @JvmOverloads constructor(
             field = value
         }
 
-//    //弹回动画锁
-//    private val lock = ReentrantLock()
-
     //事件监听
     private var listener: OnEventListener? = null
-
-//    //加载完成的回调
-//    private val refreshCallBack = object : PullCallBack {
-//        override fun over() {
-////            isRefreshing = false
-//            postDelayed({
-//                isRefreshing = false
-////                springBack(getScrollOffset(), 300)
-//            }, 300)
-//        }
-//    }
-//    private val loadCallBack = object : PullCallBack {
-//        override fun over() {
-//            postDelayed({
-//                isLoading = false
-//            },300)
-////            isLoading = false
-////            postDelayed({
-////                springBack(getScrollOffset(), 300)
-////            }, 300)
-//        }
-//    }
+    private var scrollListener:OnScrollListener?=null
 
     init {
         //禁止裁剪布局,使得在页面外的view依然能显示
@@ -239,6 +215,7 @@ class ElasticLayout @JvmOverloads constructor(
             super.scrollBy(x, 0)
         }
         if (isLoadingOrRefreshing()) return
+        scrollListener?.onScrolled(x,y)
         val scrollOffset = getScrollOffset()
         //更新控件header，footer状态
         if (scrollOffset < 0) {
@@ -394,10 +371,14 @@ class ElasticLayout @JvmOverloads constructor(
         animator!!.duration = animTime
         val scrollOffset = getScrollOffset()
         animator!!.addUpdateListener { animation ->
-            if (orientation == VERTICAL)
+            if (orientation == VERTICAL) {
+                scrollListener?.onScrolled(0,scrollOffset+(animation.animatedValue as Int)-getScrollOffset())
                 scrollTo(scrollX, scrollOffset + animation.animatedValue as Int)
-            else
+            }
+            else {
+                scrollListener?.onScrolled(scrollOffset+(animation.animatedValue as Int)-getScrollOffset(),0)
                 scrollTo(scrollOffset + animation.animatedValue as Int, scrollY)
+            }
         }
         animator!!.addListener(object : Animator.AnimatorListener {
             override fun onAnimationRepeat(animation: Animator?) {}
@@ -479,6 +460,10 @@ class ElasticLayout @JvmOverloads constructor(
         this.listener = listener
     }
 
+    fun setOnScrollListener(listener:OnScrollListener){
+        scrollListener = listener
+    }
+
     /**
      * 适配器基类   Header Footer都是派生于它
      */
@@ -532,4 +517,12 @@ class ElasticLayout @JvmOverloads constructor(
         fun onLoad()
     }
 
+    interface OnScrollListener{
+        /**
+         * @param dx x变化值 移动的长度
+         * @param dy y变化值 移动的长度
+         */
+        fun onScrolled(dx:Int,dy:Int)
+    }
+
 }
diff --git a/elasticviewlibrary/src/main/java/sl/view/elasticviewlibrary/base/BaseFooter.kt b/elasticviewlibrary/src/main/java/sl/view/elasticviewlibrary/base/BaseFooter.kt
@@ -1,6 +1,8 @@
 package sl.view.elasticviewlibrary.base
 
 import android.content.Context
+import android.opengl.Visibility
+import android.provider.Settings
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,10 +13,10 @@ import sl.view.elasticviewlibrary.ElasticLayout
 import sl.view.elasticviewlibrary.R
 
 open class BaseFooter(private val context: Context, offset:Int):ElasticLayout.FooterAdapter(offset) {
-    private lateinit var view: View
-    private val icon by lazy { view.findViewById<ImageView>(R.id.img) }
-    private val progressBar by lazy { view.findViewById<ProgressBar>(R.id.progressBar) }
-    private val text by lazy { view.findViewById<TextView>(R.id.text) }
+    protected lateinit var view: View
+    protected val icon by lazy { view.findViewById<ImageView>(R.id.img) }
+    protected val progressBar by lazy { view.findViewById<ProgressBar>(R.id.progressBar) }
+    protected val text by lazy { view.findViewById<TextView>(R.id.text) }
 
     //icon的方向
     private val DIRECTION_DOWN = true
@@ -53,6 +55,7 @@ open class BaseFooter(private val context: Context, offset:Int):ElasticLayout.Fo
         icon.visibility = View.INVISIBLE
         super.onDo()
     }
+
     override fun overDo(msg:String) {
         text.text = msg
         progressBar.visibility = View.INVISIBLE

diff --git a/elasticviewlibrary/src/main/java/sl/view/elasticviewlibrary/base/BaseHeader.kt b/elasticviewlibrary/src/main/java/sl/view/elasticviewlibrary/base/BaseHeader.kt
@@ -11,10 +11,10 @@ import sl.view.elasticviewlibrary.ElasticLayout
 import sl.view.elasticviewlibrary.R
 
 open class BaseHeader(private val context: Context, offset: Int) : ElasticLayout.HeaderAdapter(offset) {
-    private lateinit var view: View
-    private val icon by lazy { view.findViewById<ImageView>(R.id.img) }
-    private val progressBar by lazy { view.findViewById<ProgressBar>(R.id.progressBar) }
-    private val text by lazy { view.findViewById<TextView>(R.id.text) }
+    protected lateinit var view: View
+    protected val icon by lazy { view.findViewById<ImageView>(R.id.img) }
+    protected val progressBar by lazy { view.findViewById<ProgressBar>(R.id.progressBar) }
+    protected val text by lazy { view.findViewById<TextView>(R.id.text) }
 
     //icon的方向
     private val DIRECTION_DOWN = true