mirror of
https://github.com/gedoor/legado.git
synced 2024-07-04 23:36:56 +08:00
优化
This commit is contained in:
parent
065ac7e119
commit
df512234e6
|
@ -3,7 +3,6 @@ package io.legado.app.model
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.core.content.ContextCompat
|
|
||||||
import io.legado.app.constant.AppLog
|
import io.legado.app.constant.AppLog
|
||||||
import io.legado.app.constant.EventBus
|
import io.legado.app.constant.EventBus
|
||||||
import io.legado.app.constant.IntentAction
|
import io.legado.app.constant.IntentAction
|
||||||
|
@ -16,6 +15,7 @@ import io.legado.app.service.TTSReadAloudService
|
||||||
import io.legado.app.utils.LogUtils
|
import io.legado.app.utils.LogUtils
|
||||||
import io.legado.app.utils.StringUtils
|
import io.legado.app.utils.StringUtils
|
||||||
import io.legado.app.utils.postEvent
|
import io.legado.app.utils.postEvent
|
||||||
|
import io.legado.app.utils.startForegroundServiceCompat
|
||||||
import io.legado.app.utils.toastOnUi
|
import io.legado.app.utils.toastOnUi
|
||||||
import splitties.init.appCtx
|
import splitties.init.appCtx
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ object ReadAloud {
|
||||||
intent.putExtra("startPos", startPos)
|
intent.putExtra("startPos", startPos)
|
||||||
LogUtils.d("ReadAloud", intent.toString())
|
LogUtils.d("ReadAloud", intent.toString())
|
||||||
try {
|
try {
|
||||||
ContextCompat.startForegroundService(context, intent)
|
context.startForegroundServiceCompat(intent)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
val msg = "启动朗读服务出错\n${e.localizedMessage}"
|
val msg = "启动朗读服务出错\n${e.localizedMessage}"
|
||||||
AppLog.put(msg, e)
|
AppLog.put(msg, e)
|
||||||
|
@ -81,7 +81,7 @@ object ReadAloud {
|
||||||
if (BaseReadAloudService.isRun) {
|
if (BaseReadAloudService.isRun) {
|
||||||
val intent = Intent(context, aloudClass)
|
val intent = Intent(context, aloudClass)
|
||||||
intent.action = IntentAction.pause
|
intent.action = IntentAction.pause
|
||||||
ContextCompat.startForegroundService(context, intent)
|
context.startForegroundServiceCompat(intent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,7 +89,7 @@ object ReadAloud {
|
||||||
if (BaseReadAloudService.isRun) {
|
if (BaseReadAloudService.isRun) {
|
||||||
val intent = Intent(context, aloudClass)
|
val intent = Intent(context, aloudClass)
|
||||||
intent.action = IntentAction.resume
|
intent.action = IntentAction.resume
|
||||||
ContextCompat.startForegroundService(context, intent)
|
context.startForegroundServiceCompat(intent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -97,7 +97,7 @@ object ReadAloud {
|
||||||
if (BaseReadAloudService.isRun) {
|
if (BaseReadAloudService.isRun) {
|
||||||
val intent = Intent(context, aloudClass)
|
val intent = Intent(context, aloudClass)
|
||||||
intent.action = IntentAction.stop
|
intent.action = IntentAction.stop
|
||||||
ContextCompat.startForegroundService(context, intent)
|
context.startForegroundServiceCompat(intent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,7 +105,7 @@ object ReadAloud {
|
||||||
if (BaseReadAloudService.isRun) {
|
if (BaseReadAloudService.isRun) {
|
||||||
val intent = Intent(context, aloudClass)
|
val intent = Intent(context, aloudClass)
|
||||||
intent.action = IntentAction.prevParagraph
|
intent.action = IntentAction.prevParagraph
|
||||||
ContextCompat.startForegroundService(context, intent)
|
context.startForegroundServiceCompat(intent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -113,7 +113,7 @@ object ReadAloud {
|
||||||
if (BaseReadAloudService.isRun) {
|
if (BaseReadAloudService.isRun) {
|
||||||
val intent = Intent(context, aloudClass)
|
val intent = Intent(context, aloudClass)
|
||||||
intent.action = IntentAction.nextParagraph
|
intent.action = IntentAction.nextParagraph
|
||||||
ContextCompat.startForegroundService(context, intent)
|
context.startForegroundServiceCompat(intent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -121,7 +121,7 @@ object ReadAloud {
|
||||||
if (BaseReadAloudService.isRun) {
|
if (BaseReadAloudService.isRun) {
|
||||||
val intent = Intent(context, aloudClass)
|
val intent = Intent(context, aloudClass)
|
||||||
intent.action = IntentAction.upTtsSpeechRate
|
intent.action = IntentAction.upTtsSpeechRate
|
||||||
ContextCompat.startForegroundService(context, intent)
|
context.startForegroundServiceCompat(intent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ object ReadAloud {
|
||||||
val intent = Intent(context, aloudClass)
|
val intent = Intent(context, aloudClass)
|
||||||
intent.action = IntentAction.setTimer
|
intent.action = IntentAction.setTimer
|
||||||
intent.putExtra("minute", minute)
|
intent.putExtra("minute", minute)
|
||||||
ContextCompat.startForegroundService(context, intent)
|
context.startForegroundServiceCompat(intent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -123,6 +123,14 @@ inline fun <reified T : BroadcastReceiver> Context.broadcastPendingIntent(
|
||||||
return getBroadcast(this, 0, intent, flags)
|
return getBroadcast(this, 0, intent, flags)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun Context.startForegroundServiceCompat(intent: Intent) {
|
||||||
|
try {
|
||||||
|
startService(intent)
|
||||||
|
} catch (e: IllegalStateException) {
|
||||||
|
ContextCompat.startForegroundService(this, intent)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
val Context.defaultSharedPreferences: SharedPreferences
|
val Context.defaultSharedPreferences: SharedPreferences
|
||||||
get() = PreferenceManager.getDefaultSharedPreferences(this)
|
get() = PreferenceManager.getDefaultSharedPreferences(this)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user