Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
S
Scan QR Code Barcode Reader
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wanglei
Scan QR Code Barcode Reader
Commits
be80a446
Commit
be80a446
authored
Dec 31, 2024
by
wanglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
...
parent
bfa952e7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
HistoryFragment.kt
app/src/main/java/com/base/scanqr/ui/main/HistoryFragment.kt
+3
-5
CollectionEx.kt
app/src/main/java/com/base/scanqr/utils/CollectionEx.kt
+14
-0
No files found.
app/src/main/java/com/base/scanqr/ui/main/HistoryFragment.kt
View file @
be80a446
...
...
@@ -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.wifi.WifiCodeActivity
import
com.base.scanqr.utils.BarUtils
import
com.base.scanqr.utils.CollectionEx.addStepElements
import
com.base.scanqr.utils.LogEx
import
com.google.gson.Gson
import
com.gyf.immersionbar.ktx.immersionBar
...
...
@@ -167,11 +168,8 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
val
qrState
=
if
(
isCreateOrScan
)
0
else
1
val
createList
=
viewModel
.
historyList
.
filter
{
it
.
createType
==
qrState
}
binding
.
llEmpty
.
isVisible
=
createList
.
isEmpty
()
val
sortList
=
sortList
(
createList
).
toMutableList
()
if
(
sortList
.
size
>=
3
)
{
sortList
.
add
(
2
,
AdScanBean
())
}
adapter
?.
submitList
(
sortList
)
val
sortList
=
sortList
(
createList
)
adapter
?.
submitList
(
sortList
.
addStepElements
{
AdScanBean
()
})
}
if
(
viewModel
.
dataRefreshFinish
.
get
())
{
uiRefresh
.
invoke
()
...
...
app/src/main/java/com/base/scanqr/utils/CollectionEx.kt
0 → 100644
View file @
be80a446
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment