优化
This commit is contained in:
@@ -28,7 +28,6 @@ class SearchModel(private val scope: CoroutineScope, private val callBack: CallB
|
|||||||
private var tasks = CompositeCoroutine()
|
private var tasks = CompositeCoroutine()
|
||||||
private var bookSourceList = arrayListOf<BookSource>()
|
private var bookSourceList = arrayListOf<BookSource>()
|
||||||
private var searchBooks = arrayListOf<SearchBook>()
|
private var searchBooks = arrayListOf<SearchBook>()
|
||||||
private val emptyBookSource = BookSource()
|
|
||||||
|
|
||||||
@Volatile
|
@Volatile
|
||||||
private var searchIndex = -1
|
private var searchIndex = -1
|
||||||
@@ -77,7 +76,6 @@ class SearchModel(private val scope: CoroutineScope, private val callBack: CallB
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
searchIndex++
|
searchIndex++
|
||||||
val searchIndex = searchIndex
|
|
||||||
val source = bookSourceList[searchIndex]
|
val source = bookSourceList[searchIndex]
|
||||||
val searchPool = searchPool ?: return
|
val searchPool = searchPool ?: return
|
||||||
val task = WebBook.searchBook(
|
val task = WebBook.searchBook(
|
||||||
@@ -93,7 +91,7 @@ class SearchModel(private val scope: CoroutineScope, private val callBack: CallB
|
|||||||
onSuccess(searchId, it)
|
onSuccess(searchId, it)
|
||||||
}
|
}
|
||||||
.onFinally {
|
.onFinally {
|
||||||
onFinally(searchId, searchIndex)
|
onFinally(searchId)
|
||||||
}
|
}
|
||||||
tasks.add(task)
|
tasks.add(task)
|
||||||
}
|
}
|
||||||
@@ -109,15 +107,12 @@ class SearchModel(private val scope: CoroutineScope, private val callBack: CallB
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Synchronized
|
@Synchronized
|
||||||
private fun onFinally(searchId: Long, index: Int) {
|
private fun onFinally(searchId: Long) {
|
||||||
if (searchIndex < bookSourceList.lastIndex) {
|
if (searchIndex < bookSourceList.lastIndex) {
|
||||||
search(searchId)
|
search(searchId)
|
||||||
} else {
|
} else {
|
||||||
searchIndex++
|
searchIndex++
|
||||||
}
|
}
|
||||||
if (index <= bookSourceList.lastIndex) {
|
|
||||||
bookSourceList[index] = emptyBookSource
|
|
||||||
}
|
|
||||||
if (searchIndex >= bookSourceList.lastIndex
|
if (searchIndex >= bookSourceList.lastIndex
|
||||||
+ min(bookSourceList.size, threadCount)
|
+ min(bookSourceList.size, threadCount)
|
||||||
) {
|
) {
|
||||||
|
|||||||
Reference in New Issue
Block a user