kunfei 4 лет назад
Родитель
Сommit
194e964152

+ 2 - 2
app/src/main/assets/defaultData/directLinkUpload.json

@@ -1,5 +1,5 @@
 {
-  "UploadUrl": "http://sy.miaogongzi.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",
+  "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.mgz6.cc/shuyuan/' + result",
   "summary": "有效期2天"
 }

+ 21 - 19
app/src/main/java/io/legado/app/service/BaseReadAloudService.kt

@@ -92,24 +92,22 @@ abstract class BaseReadAloudService : BaseService(),
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        intent?.action?.let { action ->
-            when (action) {
-                IntentAction.play -> {
-                    textChapter = ReadBook.curTextChapter
-                    pageIndex = ReadBook.durPageIndex()
-                    newReadAloud(
-                        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()
+        when (intent?.action) {
+            IntentAction.play -> {
+                textChapter = ReadBook.curTextChapter
+                pageIndex = ReadBook.durPageIndex()
+                newReadAloud(
+                    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()
         }
         return super.onStartCommand(intent, flags, startId)
     }
@@ -158,8 +156,12 @@ abstract class BaseReadAloudService : BaseService(),
     @CallSuper
     open fun resumeReadAloud() {
         pause = false
-        upMediaSessionPlaybackState(PlaybackStateCompat.STATE_PLAYING)
-        postEvent(EventBus.ALOUD_STATE, Status.PLAY)
+        if (contentList.isEmpty()) {
+            ReadBook.readAloud()
+        } else {
+            upMediaSessionPlaybackState(PlaybackStateCompat.STATE_PLAYING)
+            postEvent(EventBus.ALOUD_STATE, Status.PLAY)
+        }
     }
 
     abstract fun upSpeechRate(reset: Boolean = false)