From dc90bd0cd3d8658ee31d76b4f00b1d0e4c5fbd7f Mon Sep 17 00:00:00 2001
From: xianing <xianing@agora.io>
Date: Wed, 3 Nov 2021 10:56:18 +0800
Subject: [PATCH] fix regression issues

---
 .../examples/advanced/PlayAudioFiles.java     | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/PlayAudioFiles.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/PlayAudioFiles.java
index 89144ec19..5ea177c56 100644
--- a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/PlayAudioFiles.java
+++ b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/PlayAudioFiles.java
@@ -22,8 +22,6 @@
 import com.yanzhenjie.permission.AndPermission;
 import com.yanzhenjie.permission.runtime.Permission;
 
-import java.text.SimpleDateFormat;
-
 import io.agora.api.component.Constant;
 import io.agora.api.example.R;
 import io.agora.api.example.annotation.Example;
@@ -202,7 +200,6 @@ public void onDestroy()
         /**leaveChannel and Destroy the RtcEngine instance*/
         if(engine != null)
         {
-            stopProgressTimer();
             engine.leaveChannel();
         }
         handler.post(RtcEngine::destroy);
@@ -270,12 +267,11 @@ else if(v.getId() == R.id.bgmStart)
         {
             sliderSpeed.setProgress(50);
             engine.startAudioMixing(currentMusic, false, false, -1, 0);
+            engine.getAudioFileInfo(currentMusic);
             startProgressTimer();
         }
         else if(v.getId() == R.id.bgmStop){
             engine.stopAudioMixing();
-            progressText.setText("00:00");
-            mixingProgressBar.setProgress(0);
             stopProgressTimer();
         }
         else if(v.getId() == R.id.bgmResume){
@@ -327,15 +323,19 @@ else if (v.getId() == R.id.btn_effect)
     }
 
     private void stopProgressTimer() {
+        mixingProgressBar.setProgress(0);
         handler.removeCallbacksAndMessages(null);
     }
 
     private void startProgressTimer() {
-        engine.getAudioFileInfo(Constant.URL_PLAY_AUDIO_FILES);
-        int position = engine.getAudioMixingCurrentPosition();
-        handler.post(()->mixingProgressBar.setProgress(position));
-        handler.postDelayed(this::startProgressTimer, 500);
+        if(engine != null) {
+            int currentPosition = engine.getAudioMixingCurrentPosition();
+            if (mixingProgressBar.getMax() != 0 && !mixingProgressBar.isPressed())
+                mixingProgressBar.setProgress(currentPosition);
+            handler.postDelayed(this::startProgressTimer, 1000);
+        }
     }
+
     /**
      * @param channelId Specify the channel name that you want to join.
      *                  Users that input the same channel name join the same channel.*/
@@ -512,17 +512,8 @@ public void onUserOffline(int uid, int reason)
 
         @Override
         public void onRequestAudioFileInfo(AudioFileInfo info, int error) {
-            if(info.durationMs > 0 && progressText.getText().equals("00:00")) {
-                Log.d(TAG, "onRequestAudioFileInfo: "+info.durationMs);
-                handler.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        mixingProgressBar.setMax(info.durationMs);
-                        String timeString = new SimpleDateFormat("mm:ss").format(info.durationMs);
-                        progressText.setText(timeString);
-                    }
-                });
-            }
+            Log.d(TAG, "onRequestAudioFileInfo: "+info.durationMs);
+            handler.post(()-> mixingProgressBar.setMax(info.durationMs));
         }
     };
 
@@ -549,6 +540,9 @@ else if(seekBar.getId() == R.id.mixingVolBar){
              * @param volume: Audio mixing volume. The value ranges between 0 and 100 (default).
              */
             engine.adjustAudioMixingVolume(progress);
+        }else if(seekBar.getId() == R.id.mixingProgress){
+            String durationText = io.agora.api.example.utils.TextUtils.durationFormat((long) progress);
+            progressText.setText(durationText);
         }else if(seekBar.getId() == R.id.slider_speed_fg_audio_file){
            updateSpeedTitle();
         }