From e274d2c3e4832b8a524b1a8e9ea7dde311f538f2 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sun, 25 Aug 2019 11:50:15 +0800 Subject: [PATCH] up --- .../java/io/legado/app/help/IntentDataHelp.kt | 16 +++++ .../io/legado/app/service/ReadAloudService.kt | 59 +++++++++++-------- .../io/legado/app/utils/GsonExtensions.kt | 4 +- 3 files changed, 51 insertions(+), 28 deletions(-) create mode 100644 app/src/main/java/io/legado/app/help/IntentDataHelp.kt diff --git a/app/src/main/java/io/legado/app/help/IntentDataHelp.kt b/app/src/main/java/io/legado/app/help/IntentDataHelp.kt new file mode 100644 index 000000000..4c1ca38d5 --- /dev/null +++ b/app/src/main/java/io/legado/app/help/IntentDataHelp.kt @@ -0,0 +1,16 @@ +package io.legado.app.help + +object IntentDataHelp { + + private val bigData: MutableMap = mutableMapOf() + + fun putData(key: String, data: Any) { + bigData[key] = data + } + + fun getData(key: String): Any? { + val data = bigData[key] + bigData.remove(key) + return data + } +} \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/service/ReadAloudService.kt b/app/src/main/java/io/legado/app/service/ReadAloudService.kt index a1e7ffd4e..5c757d3f0 100644 --- a/app/src/main/java/io/legado/app/service/ReadAloudService.kt +++ b/app/src/main/java/io/legado/app/service/ReadAloudService.kt @@ -13,10 +13,12 @@ import io.legado.app.R import io.legado.app.base.BaseService import io.legado.app.constant.Bus import io.legado.app.constant.Status +import io.legado.app.help.IntentDataHelp import io.legado.app.help.IntentHelp import io.legado.app.help.MediaHelp import io.legado.app.receiver.MediaButtonReceiver import io.legado.app.service.notification.ReadAloudNotification +import io.legado.app.ui.widget.page.TextChapter import io.legado.app.utils.postEvent import io.legado.app.utils.toast import kotlinx.coroutines.launch @@ -28,13 +30,19 @@ class ReadAloudService : BaseService(), TextToSpeech.OnInitListener, AudioManage val tag: String = ReadAloudService::class.java.simpleName var isRun = false - fun play(context: Context, title: String, subtitle: String, readLength: Int, body: String) { + fun play( + context: Context, + title: String, + subtitle: String, + pageIndex: Int, + dataKey: String + ) { val readAloudIntent = Intent(context, ReadAloudService::class.java) readAloudIntent.action = "play" readAloudIntent.putExtra("title", title) readAloudIntent.putExtra("subtitle", subtitle) - readAloudIntent.putExtra("readLength", readLength) - readAloudIntent.putExtra("body", body) + readAloudIntent.putExtra("pageIndex", pageIndex) + readAloudIntent.putExtra("dataKey", dataKey) context.startService(readAloudIntent) } @@ -67,16 +75,18 @@ class ReadAloudService : BaseService(), TextToSpeech.OnInitListener, AudioManage private var ttsIsSuccess: Boolean = false private lateinit var audioManager: AudioManager private lateinit var mFocusRequest: AudioFocusRequest - var mediaSessionCompat: MediaSessionCompat? = null private var broadcastReceiver: BroadcastReceiver? = null private var speak: Boolean = true private var nowSpeak: Int = 0 private val contentList = arrayListOf() + private var readAloudNumber: Int = 0 + private var textChapter: TextChapter? = null + private var pageIndex = 0 + var mediaSessionCompat: MediaSessionCompat? = null var pause = false var title: String = "" var subtitle: String = "" var timeMinute: Int = 0 - private var readAloudNumber: Int = 0 override fun onCreate() { super.onCreate() @@ -104,18 +114,12 @@ class ReadAloudService : BaseService(), TextToSpeech.OnInitListener, AudioManage "play" -> { title = intent.getStringExtra("title") ?: "" subtitle = intent.getStringExtra("subtitle") ?: "" - readAloudNumber = intent.getIntExtra("readLength", 0) - newReadAloud(intent.getStringExtra("body")) - } - "pause" -> { - pauseReadAloud(true) - } - "resume" -> { - resumeReadAloud() - } - "stop" -> { - stopSelf() + pageIndex = intent.getIntExtra("pageIndex", 0) + newReadAloud(intent.getStringExtra("dataKey")) } + "pause" -> pauseReadAloud(true) + "resume" -> resumeReadAloud() + "stop" -> stopSelf() } } return super.onStartCommand(intent, flags, startId) @@ -139,15 +143,16 @@ class ReadAloudService : BaseService(), TextToSpeech.OnInitListener, AudioManage } } - private fun newReadAloud(body: String?) { - if (body.isNullOrEmpty()) { - stopSelf() - } else { - nowSpeak = 0 - readAloudNumber = 0 - contentList.clear() - contentList.addAll(body.split("\n")) - } + private fun newReadAloud(dataKey: String?) { + dataKey?.let { + textChapter = IntentDataHelp.getData(dataKey) as? TextChapter + textChapter?.let { + nowSpeak = 0 + readAloudNumber = it.getReadLength(pageIndex) + contentList.clear() + contentList.addAll(it.getUnRead(pageIndex).split("\n")) + } ?: stopSelf() + } ?: stopSelf() } @Suppress("DEPRECATION") @@ -288,7 +293,9 @@ class ReadAloudService : BaseService(), TextToSpeech.OnInitListener, AudioManage } override fun onError(s: String) { - + launch { + toast(s) + } } } diff --git a/app/src/main/java/io/legado/app/utils/GsonExtensions.kt b/app/src/main/java/io/legado/app/utils/GsonExtensions.kt index 1f3627873..d81ef7ac6 100644 --- a/app/src/main/java/io/legado/app/utils/GsonExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/GsonExtensions.kt @@ -30,10 +30,10 @@ inline fun Gson.fromJsonArray(json: String?): List? { }.value } -class ParameterizedTypeImpl(val clz: Class<*>) : ParameterizedType { +class ParameterizedTypeImpl(private val clazz: Class<*>) : ParameterizedType { override fun getRawType(): Type = List::class.java override fun getOwnerType(): Type? = null - override fun getActualTypeArguments(): Array = arrayOf(clz) + override fun getActualTypeArguments(): Array = arrayOf(clazz) }