perf: 优化过期方法

CymChad · Nov 14, 2021 · a309265 · a309265
1 parent 6dcf477
commit a309265
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -31,6 +31,9 @@ android {
     viewBinding {
         enabled = true
     }
+    buildFeatures {
+        dataBinding = true
+    }
 }
 
 // 打包源码jar

diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseBinderAdapter.kt b/library/src/main/java/com/chad/library/adapter/base/BaseBinderAdapter.kt
@@ -121,7 +121,7 @@ open class BaseBinderAdapter(list: MutableList<Any>? = null) : BaseQuickAdapter<
             //如果没有设置点击监听，则回调给 itemProvider
             //Callback to itemProvider if no click listener is set
             viewHolder.itemView.setOnClickListener {
-                var position = viewHolder.adapterPosition
+                var position = viewHolder.bindingAdapterPosition
                 if (position == RecyclerView.NO_POSITION) {
                     return@setOnClickListener
                 }
@@ -137,7 +137,7 @@ open class BaseBinderAdapter(list: MutableList<Any>? = null) : BaseQuickAdapter<
             //如果没有设置长按监听，则回调给itemProvider
             // If you do not set a long press listener, callback to the itemProvider
             viewHolder.itemView.setOnLongClickListener {
-                var position = viewHolder.adapterPosition
+                var position = viewHolder.bindingAdapterPosition
                 if (position == RecyclerView.NO_POSITION) {
                     return@setOnLongClickListener false
                 }
@@ -160,7 +160,7 @@ open class BaseBinderAdapter(list: MutableList<Any>? = null) : BaseQuickAdapter<
                         it.isClickable = true
                     }
                     it.setOnClickListener { v ->
-                        var position: Int = viewHolder.adapterPosition
+                        var position: Int = viewHolder.bindingAdapterPosition
                         if (position == RecyclerView.NO_POSITION) {
                             return@setOnClickListener
                         }
@@ -179,7 +179,7 @@ open class BaseBinderAdapter(list: MutableList<Any>? = null) : BaseQuickAdapter<
                         it.isLongClickable = true
                     }
                     it.setOnLongClickListener { v ->
-                        var position: Int = viewHolder.adapterPosition
+                        var position: Int = viewHolder.bindingAdapterPosition
                         if (position == RecyclerView.NO_POSITION) {
                             return@setOnLongClickListener false
                         }

diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseProviderMultiAdapter.kt b/library/src/main/java/com/chad/library/adapter/base/BaseProviderMultiAdapter.kt
@@ -94,7 +94,7 @@ abstract class BaseProviderMultiAdapter<T>(data: MutableList<T>? = null) :
             //如果没有设置点击监听，则回调给 itemProvider
             //Callback to itemProvider if no click listener is set
             viewHolder.itemView.setOnClickListener {
-                var position = viewHolder.adapterPosition
+                var position = viewHolder.bindingAdapterPosition
                 if (position == RecyclerView.NO_POSITION) {
                     return@setOnClickListener
                 }
@@ -110,7 +110,7 @@ abstract class BaseProviderMultiAdapter<T>(data: MutableList<T>? = null) :
             //如果没有设置长按监听，则回调给itemProvider
             // If you do not set a long press listener, callback to the itemProvider
             viewHolder.itemView.setOnLongClickListener {
-                var position = viewHolder.adapterPosition
+                var position = viewHolder.bindingAdapterPosition
                 if (position == RecyclerView.NO_POSITION) {
                     return@setOnLongClickListener false
                 }
@@ -133,7 +133,7 @@ abstract class BaseProviderMultiAdapter<T>(data: MutableList<T>? = null) :
                         it.isClickable = true
                     }
                     it.setOnClickListener { v ->
-                        var position: Int = viewHolder.adapterPosition
+                        var position: Int = viewHolder.bindingAdapterPosition
                         if (position == RecyclerView.NO_POSITION) {
                             return@setOnClickListener
                         }
@@ -152,7 +152,7 @@ abstract class BaseProviderMultiAdapter<T>(data: MutableList<T>? = null) :
                         it.isLongClickable = true
                     }
                     it.setOnLongClickListener { v ->
-                        var position: Int = viewHolder.adapterPosition
+                        var position: Int = viewHolder.bindingAdapterPosition
                         if (position == RecyclerView.NO_POSITION) {
                             return@setOnLongClickListener false
                         }

diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.kt b/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.kt
@@ -492,7 +492,7 @@ abstract class BaseQuickAdapter<T, VH : BaseViewHolder>
     protected open fun bindViewClickListener(viewHolder: VH, viewType: Int) {
         mOnItemClickListener?.let {
             viewHolder.itemView.setOnClickListener { v ->
-                var position = viewHolder.adapterPosition
+                var position = viewHolder.bindingAdapterPosition
                 if (position == RecyclerView.NO_POSITION) {
                     return@setOnClickListener
                 }
@@ -502,7 +502,7 @@ abstract class BaseQuickAdapter<T, VH : BaseViewHolder>
         }
         mOnItemLongClickListener?.let {
             viewHolder.itemView.setOnLongClickListener { v ->
-                var position = viewHolder.adapterPosition
+                var position = viewHolder.bindingAdapterPosition
                 if (position == RecyclerView.NO_POSITION) {
                     return@setOnLongClickListener false
                 }
@@ -518,7 +518,7 @@ abstract class BaseQuickAdapter<T, VH : BaseViewHolder>
                         childView.isClickable = true
                     }
                     childView.setOnClickListener { v ->
-                        var position = viewHolder.adapterPosition
+                        var position = viewHolder.bindingAdapterPosition
                         if (position == RecyclerView.NO_POSITION) {
                             return@setOnClickListener
                         }
@@ -535,7 +535,7 @@ abstract class BaseQuickAdapter<T, VH : BaseViewHolder>
                         childView.isLongClickable = true
                     }
                     childView.setOnLongClickListener { v ->
-                        var position = viewHolder.adapterPosition
+                        var position = viewHolder.bindingAdapterPosition
                         if (position == RecyclerView.NO_POSITION) {
                             return@setOnLongClickListener false
                         }

diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseSectionQuickAdapter.kt b/library/src/main/java/com/chad/library/adapter/base/BaseSectionQuickAdapter.kt
@@ -1,6 +1,5 @@
 package com.chad.library.adapter.base
 
-import android.view.ViewGroup
 import androidx.annotation.LayoutRes
 import com.chad.library.adapter.base.entity.SectionEntity
 import com.chad.library.adapter.base.viewholder.BaseViewHolder

diff --git a/library/src/main/java/com/chad/library/adapter/base/viewholder/BaseViewHolder.kt b/library/src/main/java/com/chad/library/adapter/base/viewholder/BaseViewHolder.kt
@@ -7,6 +7,7 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.*
+import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
@@ -70,7 +71,7 @@ open class BaseViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     }
 
     open fun setTextColorRes(@IdRes viewId: Int, @ColorRes colorRes: Int): BaseViewHolder {
-        getView<TextView>(viewId).setTextColor(itemView.resources.getColor(colorRes))
+        getView<TextView>(viewId).setTextColor(ContextCompat.getColor(itemView.context, colorRes))
         return this
     }