日常提交 2022-07-18.

Author: walgr

Quick/build.gradle

@@ -26,14 +26,16 @@ android {
     kotlinOptions {
         jvmTarget = '11'
     }
+    buildFeatures {
+        dataBinding true
+    }
 }
 
 dependencies {
 
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'com.google.android.material:material:1.6.1'
-    implementation 'androidx.databinding:databinding-runtime:7.2.1'
     //约束布局
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     //列表

Quick/src/main/java/com/wpf/app/quick/activity/ViewModelActivity.kt

@@ -46,8 +46,7 @@ abstract class ViewModelActivity<VM : BaseViewModel<H>, H : QuickView>(
             mViewModel = ViewModelProvider(
                 this,
                 ViewModelProvider.AndroidViewModelFactory(application)
-            )
-                .get(vmClass)
+            ).get(vmClass)
             bind(this, mViewModel)
             mViewModel?.baseView = this as H
             mViewModel?.onViewCreated(this as H)

Quick/src/main/java/com/wpf/app/quick/activity/ViewModelFragment.kt

@@ -33,8 +33,7 @@ open class ViewModelFragment<VM : BaseViewModel<H>, H : QuickView>(
             mViewModel = ViewModelProvider(
                 this,
                 ViewModelProvider.AndroidViewModelFactory(context!!.applicationContext as Application)
-            )
-                .get(vmClass)
+            ).get(vmClass)
             bind(this, mViewModel)
             mViewModel?.baseView = this as H
             mViewModel?.onViewCreated(this as H)

Quick/src/main/java/com/wpf/app/quick/widgets/recyclerview/DataChangeAdapter.kt

@@ -0,0 +1,62 @@
+package com.wpf.app.quick.widgets.recyclerview
+
+/**
+ * Created by 王朋飞 on 2022/7/18.
+ *
+ */
+interface DataChangeAdapter {
+
+    fun getAdapter(): QuickAdapter
+
+    fun size(): Int {
+        return getAdapter().itemCount
+    }
+
+    fun setNewData(mDataList: List<QuickItemData>?) {
+        cleanAll()
+        appendList(mDataList)
+        getAdapter().notifyDataSetChanged()
+    }
+
+    fun cleanAll() {
+        getData()?.clear()
+        getAdapter().notifyDataSetChanged()
+    }
+
+    fun appendList(mDataList: List<QuickItemData>?) {
+        if (mDataList == null) return
+        if (getData() == null) {
+            setData(arrayListOf())
+        }
+        getData()?.addAll(mDataList)
+    }
+
+    fun addData(data: QuickItemData) {
+        if (getData() == null) {
+            setData(arrayListOf())
+        }
+        getData()?.add(data)
+    }
+
+    fun addData(
+        pos: Int,
+        data: QuickItemData
+    ) {
+        if (getData() == null) {
+            setData(arrayListOf())
+        }
+        getData()?.add(pos, data)
+    }
+
+    fun <T : QuickItemData> getRealTypeData(): MutableList<T>? {
+        return getData() as? MutableList<T>
+    }
+    
+    fun getData(): MutableList<QuickItemData>? {
+        return getAdapter().mDataList
+    }
+    
+    fun setData(newData: MutableList<QuickItemData>) {
+        getAdapter().mDataList = newData
+    }
+}

Quick/src/main/java/com/wpf/app/quick/widgets/recyclerview/QuickAdapter.kt

@@ -8,57 +8,11 @@ import androidx.recyclerview.widget.RecyclerView
  * Created by 王朋飞 on 2022/7/13.
  *
  */
-class QuickAdapter : RecyclerView.Adapter<QuickViewHolder<QuickItemData>>() {
+class QuickAdapter : RecyclerView.Adapter<QuickViewHolder<QuickItemData>>(), DataChangeAdapter {
 
-    private var mDataList: MutableList<QuickItemData>? = null
+    var mDataList: MutableList<QuickItemData>? = null
 
-    var mQuickAdapterListener: QuickAdapterListener<out QuickItemData>? = null
-
-    fun setNewData(mDataList: List<QuickItemData>?) {
-        cleanAll()
-        appendList(mDataList)
-        notifyDataSetChanged()
-    }
-
-    fun cleanAll() {
-        if (mDataList != null) {
-            mDataList!!.clear()
-        }
-        notifyDataSetChanged()
-    }
-
-    fun appendList(mDataList: List<QuickItemData>?) {
-        if (mDataList == null) return
-        if (this.mDataList == null) {
-            this.mDataList = mutableListOf()
-        }
-        this.mDataList!!.addAll(mDataList)
-    }
-
-    fun addData(data: QuickItemData) {
-        if (mDataList == null) {
-            mDataList = ArrayList()
-        }
-        mDataList!!.add(data)
-    }
-
-    fun addData(
-        pos: Int,
-        data: QuickItemData
-    ) {
-        if (mDataList == null) {
-            mDataList = mutableListOf()
-        }
-        mDataList?.add(pos, data)
-    }
-
-    fun getData(): MutableList<QuickItemData>? {
-        return mDataList
-    }
-
-    fun <T : QuickItemData> getRealTypeData(): MutableList<T>? {
-        return mDataList as? MutableList<T>
-    }
+    private var mQuickAdapterListener: QuickAdapterListener<out QuickItemData>? = null
 
     override fun onCreateViewHolder(
         viewGroup: ViewGroup,
@@ -68,11 +22,12 @@ class QuickAdapter : RecyclerView.Adapter<QuickViewHolder<QuickItemData>>() {
             it.viewType == viewType
         }?.let { findData ->
             if (findData is QuickViewDataBinding<*>) {
-                val holderAnnotationClass = findData::class.java.getAnnotation(BindBindingHolder::class.java)
+                val holderAnnotationClass =
+                    findData::class.java.getAnnotation(BindBindingHolder::class.java)
                 holderAnnotationClass?.let {
                     val bindingHolderCls = it.value.java.getConstructor(ViewGroup::class.java)
-                    val bindingHolder =
-                        bindingHolderCls.newInstance(viewGroup) as QuickViewBindingHolder<QuickViewDataBinding<out ViewDataBinding>, out ViewDataBinding>
+                    val bindingHolder = bindingHolderCls.newInstance(viewGroup)
+                            as QuickViewBindingHolder<QuickViewDataBinding<out ViewDataBinding>, out ViewDataBinding>
                     bindingHolder.mViewData = findData
                     bindingHolder.onCreateViewHolder(bindingHolder.itemView)
                     return bindingHolder as QuickViewHolder<QuickItemData>
@@ -117,4 +72,12 @@ class QuickAdapter : RecyclerView.Adapter<QuickViewHolder<QuickItemData>>() {
     fun getQuickAdapterListener(): QuickAdapterListener<out QuickItemData>? {
         return mQuickAdapterListener
     }
+
+    fun setQuickAdapterListener(listener: QuickAdapterListener<out QuickItemData>?) {
+        this.mQuickAdapterListener = listener
+    }
+
+    override fun getAdapter(): QuickAdapter {
+        return this
+    }
 }

Quick/src/main/java/com/wpf/app/quick/widgets/recyclerview/QuickRecyclerView.kt

@@ -14,7 +14,7 @@ open class QuickRecyclerView @JvmOverloads constructor(
     open val mContext: Context,
     open val attrs: AttributeSet? = null,
     open val defStyleAttr: Int = 0
-) : RecyclerView(mContext, attrs, defStyleAttr) {
+) : RecyclerView(mContext, attrs, defStyleAttr), DataChangeAdapter {
 
     private lateinit var mQuickAdapter: QuickAdapter
 
@@ -29,11 +29,7 @@ open class QuickRecyclerView @JvmOverloads constructor(
         adapter = mQuickAdapter
     }
 
-    fun size(): Int {
-        return mQuickAdapter.itemCount
-    }
-
-    fun getQuickAdapter() : QuickAdapter {
+    override fun getAdapter() : QuickAdapter {
         return mQuickAdapter
     }
 }

Quick/src/main/java/com/wpf/app/quick/widgets/recyclerview/QuickRefreshRecyclerView.kt

@@ -8,7 +8,7 @@ import com.wpf.app.quick.utils.Callback
  * Created by 王朋飞 on 2022/7/13.
  *
  */
-class QuickRefreshRecyclerView @JvmOverloads constructor(
+open class QuickRefreshRecyclerView @JvmOverloads constructor(
     override val mContext: Context,
     override val attrs: AttributeSet? = null,
     override val defStyleAttr: Int = 0
@@ -28,8 +28,8 @@ class QuickRefreshRecyclerView @JvmOverloads constructor(
         (mDataChangeListener as? DataChangeListener<RequestData, QuickItemData>)?.onRefresh(
             mRequestData, object : Callback<QuickItemData> {
                 override fun callback(data: List<QuickItemData>?) {
-                    getQuickAdapter().setNewData(data)
-                    getQuickAdapter().notifyDataSetChanged()
+                    setNewData(data)
+                    adapter.notifyDataSetChanged()
                 }
 
             })
@@ -43,9 +43,9 @@ class QuickRefreshRecyclerView @JvmOverloads constructor(
             mRequestData,
             object : Callback<QuickItemData> {
                 override fun callback(data: List<QuickItemData>?) {
-                    getQuickAdapter().appendList(data)
-                    getQuickAdapter().notifyItemRangeInserted(
-                        getQuickAdapter().itemCount - (data?.size ?: 0), (data?.size ?: 0)
+                    appendList(data)
+                    adapter.notifyItemRangeInserted(
+                        size() - (data?.size ?: 0), (data?.size ?: 0)
                     )
                 }
             })

app/src/main/java/com/wpf/app/quick/demo/SelectListTestActivity.kt

@@ -41,11 +41,11 @@ class SelectListTestActivity : QuickActivity(R.layout.activity_recyclerview_test
     }
 
     fun clean(view: View?) {
-        list?.getQuickAdapter()?.cleanAll()
+        list?.cleanAll()
     }
 
     fun addMessage(view: View?) {
-        list?.getQuickAdapter()?.addData(SelectItem())
-        list?.getQuickAdapter()?.notifyItemInserted(list?.getQuickAdapter()?.itemCount ?: 0)
+        list?.addData(SelectItem())
+        list?.adapter?.notifyItemInserted(list?.size() ?: 0)
     }
 }

app/src/main/java/com/wpf/app/quick/demo/viewmodel/RecyclerViewTestViewModel.kt

@@ -15,11 +15,11 @@ class RecyclerViewTestViewModel : BindingViewModel<ActivityRecyclerviewTestBindi
     }
 
     fun clean(view: View?) {
-        getViewBinding()?.list?.getQuickAdapter()?.cleanAll()
+        getViewBinding()?.list?.cleanAll()
     }
 
     fun addMessage(view: View?) {
-        getViewBinding()?.list?.getQuickAdapter()?.addData(BindDataTestModel())
-        getViewBinding()?.list?.getQuickAdapter()?.notifyDataSetChanged()
+        getViewBinding()?.list?.addData(BindDataTestModel())
+        getViewBinding()?.list?.adapter?.notifyItemInserted(getViewBinding()?.list?.size() ?: 0)
     }
 }

gradle.properties

@@ -28,7 +28,7 @@ android.nonTransitiveRClass=true
 IS_REMOTE=true
 
 GROUP=com.wpf.app.quick
-VERSION_NAME=0.2.1
+VERSION_NAME=0.2.2
 
 POM_DESCRIPTION=Quick Android.