pull/1551/head
kunfei 3 years ago
parent 0d1efeb529
commit 2c70845c06
  1. 4
      app/src/main/assets/defaultData/directLinkUpload.json
  2. 40
      app/src/main/java/io/legado/app/service/BaseReadAloudService.kt

@ -1,5 +1,5 @@
{ {
"UploadUrl": "http://sy.miaogongzi.cc/shuyuan,{\"method\":\"POST\",\"body\": {\"file\": \"fileRequest\"},\"type\": \"multipart/form-data\"}", "UploadUrl": "http://sy.mgz6.cc/shuyuan,{\"method\":\"POST\",\"body\": {\"file\": \"fileRequest\"},\"type\": \"multipart/form-data\"}",
"DownloadUrlRule": "$.data@js:if (result == '') \n '' \n else \n 'https://shuyuan.miaogongzi.cc/shuyuan/' + result", "DownloadUrlRule": "$.data@js:if (result == '') \n '' \n else \n 'https://shuyuan.mgz6.cc/shuyuan/' + result",
"summary": "有效期2天" "summary": "有效期2天"
} }

@ -92,24 +92,22 @@ abstract class BaseReadAloudService : BaseService(),
} }
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
intent?.action?.let { action -> when (intent?.action) {
when (action) { IntentAction.play -> {
IntentAction.play -> { textChapter = ReadBook.curTextChapter
textChapter = ReadBook.curTextChapter pageIndex = ReadBook.durPageIndex()
pageIndex = ReadBook.durPageIndex() newReadAloud(
newReadAloud( intent.getBooleanExtra("play", true)
intent.getBooleanExtra("play", true) )
)
}
IntentAction.pause -> pauseReadAloud(true)
IntentAction.resume -> resumeReadAloud()
IntentAction.upTtsSpeechRate -> upSpeechRate(true)
IntentAction.prevParagraph -> prevP()
IntentAction.nextParagraph -> nextP()
IntentAction.addTimer -> addTimer()
IntentAction.setTimer -> setTimer(intent.getIntExtra("minute", 0))
else -> stopSelf()
} }
IntentAction.pause -> pauseReadAloud(true)
IntentAction.resume -> resumeReadAloud()
IntentAction.upTtsSpeechRate -> upSpeechRate(true)
IntentAction.prevParagraph -> prevP()
IntentAction.nextParagraph -> nextP()
IntentAction.addTimer -> addTimer()
IntentAction.setTimer -> setTimer(intent.getIntExtra("minute", 0))
else -> stopSelf()
} }
return super.onStartCommand(intent, flags, startId) return super.onStartCommand(intent, flags, startId)
} }
@ -158,8 +156,12 @@ abstract class BaseReadAloudService : BaseService(),
@CallSuper @CallSuper
open fun resumeReadAloud() { open fun resumeReadAloud() {
pause = false pause = false
upMediaSessionPlaybackState(PlaybackStateCompat.STATE_PLAYING) if (contentList.isEmpty()) {
postEvent(EventBus.ALOUD_STATE, Status.PLAY) ReadBook.readAloud()
} else {
upMediaSessionPlaybackState(PlaybackStateCompat.STATE_PLAYING)
postEvent(EventBus.ALOUD_STATE, Status.PLAY)
}
} }
abstract fun upSpeechRate(reset: Boolean = false) abstract fun upSpeechRate(reset: Boolean = false)

Loading…
Cancel
Save