YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2023-07-30 00:51:30 +08:00
parent a46674bac6
commit 92b863cad2
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/service/ExportBookService.kt
+6 -8
View File
@@ -92,8 +92,7 @@ class ExportBookService : BaseService() {
private val handler = buildMainHandler() private val handler = buildMainHandler()
private val waitExportBooks = linkedMapOf<String, ExportConfig>() private val waitExportBooks = linkedMapOf<String, ExportConfig>()
private var exportJob: Job? = null private var exportJob: Job? = null
private var notificationContentText = appCtx.getString(R.string.service_starting)
private var notificationContent = appCtx.getString(R.string.service_starting)
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
@@ -129,9 +128,8 @@ class ExportBookService : BaseService() {
override fun upNotification() { override fun upNotification() {
val notification = NotificationCompat.Builder(this, AppConst.channelIdDownload) val notification = NotificationCompat.Builder(this, AppConst.channelIdDownload)
.setSmallIcon(R.drawable.ic_export) .setSmallIcon(R.drawable.ic_export)
.setContentTitle(getString(R.string.export_book)) .setSubText(getString(R.string.export_book))
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setContentText(notificationContent)
.setGroup(groupKey) .setGroup(groupKey)
.setGroupSummary(true) .setGroupSummary(true)
startForeground(AppConst.notificationIdExport, notification.build()) startForeground(AppConst.notificationIdExport, notification.build())
@@ -140,10 +138,10 @@ class ExportBookService : BaseService() {
private fun upExportNotification() { private fun upExportNotification() {
val notification = NotificationCompat.Builder(this, AppConst.channelIdDownload) val notification = NotificationCompat.Builder(this, AppConst.channelIdDownload)
.setSmallIcon(R.drawable.ic_export) .setSmallIcon(R.drawable.ic_export)
.setContentTitle(getString(R.string.export_book)) .setSubText(getString(R.string.export_book))
.setContentIntent(activityPendingIntent<CacheActivity>("cacheActivity")) .setContentIntent(activityPendingIntent<CacheActivity>("cacheActivity"))
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setContentText(notificationContent) .setContentText(notificationContentText)
.setDeleteIntent(servicePendingIntent<ExportBookService>(IntentAction.stop)) .setDeleteIntent(servicePendingIntent<ExportBookService>(IntentAction.stop))
.setGroup(groupKey) .setGroup(groupKey)
if (exportJob?.isActive == true) { if (exportJob?.isActive == true) {
@@ -163,7 +161,7 @@ class ExportBookService : BaseService() {
} }
val entry = waitExportBooks.firstNotNullOfOrNull { it } val entry = waitExportBooks.firstNotNullOfOrNull { it }
if (entry == null) { if (entry == null) {
notificationContent = "导出完成" notificationContentText = "导出完成"
upExportNotification() upExportNotification()
return return
} }
@@ -176,7 +174,7 @@ class ExportBookService : BaseService() {
val book = appDb.bookDao.getBook(bookUrl) val book = appDb.bookDao.getBook(bookUrl)
try { try {
book ?: throw NoStackTraceException("获取${bookUrl}书籍出错") book ?: throw NoStackTraceException("获取${bookUrl}书籍出错")
notificationContent = getString( notificationContentText = getString(
R.string.export_book_notification_content, R.string.export_book_notification_content,
book.name, book.name,
waitExportBooks.size waitExportBooks.size