From a7f67dc72ed5de6ebfb3314eaf9c5d5000e1feb9 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Wed, 18 Dec 2024 15:23:08 +0900
Subject: [PATCH] =?UTF-8?q?=ED=94=8C=EB=A0=88=EC=9D=B4=EC=96=B4=20?=
 =?UTF-8?q?=EC=9E=AC=EC=83=9D=20=EC=99=84=EB=A3=8C=20-=20=EB=8B=A4?=
 =?UTF-8?q?=EC=9D=8C=20=EC=9E=AC=EC=83=9D=ED=95=A0=20=EC=BD=98=ED=85=90?=
 =?UTF-8?q?=EC=B8=A0=EA=B0=80=20=EC=97=86=EC=9D=84=20=EB=95=8C=20=EC=84=9C?=
 =?UTF-8?q?=EB=B9=84=EC=8A=A4=EB=A5=BC=20=EC=A2=85=EB=A3=8C=ED=95=B4=20?=
 =?UTF-8?q?=ED=94=8C=EB=A0=88=EC=9D=B4=EC=96=B4=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=9E=AC=EC=83=9D=20=EB=B0=8F=20=EC=9D=B4=EC=A0=84/=EB=8B=A4?=
 =?UTF-8?q?=EC=9D=8C=20=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=9E=AC=EC=83=9D?=
 =?UTF-8?q?=EC=9D=B4=20=EC=95=88=EB=90=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/other.xml                                       | 11 +++++++++++
 .../player/AudioContentPlayerFragment.kt              |  6 +++++-
 .../audio_content/player/AudioContentPlayerService.kt |  8 +++-----
 .../player/AudioContentPlaylistManager.kt             |  4 ++++
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/.idea/other.xml b/.idea/other.xml
index 104e542..b45a6e0 100644
--- a/.idea/other.xml
+++ b/.idea/other.xml
@@ -14,6 +14,17 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1280" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="OPPO" />
+          <option name="codename" value="OP573DL1" />
+          <option name="id" value="OP573DL1" />
+          <option name="manufacturer" value="OPPO" />
+          <option name="name" value="CPH2557" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="28" />
           <option name="brand" value="DOCOMO" />
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerFragment.kt
index af2d168..c161c08 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerFragment.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerFragment.kt
@@ -236,7 +236,11 @@ class AudioContentPlayerFragment(
             override fun onPlaybackStateChanged(playbackState: Int) {
                 mediaController?.let {
                     when (playbackState) {
-                        Player.STATE_ENDED -> it.seekTo(0)
+                        Player.STATE_ENDED -> {
+                            it.seekTo(0)
+                            it.pause()
+                        }
+
                         else -> {}
                     }
                 }
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerService.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerService.kt
index 59b3615..bd1a7e9 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerService.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlayerService.kt
@@ -104,8 +104,6 @@ class AudioContentPlayerService : MediaSessionService() {
                 } else if (playbackState == Player.STATE_ENDED) {
                     if (playlistManager!!.hasNextContent()) {
                         playNextContent()
-                    } else {
-                        onStopService()
                     }
                 }
             }
@@ -267,8 +265,8 @@ class AudioContentPlayerService : MediaSessionService() {
                 content.id,
                 onSuccess = { urlGenerateSuccess(content, it) },
                 onFailure = {
-                    if (playlistManager!!.hasNextContent()) {
-                        playNextContent()
+                    if (playlistManager!!.hasPreviousContent()) {
+                        playPreviousContent()
                     } else {
                         onStopService()
                     }
@@ -291,7 +289,7 @@ class AudioContentPlayerService : MediaSessionService() {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                     {
-                        if (it.success && it.data != null) {
+                        if (it.success && it.data != null && it.data.contentUrl.isNotBlank()) {
                             onSuccess(it.data.contentUrl)
                         } else {
                             onFailure()
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlaylistManager.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlaylistManager.kt
index cd1c373..79d9550 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlaylistManager.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/player/AudioContentPlaylistManager.kt
@@ -24,4 +24,8 @@ class AudioContentPlaylistManager(private val playlist: List<AudioContentPlaylis
     fun hasNextContent(): Boolean {
         return currentIndex + 1 < playlist.size
     }
+
+    fun hasPreviousContent(): Boolean {
+        return currentIndex - 1 > 0
+    }
 }