优化
This commit is contained in:
@@ -14,7 +14,6 @@ import android.os.Bundle
|
|||||||
import android.os.PowerManager
|
import android.os.PowerManager
|
||||||
import android.support.v4.media.session.MediaSessionCompat
|
import android.support.v4.media.session.MediaSessionCompat
|
||||||
import android.support.v4.media.session.PlaybackStateCompat
|
import android.support.v4.media.session.PlaybackStateCompat
|
||||||
import android.util.Log
|
|
||||||
import androidx.annotation.CallSuper
|
import androidx.annotation.CallSuper
|
||||||
import androidx.core.app.NotificationCompat
|
import androidx.core.app.NotificationCompat
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
@@ -40,6 +39,7 @@ import io.legado.app.ui.book.read.page.entities.TextChapter
|
|||||||
import io.legado.app.utils.activityPendingIntent
|
import io.legado.app.utils.activityPendingIntent
|
||||||
import io.legado.app.utils.broadcastPendingIntent
|
import io.legado.app.utils.broadcastPendingIntent
|
||||||
import io.legado.app.utils.getPrefBoolean
|
import io.legado.app.utils.getPrefBoolean
|
||||||
|
import io.legado.app.utils.isVivoDevice
|
||||||
import io.legado.app.utils.observeEvent
|
import io.legado.app.utils.observeEvent
|
||||||
import io.legado.app.utils.postEvent
|
import io.legado.app.utils.postEvent
|
||||||
import io.legado.app.utils.toastOnUi
|
import io.legado.app.utils.toastOnUi
|
||||||
@@ -483,22 +483,14 @@ abstract class BaseReadAloudService : BaseService(),
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val isVivoDevice: Boolean by lazy {
|
private fun choiceMediaStyle(): androidx.media.app.NotificationCompat.MediaStyle {
|
||||||
android.os.Build.MANUFACTURER.equals(
|
val mediaStyle = androidx.media.app.NotificationCompat.MediaStyle()
|
||||||
"vivo",
|
|
||||||
ignoreCase = true
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun ChoiceMediaStyle(): androidx.media.app.NotificationCompat.MediaStyle {
|
|
||||||
//Log.d(TAG, "isVivoDevice=$isVivoDevice")
|
|
||||||
val type = androidx.media.app.NotificationCompat.MediaStyle()
|
|
||||||
.setShowActionsInCompactView(0, 1, 2)
|
.setShowActionsInCompactView(0, 1, 2)
|
||||||
if (isVivoDevice) {
|
if (isVivoDevice) {
|
||||||
//fix #4090 android 14 can not show play control in lock screen
|
//fix #4090 android 14 can not show play control in lock screen
|
||||||
type.setMediaSession(mediaSessionCompat.sessionToken)
|
mediaStyle.setMediaSession(mediaSessionCompat.sessionToken)
|
||||||
}
|
}
|
||||||
return type
|
return mediaStyle
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun createNotification(): NotificationCompat.Builder {
|
private fun createNotification(): NotificationCompat.Builder {
|
||||||
@@ -556,7 +548,7 @@ abstract class BaseReadAloudService : BaseService(),
|
|||||||
getString(R.string.set_timer),
|
getString(R.string.set_timer),
|
||||||
aloudServicePendingIntent(IntentAction.addTimer)
|
aloudServicePendingIntent(IntentAction.addTimer)
|
||||||
)
|
)
|
||||||
builder.setStyle(ChoiceMediaStyle())
|
builder.setStyle(choiceMediaStyle())
|
||||||
return builder
|
return builder
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package io.legado.app.utils
|
||||||
|
|
||||||
|
import android.os.Build
|
||||||
|
|
||||||
|
val isVivoDevice by lazy {
|
||||||
|
Build.MANUFACTURER.equals("vivo", ignoreCase = true)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user