pull/83/head
kunfei 5 years ago
parent 0aafde21e4
commit bee2a59594
  1. 14
      app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt

@ -14,6 +14,10 @@ import io.legado.app.base.VMBaseActivity
import io.legado.app.help.AppConfig import io.legado.app.help.AppConfig
import io.legado.app.utils.getViewModel import io.legado.app.utils.getViewModel
import kotlinx.android.synthetic.main.activity_import_book.* import kotlinx.android.synthetic.main.activity_import_book.*
import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Dispatchers.Main
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.jetbrains.anko.sdk27.listeners.onClick import org.jetbrains.anko.sdk27.listeners.onClick
import java.io.File import java.io.File
@ -79,12 +83,13 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
private fun upPath() { private fun upPath() {
rootDoc?.let { rootDoc -> rootDoc?.let { rootDoc ->
tv_path.text = rootDoc.name.toString() + File.separator launch(IO) {
var path = rootDoc.name.toString() + File.separator
var doc: DocumentFile? = rootDoc var doc: DocumentFile? = rootDoc
for (dirName in subDirs) { for (dirName in subDirs) {
doc = doc?.findFile(dirName) doc = doc?.findFile(dirName)
doc?.let { doc?.let {
tv_path.text = tv_path.text.toString() + it.name + File.separator path = path + it.name + File.separator
} }
} }
val docList = arrayListOf<DocumentFile>() val docList = arrayListOf<DocumentFile>()
@ -93,9 +98,14 @@ class ImportBookActivity : VMBaseActivity<ImportBookViewModel>(R.layout.activity
docList.add(it) docList.add(it)
} }
} }
docList.sortWith(compareBy({ !it.isDirectory }, { it.name }))
withContext(Main) {
tv_path.text = path
importBookAdapter.setItems(docList) importBookAdapter.setItems(docList)
} }
} }
}
}
private fun selectImportFolder() { private fun selectImportFolder() {
try { try {

Loading…
Cancel
Save