优化
This commit is contained in:
@@ -276,7 +276,8 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
|
|||||||
appDb.bookSourceDao.flowSearch(searchKey)
|
appDb.bookSourceDao.flowSearch(searchKey)
|
||||||
}
|
}
|
||||||
}.conflate().map { data ->
|
}.conflate().map { data ->
|
||||||
if (sortAscending) when (sort) {
|
if (sortAscending) {
|
||||||
|
when (sort) {
|
||||||
Sort.Weight -> data.sortedBy { it.weight }
|
Sort.Weight -> data.sortedBy { it.weight }
|
||||||
Sort.Name -> data.sortedWith { o1, o2 ->
|
Sort.Name -> data.sortedWith { o1, o2 ->
|
||||||
o1.bookSourceName.cnCompare(o2.bookSourceName)
|
o1.bookSourceName.cnCompare(o2.bookSourceName)
|
||||||
@@ -295,7 +296,8 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
|
|||||||
|
|
||||||
else -> data
|
else -> data
|
||||||
}
|
}
|
||||||
else when (sort) {
|
} else {
|
||||||
|
when (sort) {
|
||||||
Sort.Weight -> data.sortedByDescending { it.weight }
|
Sort.Weight -> data.sortedByDescending { it.weight }
|
||||||
Sort.Name -> data.sortedWith { o1, o2 ->
|
Sort.Name -> data.sortedWith { o1, o2 ->
|
||||||
o2.bookSourceName.cnCompare(o1.bookSourceName)
|
o2.bookSourceName.cnCompare(o1.bookSourceName)
|
||||||
@@ -314,6 +316,7 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
|
|||||||
|
|
||||||
else -> data.reversed()
|
else -> data.reversed()
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}.catch {
|
}.catch {
|
||||||
AppLog.put("书源界面更新书源出错", it)
|
AppLog.put("书源界面更新书源出错", it)
|
||||||
}.conflate().collect { data ->
|
}.conflate().collect { data ->
|
||||||
@@ -653,11 +656,19 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun toTop(bookSource: BookSourcePart) {
|
override fun toTop(bookSource: BookSourcePart) {
|
||||||
|
if (sortAscending) {
|
||||||
viewModel.topSource(bookSource)
|
viewModel.topSource(bookSource)
|
||||||
|
} else {
|
||||||
|
viewModel.bottomSource(bookSource)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun toBottom(bookSource: BookSourcePart) {
|
override fun toBottom(bookSource: BookSourcePart) {
|
||||||
|
if (sortAscending) {
|
||||||
viewModel.bottomSource(bookSource)
|
viewModel.bottomSource(bookSource)
|
||||||
|
} else {
|
||||||
|
viewModel.topSource(bookSource)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun searchBook(bookSource: BookSourcePart) {
|
override fun searchBook(bookSource: BookSourcePart) {
|
||||||
|
|||||||
Reference in New Issue
Block a user