daast add suppor

Author: LikhanovD

app/src/main/java/ru/vvdev/radiolibrary/TestService.kt

@@ -2,9 +2,11 @@ package ru.vvdev.radiolibrary
 
 import android.os.Handler
 import android.os.Looper
+import android.util.Log
 import com.google.gson.Gson
 import com.likhanov.radioplayer.model.NotificationData
 import com.likhanov.radioplayer.radio.RadioService
+import com.likhanov.radioplayer.radio.RadioServiceCallback
 import io.socket.client.IO
 import io.socket.client.Socket
 import org.json.JSONArray
@@ -21,9 +23,23 @@ class TestService : RadioService() {
         super.onCreate()
         init(this, TestService::class.java)
         updateUrl("http://icecast-studio21.cdnvideo.ru/S21_1")
+        setAd("http://a.adwolf.ru/3145/getCode?pp=bl&ps=cmi&p2=jf&plp=f&pli=b&pop=k&dl=http://www.newradio.ru/")
         setSessionActivity(MainActivity::class.java)
         setActivityForNotificationIntent(MainActivity::class.java)
         initSockets()
+        setCallback(object : RadioServiceCallback{
+            override fun onDaastStart(image: String, link: String) {
+                Log.d("DaastTag", "onDaastStart, image = $image, link = $link")
+            }
+
+            override fun onDaastEnd() {
+                Log.d("DaastTag", "onDaastEnd")
+            }
+
+            override fun onDaastError() {
+                Log.d("DaastTag", "onDaastError")
+            }
+        })
     }
 
     override fun onDestroy() {

radioplayer/src/main/java/com/likhanov/radioplayer/playback/Playback.java

@@ -76,6 +76,10 @@ interface Callback {
          * @param error to be added to the PlaybackState
          */
         void onError(String error);
+
+        void onDaastStart(String image, String link);
+        void onDaastEnd();
+        void onDaastError();
     }
 
     void setCallback(Callback callback);

radioplayer/src/main/java/com/likhanov/radioplayer/playback/PlaybackManager.kt

@@ -144,6 +144,18 @@ class PlaybackManager(val playback: Playback, private val serviceCallback: Playb
         updatePlaybackState(error)
     }
 
+    override fun onDaastStart(image: String?, link: String?) {
+        serviceCallback.onDaastStart(image ?: "", link ?: "")
+    }
+
+    override fun onDaastEnd() {
+        serviceCallback.onDaastEnd()
+    }
+
+    override fun onDaastError() {
+        serviceCallback.onDaastError()
+    }
+
     interface PlaybackServiceCallback {
         fun onPlaybackStart()
 
@@ -154,5 +166,9 @@ class PlaybackManager(val playback: Playback, private val serviceCallback: Playb
         fun onPlaybackStateUpdated(state: PlaybackStateCompat)
 
         fun onPlaybackMetadataUpdated(metadata: MediaMetadataCompat)
+
+        fun onDaastStart(image: String, link: String)
+        fun onDaastEnd()
+        fun onDaastError()
     }
 }

radioplayer/src/main/java/com/likhanov/radioplayer/playback/Player.kt

@@ -48,6 +48,8 @@ class Player(private var url: String = "", private val listener: RadioPlayerCall
         mPlayback.setDaastUrl(adUrl)
     }
 
+    fun daastClicked() = mPlayback.daastClicked()
+
     fun updateUrl(url: String, masterStream: Boolean = false) {
         this.url = url
         this.masterStream = masterStream

radioplayer/src/main/java/com/likhanov/radioplayer/playback/RadioPlayback.kt

@@ -1,6 +1,7 @@
 package com.likhanov.radioplayer.playback
 
 import android.support.v4.media.session.PlaybackStateCompat
+import android.util.Log
 
 class RadioPlayback(url: String) : Playback {
 
@@ -10,8 +11,14 @@ class RadioPlayback(url: String) : Playback {
 
     private val playerCallback: RadioPlayerCallback = object : RadioPlayerCallback() {
 
-        override fun onDaastSkip() {
+        override fun onDaastError() {
+            callback?.onDaastError()
+        }
 
+        override fun onMeta(p0: String?) {
+        }
+
+        override fun onDaastSkip() {
         }
 
         override fun onPlay() {
@@ -22,6 +29,14 @@ class RadioPlayback(url: String) : Playback {
             callback?.onPlaybackStatusChanged(PlaybackStateCompat.STATE_PAUSED)
         }
 
+        override fun onDaastStart(p0: String?, p1: String?, p2: String?) {
+            callback?.onDaastStart(p1, p2)
+        }
+
+        override fun onDaastEnd() {
+            callback?.onDaastEnd()
+        }
+
         override fun onError(p0: String?, p1: Int) {
             callback?.onError("Player error $p0, $p1")
             releaseResources()
@@ -73,6 +88,8 @@ class RadioPlayback(url: String) : Playback {
 
     fun setAd(url: String) = player.setAd(url)
 
+    fun daastClicked() = player.daastClicked()
+
     override fun seekTo(position: Long) {
 
     }

radioplayer/src/main/java/com/likhanov/radioplayer/radio/RadioService.kt

@@ -1,7 +1,6 @@
 package com.likhanov.radioplayer.radio
 
 import android.app.PendingIntent
-import android.app.Service
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -12,7 +11,6 @@ import android.media.AudioManager
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
-import android.os.Message
 import android.support.v4.content.ContextCompat
 import android.support.v4.media.MediaBrowserCompat
 import android.support.v4.media.MediaBrowserServiceCompat
@@ -27,11 +25,10 @@ import com.likhanov.radioplayer.playback.PlaybackManager
 import com.likhanov.radioplayer.playback.RadioPlayback
 import com.likhanov.radioplayer.util.Store
 import io.reactivex.disposables.CompositeDisposable
-import java.lang.ref.WeakReference
 
 
 open class RadioService : MediaBrowserServiceCompat(), PlaybackManager.PlaybackServiceCallback,
-    AudioManager.OnAudioFocusChangeListener, RadioServiceCallback {
+    AudioManager.OnAudioFocusChangeListener, RadioServiceListener {
 
     init {
         System.loadLibrary("startrek_player")
@@ -54,6 +51,7 @@ open class RadioService : MediaBrowserServiceCompat(), PlaybackManager.PlaybackS
     private var lastData: NotificationData? = null
     private lateinit var service: MediaBrowserServiceCompat
     private lateinit var serviceClass: Class<*>
+    private var radioServiceCallback: RadioServiceCallback? = null
 
     companion object {
         const val MEDIA_ID_ROOT = "__ROOT__"
@@ -124,6 +122,10 @@ open class RadioService : MediaBrowserServiceCompat(), PlaybackManager.PlaybackS
         disposable.dispose()
     }
 
+    override fun setCallback(callback: RadioServiceCallback) {
+        this.radioServiceCallback = callback
+    }
+
     override fun isPlaying() = playback.playing()
 
     override fun isPaused() = playback.isPaused()
@@ -134,6 +136,8 @@ open class RadioService : MediaBrowserServiceCompat(), PlaybackManager.PlaybackS
 
     override fun setAd(url: String) = playback.setAd(url)
 
+    override fun daastClicked() = playback.daastClicked()
+
     override fun setSessionActivity(activity: Class<*>) {
         val intent = Intent(applicationContext, activity)
         val pendingIntent = PendingIntent.getActivity(applicationContext, 99, intent, PendingIntent.FLAG_UPDATE_CURRENT)
@@ -196,6 +200,18 @@ open class RadioService : MediaBrowserServiceCompat(), PlaybackManager.PlaybackS
         session.setMetadata(metadata)
     }
 
+    override fun onDaastStart(image: String, link: String) {
+        radioServiceCallback?.onDaastStart(image, link)
+    }
+
+    override fun onDaastEnd() {
+        radioServiceCallback?.onDaastEnd()
+    }
+
+    override fun onDaastError() {
+        radioServiceCallback?.onDaastError()
+    }
+
     override fun onLoadChildren(parentId: String, result: Result<MutableList<MediaBrowserCompat.MediaItem>>) {
 
     }

radioplayer/src/main/java/com/likhanov/radioplayer/radio/RadioServiceCallback.kt

@@ -1,18 +1,7 @@
 package com.likhanov.radioplayer.radio
 
-import android.support.v4.media.MediaBrowserServiceCompat
-import com.likhanov.radioplayer.model.NotificationData
-
 interface RadioServiceCallback {
-    fun init(service: MediaBrowserServiceCompat, serviceClass: Class<*>)
-    fun updateUrl(url: String, masterStream: Boolean = false)
-    fun setAd(url:String)
-    fun setSessionActivity(activity: Class<*>)
-    fun updateNotification(data: NotificationData?)
-    fun setDefaultDrawable(drawableRes: Int)
-    fun setActivityForNotificationIntent(activity: Class<*>)
-    fun setNotificationDrawable(drawableRes: Int)
-    fun isPlaying(): Boolean
-    fun isPaused(): Boolean
-    fun isRestarted(): Boolean
+    fun onDaastStart(image: String, link: String)
+    fun onDaastEnd()
+    fun onDaastError()
 }

radioplayer/src/main/java/com/likhanov/radioplayer/radio/RadioServiceListener.kt

@@ -0,0 +1,20 @@
+package com.likhanov.radioplayer.radio
+
+import android.support.v4.media.MediaBrowserServiceCompat
+import com.likhanov.radioplayer.model.NotificationData
+
+interface RadioServiceListener {
+    fun init(service: MediaBrowserServiceCompat, serviceClass: Class<*>)
+    fun updateUrl(url: String, masterStream: Boolean = false)
+    fun setAd(url:String)
+    fun setSessionActivity(activity: Class<*>)
+    fun updateNotification(data: NotificationData?)
+    fun setDefaultDrawable(drawableRes: Int)
+    fun setActivityForNotificationIntent(activity: Class<*>)
+    fun setNotificationDrawable(drawableRes: Int)
+    fun isPlaying(): Boolean
+    fun isPaused(): Boolean
+    fun isRestarted(): Boolean
+    fun setCallback(callback: RadioServiceCallback)
+    fun daastClicked()
+}