bug fixes for android auto
This commit is contained in:
+45
-4
@@ -5,6 +5,8 @@ import android.app.NotificationChannel
|
||||
import android.app.NotificationManager
|
||||
import android.content.ComponentName
|
||||
import android.content.Context
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.support.v4.media.MediaBrowserCompat
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
@@ -43,8 +45,10 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
|
||||
private lateinit var mediaSession: MediaSessionCompat
|
||||
private var audioServiceBrowser: MediaBrowserCompat? = null
|
||||
private var audioServiceController: MediaControllerCompat? = null
|
||||
private val mainHandler = Handler(Looper.getMainLooper())
|
||||
private var pendingPlayRequest: Boolean = false
|
||||
private var pendingStopRequest: Boolean = false
|
||||
private var reconnectScheduled: Boolean = false
|
||||
|
||||
private val mediaControllerCallback = object : MediaControllerCompat.Callback() {
|
||||
override fun onPlaybackStateChanged(state: PlaybackStateCompat?) {
|
||||
@@ -75,12 +79,14 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
|
||||
|
||||
override fun onConnectionSuspended() {
|
||||
Log.w(TAG, "audio_service browser connection suspended")
|
||||
disconnectFromFlutterAudioService()
|
||||
handleControllerDisconnected()
|
||||
scheduleBrowserReconnect()
|
||||
}
|
||||
|
||||
override fun onConnectionFailed() {
|
||||
Log.e(TAG, "audio_service browser connection failed")
|
||||
disconnectFromFlutterAudioService()
|
||||
handleControllerDisconnected()
|
||||
scheduleBrowserReconnect()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -331,11 +337,24 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
|
||||
}
|
||||
|
||||
private fun connectToFlutterAudioService() {
|
||||
if (audioServiceController != null) {
|
||||
return
|
||||
}
|
||||
|
||||
val existing = audioServiceBrowser
|
||||
if (existing?.isConnected == true) {
|
||||
return
|
||||
}
|
||||
|
||||
if (existing != null) {
|
||||
try {
|
||||
existing.connect()
|
||||
} catch (error: Exception) {
|
||||
Log.w(TAG, "Failed reconnect attempt: ${error.message}")
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
val browser = MediaBrowserCompat(
|
||||
this,
|
||||
ComponentName(this, AudioService::class.java),
|
||||
@@ -348,8 +367,10 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
|
||||
}
|
||||
|
||||
private fun disconnectFromFlutterAudioService() {
|
||||
audioServiceController?.unregisterCallback(mediaControllerCallback)
|
||||
audioServiceController = null
|
||||
reconnectScheduled = false
|
||||
mainHandler.removeCallbacksAndMessages(null)
|
||||
|
||||
handleControllerDisconnected()
|
||||
|
||||
audioServiceBrowser?.let { browser ->
|
||||
if (browser.isConnected) {
|
||||
@@ -359,6 +380,26 @@ class KryzAutoMediaBrowserService : MediaBrowserServiceCompat() {
|
||||
audioServiceBrowser = null
|
||||
}
|
||||
|
||||
private fun handleControllerDisconnected() {
|
||||
audioServiceController?.unregisterCallback(mediaControllerCallback)
|
||||
audioServiceController = null
|
||||
}
|
||||
|
||||
private fun scheduleBrowserReconnect() {
|
||||
if (reconnectScheduled) {
|
||||
return
|
||||
}
|
||||
|
||||
reconnectScheduled = true
|
||||
mainHandler.postDelayed(
|
||||
{
|
||||
reconnectScheduled = false
|
||||
connectToFlutterAudioService()
|
||||
},
|
||||
1200,
|
||||
)
|
||||
}
|
||||
|
||||
private fun buildLiveStreamMetadata(): MediaMetadataCompat {
|
||||
val iconUri = Uri.parse("android.resource://${packageName}/mipmap/ic_launcher")
|
||||
return MediaMetadataCompat.Builder()
|
||||
|
||||
Reference in New Issue
Block a user