优化

Author: github2136

app/src/main/java/com/github2136/datalevelpicker_demo/MainActivity.kt

@@ -8,9 +8,9 @@ import com.github2136.datalevelpicker.DataLevelPickerDialog
 import com.github2136.datalevelpicker.IDataLevel
 
 class MainActivity : AppCompatActivity() {
-    var selectData: MutableList<IDataLevel> = mutableListOf()
+    var selectData: MutableList<City> = mutableListOf()
     val dataLevelPickerDialog by lazy {
-        val l5 = mutableListOf<IDataLevel>()
+        val l5 = mutableListOf<City>()
         repeat(2) { n ->
             val l4 = mutableListOf<City>()
             repeat(4) { l ->
@@ -49,10 +49,10 @@ class MainActivity : AppCompatActivity() {
                 dataLevelPickerDialog.show(supportFragmentManager)
             }
             R.id.btn2 -> {
-                if (selectData.isEmpty()) {
+                if (selectData.isNotEmpty()) {
                     dataLevelPickerDialog.setData(selectData)
                 } else {
-                    val d = mutableListOf<IDataLevel>()
+                    val d = mutableListOf<City>()
                     d.add(City("A0", "", null))
                     d.add(City("B01", "", null))
                     d.add(City("C012", "", null))

library/src/main/java/com/github2136/datalevelpicker/DataLevelPickerDialog.kt

@@ -22,25 +22,25 @@ import androidx.recyclerview.widget.RecyclerView
  * Created by YB on 2022/12/5
  * 级联菜单选择
  */
-class DataLevelPickerDialog private constructor() : DialogFragment(), View.OnClickListener {
+class DataLevelPickerDialog<T : IDataLevel> private constructor() : DialogFragment(), View.OnClickListener {
     private val className by lazy { javaClass.simpleName }
-    protected lateinit var dataLevel: MutableList<IDataLevel>
+    private var dataLevel: MutableList<IDataLevel> = mutableListOf()
     private var selectData = mutableListOf<IDataLevel>() //选中的集合
     private var level = 0 //当前操作等级
-    private var onConfirm: ((data: MutableList<IDataLevel>) -> Unit)? = null
+    private var onConfirm: ((data: MutableList<T>) -> Unit)? = null
     private lateinit var hsvTitle: HorizontalScrollView
     private lateinit var llTitle: LinearLayout
     private lateinit var rvList: RecyclerView
     private lateinit var btnConfirm: TextView
     private lateinit var btnCancel: TextView
     private lateinit var adapter: DataLevelPickerAdapter
 
-    constructor(data: MutableList<IDataLevel>, onConfirm: (data: MutableList<IDataLevel>) -> Unit) : this() {
-        dataLevel = data
+    constructor(data: MutableList<T>, onConfirm: (data: MutableList<T>) -> Unit) : this() {
+        dataLevel.addAll(data)
         this.onConfirm = onConfirm
     }
 
-    fun setData(data: MutableList<IDataLevel>) {
+    fun setData(data: MutableList<T>) {
         selectData.clear()
         level = if (data.isEmpty()) 0 else data.lastIndex
         var list = dataLevel
@@ -150,7 +150,7 @@ class DataLevelPickerDialog private constructor() : DialogFragment(), View.OnCli
                 }
             }
             R.id.btnConfirm -> {
-                onConfirm?.invoke(selectData.toMutableList())
+                onConfirm?.invoke(selectData.toMutableList() as MutableList<T>)
                 dismiss()
             }
             R.id.btnCancel -> {