Commit be80a446 authored by wanglei's avatar wanglei

...

parent bfa952e7
...@@ -21,6 +21,7 @@ import com.base.scanqr.ui.widget.HistoryMoreDialog.showHistoryMoreDialog ...@@ -21,6 +21,7 @@ import com.base.scanqr.ui.widget.HistoryMoreDialog.showHistoryMoreDialog
import com.base.scanqr.ui.widget.SortByDialog.showSortByDialog import com.base.scanqr.ui.widget.SortByDialog.showSortByDialog
import com.base.scanqr.ui.wifi.WifiCodeActivity import com.base.scanqr.ui.wifi.WifiCodeActivity
import com.base.scanqr.utils.BarUtils import com.base.scanqr.utils.BarUtils
import com.base.scanqr.utils.CollectionEx.addStepElements
import com.base.scanqr.utils.LogEx import com.base.scanqr.utils.LogEx
import com.google.gson.Gson import com.google.gson.Gson
import com.gyf.immersionbar.ktx.immersionBar import com.gyf.immersionbar.ktx.immersionBar
...@@ -167,11 +168,8 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind ...@@ -167,11 +168,8 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
val qrState = if (isCreateOrScan) 0 else 1 val qrState = if (isCreateOrScan) 0 else 1
val createList = viewModel.historyList.filter { it.createType == qrState } val createList = viewModel.historyList.filter { it.createType == qrState }
binding.llEmpty.isVisible = createList.isEmpty() binding.llEmpty.isVisible = createList.isEmpty()
val sortList = sortList(createList).toMutableList() val sortList = sortList(createList)
if (sortList.size >= 3) { adapter?.submitList(sortList.addStepElements { AdScanBean() })
sortList.add(2, AdScanBean())
}
adapter?.submitList(sortList)
} }
if (viewModel.dataRefreshFinish.get()) { if (viewModel.dataRefreshFinish.get()) {
uiRefresh.invoke() uiRefresh.invoke()
......
package com.base.scanqr.utils
object CollectionEx {
fun <T> List<T>.addStepElements(beanStep: Int = 3, newElement: () -> T): MutableList<T> {
val chunkedList = this.chunked(beanStep)
val newList = mutableListOf<T>()
chunkedList.forEach {
newList.addAll(it)
newList.add(newElement())
}
return newList
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment