优化API

wangchenyan · Oct 18, 2022 · ec44c2e · ec44c2e
1 parent e47d619
commit ec44c2e
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 27 deletions.
diff --git a/radapter3/src/main/java/me/wcy/radapter3/RAdapter.kt b/radapter3/src/main/java/me/wcy/radapter3/RAdapter.kt
@@ -18,13 +18,28 @@ class RAdapter<T> : RecyclerView.Adapter<ViewBindingHolder<*>>() {
      *
      * @param viewBinder 视图绑定器
      */
-    inline fun <reified VB : ViewBinding, reified D> register(viewBinder: RViewBinder<VB, D>): RAdapter<T> {
-        register(D::class.java, object : RTypeMapper<D> {
-            override fun map(data: D): Pair<RViewBinder<out ViewBinding, D>, KClass<out ViewBinding>> {
-                return Pair(viewBinder, VB::class)
+    inline fun <reified VB : ViewBinding, reified D : Any> register(viewBinder: RViewBinder<VB, D>) =
+        apply {
+            register(viewBinder, VB::class, D::class)
+        }
+
+    /**
+     * 注册 ViewBinder
+     *
+     * @param viewBinder 视图绑定器
+     */
+    fun <VB : ViewBinding, D : Any> register(
+        viewBinder: RViewBinder<VB, D>,
+        bindingClazz: KClass<VB>,
+        dataClazz: KClass<D>
+    ) = apply {
+        register(dataClazz, object : RTypeMapper<D> {
+            override fun map(data: D): RViewBinder<out ViewBinding, D> {
+                return viewBinder.apply {
+                    setViewBindingClazz(bindingClazz)
+                }
             }
         })
-        return this
     }
 
     /**
@@ -33,9 +48,8 @@ class RAdapter<T> : RecyclerView.Adapter<ViewBindingHolder<*>>() {
      * @param model 数据类型
      * @param mapper 数据到 [RViewBinder] 的映射，支持一种数据对应多种 View
      */
-    fun <D> register(model: Class<D>, mapper: RTypeMapper<D>): RAdapter<T> {
+    fun <D : Any> register(model: KClass<D>, mapper: RTypeMapper<D>) = apply {
         typePool.register(model, mapper)
-        return this
     }
 
     /**

diff --git a/radapter3/src/main/java/me/wcy/radapter3/RType.kt b/radapter3/src/main/java/me/wcy/radapter3/RType.kt
@@ -1,12 +1,14 @@
 package me.wcy.radapter3
 
+import kotlin.reflect.KClass
+
 /**
  * 一个列表 item 的实体，包含数据类型和 ViewBinder
  *
  * Created by wangchenyan on 2018/9/21.
  */
-internal class RType<T>(
-    internal val model: Class<T>,
+internal class RType<T : Any>(
+    internal val model: KClass<T>,
     internal val mapper: RTypeMapper<T>
 ) {
 

diff --git a/radapter3/src/main/java/me/wcy/radapter3/RTypeMapper.kt b/radapter3/src/main/java/me/wcy/radapter3/RTypeMapper.kt
@@ -9,5 +9,5 @@ import kotlin.reflect.KClass
  * 注意：映射方法会多次调用，如果要做到性能最优，建议复用 [RViewBinder]，不要每次都重新构造。
  */
 interface RTypeMapper<T> {
-    fun map(data: T): Pair<RViewBinder<out ViewBinding, T>, KClass<out ViewBinding>>
+    fun map(data: T): RViewBinder<out ViewBinding, T>
 }
diff --git a/radapter3/src/main/java/me/wcy/radapter3/RTypePool.kt b/radapter3/src/main/java/me/wcy/radapter3/RTypePool.kt
@@ -1,5 +1,7 @@
 package me.wcy.radapter3
 
+import kotlin.reflect.KClass
+
 /**
  * 列表 item 实体管理器
  *
@@ -14,8 +16,8 @@ internal class RTypePool {
     /**
      * 注册一个实体
      */
-    fun <T> register(
-        model: Class<T>,
+    fun <T : Any> register(
+        model: KClass<T>,
         mapper: RTypeMapper<T>
     ) {
         val type = RType(model, mapper)
@@ -34,18 +36,18 @@ internal class RTypePool {
         if (data == null) {
             return -1
         }
-        val clazz = data.javaClass
+        val dataClazz = data.javaClass
         var mapper: RTypeMapper<Any>? = null
         for (type in typeList) {
-            if (clazz == type.model) {
+            if (dataClazz == type.model.java) {
                 mapper = type.mapper as RTypeMapper<Any>
                 break
             }
         }
         if (mapper == null) {
             // 尝试查找子类
             for (type in typeList) {
-                if (type.model.isAssignableFrom(clazz)) {
+                if (type.model.java.isAssignableFrom(dataClazz)) {
                     mapper = type.mapper as RTypeMapper<Any>
                     break
                 }
@@ -55,11 +57,9 @@ internal class RTypePool {
             return -1
         }
         // TODO 避免多次创建 ViewBinder 实例
-        val pair = mapper.map(data)
-        val viewBinder = pair.first
+        val viewBinder = mapper.map(data)
         var exist = viewBinderList.find { it.javaClass == viewBinder.javaClass }
         if (exist == null) {
-            viewBinder.viewBindingClazz = pair.second
             viewBinderList.add(viewBinder)
             exist = viewBinder
         }

diff --git a/radapter3/src/main/java/me/wcy/radapter3/RViewBinder.kt b/radapter3/src/main/java/me/wcy/radapter3/RViewBinder.kt
@@ -9,11 +9,26 @@ import kotlin.reflect.KClass
  * Created by wangchenyan.top on 2022/9/25.
  */
 abstract class RViewBinder<VB : ViewBinding, T> {
-    internal lateinit var viewBindingClazz: KClass<*>
+    private var viewBindingClazz: KClass<*>? = null
     lateinit var adapter: RAdapter<Any>
 
+    open fun getViewBindingClazz(): KClass<*> {
+        if (viewBindingClazz == null) {
+            throw IllegalStateException(
+                "viewBindingClazz can not be null!" +
+                        "\nIf you use 'RTypeMapper', place override 'getViewBindingClazz()' method from 'RViewBinder'" +
+                        ", and provide ViewBinding class"
+            )
+        }
+        return viewBindingClazz!!
+    }
+
+    internal fun setViewBindingClazz(clazz: KClass<*>) {
+        viewBindingClazz = clazz
+    }
+
     fun onCreateViewHolder(parent: ViewGroup): ViewBindingHolder<VB> {
-        val inflateMethod = viewBindingClazz.java.getMethod(
+        val inflateMethod = getViewBindingClazz().java.getMethod(
             "inflate",
             LayoutInflater::class.java,
             ViewGroup::class.java,

diff --git a/simple/src/main/java/me/wcy/radapter3/simple/MainActivity.kt b/simple/src/main/java/me/wcy/radapter3/simple/MainActivity.kt
@@ -40,14 +40,15 @@ class MainActivity : AppCompatActivity() {
 
         val adapter = RAdapter<Any>()
         adapter.register(ImageViewBinder())
-        val textViewBinder1 = TextViewBinder1()
-        val textViewBinder2 = TextViewBinder2()
-        adapter.register(Text::class.java, object : RTypeMapper<Text> {
-            override fun map(data: Text): Pair<RViewBinder<out ViewBinding, Text>, KClass<out ViewBinding>> {
+        adapter.register(Text::class, object : RTypeMapper<Text> {
+            val textViewBinder1 = TextViewBinder1()
+            val textViewBinder2 = TextViewBinder2()
+
+            override fun map(data: Text): RViewBinder<out ViewBinding, Text> {
                 return when (data.style) {
-                    1 -> Pair(textViewBinder1, ViewHolderText1Binding::class)
-                    2 -> Pair(textViewBinder2, ViewHolderText2Binding::class)
-                    else -> Pair(textViewBinder2, ViewHolderText2Binding::class)
+                    1 -> textViewBinder1
+                    2 -> textViewBinder2
+                    else -> textViewBinder2
                 }
             }
         })
@@ -72,6 +73,8 @@ class MainActivity : AppCompatActivity() {
         override fun onBind(viewBinding: ViewHolderText1Binding, item: Text, position: Int) {
             viewBinding.text1.text = item.text
         }
+
+        override fun getViewBindingClazz(): KClass<*> = ViewHolderText1Binding::class
     }
 
     class TextViewBinder2 : RViewBinder<ViewHolderText2Binding, Text>() {
@@ -82,5 +85,7 @@ class MainActivity : AppCompatActivity() {
                     .show()
             }
         }
+
+        override fun getViewBindingClazz(): KClass<*> = ViewHolderText2Binding::class
     }
 }