From f763279f89931f7a34427dc01ef1e6868210b5e8 Mon Sep 17 00:00:00 2001
From: ocean <503259349@qq.com>
Date: Thu, 4 Jul 2024 17:33:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB=E6=82=AC?=
 =?UTF-8?q?=E6=B5=AE=E6=A1=86=E7=9A=84=E8=BF=9B=E5=85=A5=E5=B4=A9=E6=BA=83?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E5=9B=A0=E6=98=AF=E5=8A=A0=E8=BD=BD=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E8=BF=9B=E5=85=A5=E4=BA=86=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E6=9D=A1=E4=BF=AE=E6=94=B9=E7=9A=84=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../music/activity/MoPlayDetailsActivity.kt   | 38 ++++++++++---------
 .../res/layout/activity_mo_play_details.xml   |  2 -
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/melody/offline/music/activity/MoPlayDetailsActivity.kt b/app/src/main/java/melody/offline/music/activity/MoPlayDetailsActivity.kt
index 83e2706..650dd54 100644
--- a/app/src/main/java/melody/offline/music/activity/MoPlayDetailsActivity.kt
+++ b/app/src/main/java/melody/offline/music/activity/MoPlayDetailsActivity.kt
@@ -496,23 +496,24 @@ class MoPlayDetailsActivity : MoBaseActivity(), Player.Listener {
             binding.progressDurationTv.text = currentString
             if (MediaControllerManager.getDuration() > 0) {
                 binding.totalDurationTv.visibility = View.VISIBLE
+
+                binding.totalDurationTv.text =
+                    convertMillisToMinutesAndSecondsString(MediaControllerManager.getDuration())
+                val valueTo = MediaControllerManager.getDuration().toFloat()
+                binding.sbProgress.valueTo = valueTo
+                val value = MediaControllerManager.getCurrentPosition().toFloat()
+                if (valueTo > value) {
+                    binding.sbProgress.value = value
+                }
+                updateProgressState()
+
+                binding.progressBar.progress = MediaControllerManager.getBufferedPosition().toInt()
+                binding.progressBar.max = MediaControllerManager.getDuration().toInt()
+                updateProgressBufferingState()
+                updatePlayListDataAndAdapter()
             } else {
                 binding.totalDurationTv.visibility = View.GONE
             }
-
-            binding.totalDurationTv.text =
-                convertMillisToMinutesAndSecondsString(MediaControllerManager.getDuration())
-            binding.sbProgress.valueTo = MediaControllerManager.getDuration().toFloat()
-            val value = MediaControllerManager.getCurrentPosition().toFloat()
-            if (binding.sbProgress.valueTo > value) {
-                binding.sbProgress.value = value
-            }
-            updateProgressState()
-
-            binding.progressBar.progress = MediaControllerManager.getBufferedPosition().toInt()
-            binding.progressBar.max = MediaControllerManager.getDuration().toInt()
-            updateProgressBufferingState()
-            updatePlayListDataAndAdapter()
         }
     }
 
@@ -637,7 +638,9 @@ class MoPlayDetailsActivity : MoBaseActivity(), Player.Listener {
             toggleBottomLayout()
         }
         binding.progressBar.progress = 0
-        binding.sbProgress.value = 0f
+        if (binding.sbProgress.valueTo > 0f) {
+            binding.sbProgress.value = 0f
+        }
         binding.sbProgress.addOnChangeListener { slider, value, fromUser ->
             if (fromUser) {
                 if (meController != null) {
@@ -822,7 +825,9 @@ class MoPlayDetailsActivity : MoBaseActivity(), Player.Listener {
     }
 
     private fun updateProgressUi() {
-        binding.sbProgress.value = 0f
+        if (binding.sbProgress.valueTo > 0f) {
+            binding.sbProgress.value = 0f
+        }
         binding.progressBar.progress = 0
         binding.progressDurationTv.text = convertMillisToMinutesAndSecondsString(0L)
         binding.totalDurationTv.visibility = View.GONE
@@ -890,7 +895,6 @@ class MoPlayDetailsActivity : MoBaseActivity(), Player.Listener {
                 val currentBufferedPosition = MediaControllerManager.getBufferedPosition()
                 binding.progressBar.progress = currentBufferedPosition.toInt()
 
-
                 val value = currentPosition.toFloat()
                 if (binding.sbProgress.valueTo > value) {
                     binding.sbProgress.value = value
diff --git a/app/src/main/res/layout/activity_mo_play_details.xml b/app/src/main/res/layout/activity_mo_play_details.xml
index 044f55f..e5819cf 100644
--- a/app/src/main/res/layout/activity_mo_play_details.xml
+++ b/app/src/main/res/layout/activity_mo_play_details.xml
@@ -292,8 +292,6 @@
                             android:id="@+id/sbProgress"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:value="10"
-                            android:valueTo="100"
                             app:labelBehavior="gone"
                             app:thumbColor="@color/white"
                             app:thumbRadius="6dp"