优化

app/src/main/java/io/legado/app/service/ExportBookService.kt

@@ -93,7 +93,6 @@ class ExportBookService : BaseService() {
     )
 
     private val groupKey = "${appCtx.packageName}.exportBook"
-    private val handler = buildMainHandler()
     private val waitExportBooks = linkedMapOf<String, ExportConfig>()
     private var exportJob: Job? = null
     private var notificationContentText = appCtx.getString(R.string.service_starting)
@@ -111,6 +110,8 @@ class ExportBookService : BaseService() {
                         epubScope = intent.getStringExtra("epubScope")
                     )
                     waitExportBooks[bookUrl] = exportConfig
+                    exportMsg[bookUrl] = getString(R.string.export_wait)
+                    postEvent(EventBus.EXPORT_BOOK, bookUrl)
                     export()
                 }
             }.onFailure {
@@ -163,18 +164,15 @@ class ExportBookService : BaseService() {
         if (exportJob?.isActive == true) {
             return
         }
-        val entry = waitExportBooks.firstNotNullOfOrNull { it }
+        exportJob = lifecycleScope.launch(IO) {
-        if (entry == null) {
+            while (true) {
+                val (bookUrl, exportConfig) = waitExportBooks.entries.firstOrNull() ?: let {
                     notificationContentText = "导出完成"
                     upExportNotification()
-            return
+                    return@launch
                 }
-        val bookUrl = entry.key
-        val exportConfig = entry.value
-        if (exportProgress.contains(bookUrl)) return
                 exportProgress[bookUrl] = 0
                 waitExportBooks.remove(bookUrl)
-        exportJob = lifecycleScope.launch(IO) {
                 val book = appDb.bookDao.getBook(bookUrl)
                 try {
                     book ?: throw NoStackTraceException("获取${bookUrl}书籍出错")
@@ -188,8 +186,10 @@ class ExportBookService : BaseService() {
                         if (exportConfig.epubScope.isNullOrBlank()) {
                             exportEPUB(exportConfig.path, book)
                         } else {
-                        CustomExporter(paresScope(exportConfig.epubScope), exportConfig.epubSize)
+                            CustomExporter(
-                            .export(exportConfig.path, book)
+                                paresScope(exportConfig.epubScope),
+                                exportConfig.epubSize
+                            ).export(exportConfig.path, book)
                         }
                     } else {
                         export(exportConfig.path, book)
@@ -202,8 +202,6 @@ class ExportBookService : BaseService() {
                     exportProgress.remove(bookUrl)
                     postEvent(EventBus.EXPORT_BOOK, bookUrl)
                 }
-            handler.post {
-                export()
             }
         }
     }

app/src/main/res/values-es-rES/strings.xml

@@ -1127,4 +1127,5 @@
     <string name="export_md">导出(MD)</string>
     <string name="change_source_delay">换源间隔</string>
     <string name="open_book_info_by_click_title">点击书名打开详情</string>
+    <string name="export_wait">等待导出</string>
 </resources>

app/src/main/res/values-ja-rJP/strings.xml

@@ -1130,4 +1130,5 @@
     <string name="export_md">导出(MD)</string>
     <string name="change_source_delay">换源间隔</string>
     <string name="open_book_info_by_click_title">点击书名打开详情</string>
+    <string name="export_wait">等待导出</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -1130,4 +1130,5 @@
     <string name="export_md">导出(MD)</string>
     <string name="change_source_delay">换源间隔</string>
     <string name="open_book_info_by_click_title">点击书名打开详情</string>
+    <string name="export_wait">等待导出</string>
 </resources>

app/src/main/res/values-vi/strings.xml

@@ -1126,4 +1126,5 @@ Còn </string>
     <string name="export_md">导出(MD)</string>
     <string name="change_source_delay">换源间隔</string>
     <string name="open_book_info_by_click_title">点击书名打开详情</string>
+    <string name="export_wait">等待导出</string>
 </resources>

app/src/main/res/values-zh-rHK/strings.xml

@@ -1127,4 +1127,5 @@
     <string name="export_md">导出(MD)</string>
     <string name="change_source_delay">换源间隔</string>
     <string name="open_book_info_by_click_title">点击书名打开详情</string>
+    <string name="export_wait">等待导出</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -1129,4 +1129,5 @@
     <string name="export_md">导出(MD)</string>
     <string name="change_source_delay">换源间隔</string>
     <string name="open_book_info_by_click_title">点击书名打开详情</string>
+    <string name="export_wait">等待导出</string>
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -1129,4 +1129,5 @@
     <string name="export_md">导出(MD)</string>
     <string name="change_source_delay">换源间隔</string>
     <string name="open_book_info_by_click_title">点击书名打开详情</string>
+    <string name="export_wait">等待导出</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -1130,4 +1130,5 @@
     <string name="export_md">导出(MD)</string>
     <string name="change_source_delay">换源间隔</string>
     <string name="open_book_info_by_click_title">点击书名打开详情</string>
+    <string name="export_wait">等待导出</string>
 </resources>