From eb43a6c1b86116028181d0e9b35290ad1f2113ac Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Mon, 16 Jan 2023 01:24:41 +0800
Subject: [PATCH] =?UTF-8?q?[BugFix]=E8=A7=A3=E5=86=B3=E8=AF=95=E5=90=AC?=
 =?UTF-8?q?=E5=A3=B0=E9=9F=B3=E5=8F=AA=E8=83=BD=E5=88=B059=E7=A7=92?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/audio/SoundSignatureActivity.kt     |  2 +-
 .../erban/audio/helper/AudioPlayerHelper.java |  2 +-
 .../erban/audio/viewmodel/SoundViewModel.kt   | 20 ++++++++++++-------
 .../erban/audio/widget/RoundProgressView.java |  6 +++---
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt b/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt
index f59f4a055..5ca342fed 100644
--- a/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt
@@ -409,7 +409,7 @@ class SoundSignatureActivity : BaseViewBindingActivity<ActivitySoundSignatureBin
         }
     }
 
-    private fun stopSvga(){
+    private fun stopSvga() {
         binding.svgRecorder.stopAnimation()
         binding.svgRecorder.clear()
     }
diff --git a/app/src/main/java/com/yizhuan/erban/audio/helper/AudioPlayerHelper.java b/app/src/main/java/com/yizhuan/erban/audio/helper/AudioPlayerHelper.java
index 457ea93bc..326f4df8e 100644
--- a/app/src/main/java/com/yizhuan/erban/audio/helper/AudioPlayerHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/audio/helper/AudioPlayerHelper.java
@@ -19,7 +19,7 @@ import lombok.Getter;
  */
 public class AudioPlayerHelper {
 
-    private final static long mIntervalTime = 500L;
+    private final static long mIntervalTime = 100L;
 
     public interface WHAT_STATUS {
         int ERROR = 1;
diff --git a/app/src/main/java/com/yizhuan/erban/audio/viewmodel/SoundViewModel.kt b/app/src/main/java/com/yizhuan/erban/audio/viewmodel/SoundViewModel.kt
index a26d74be1..0ca563219 100644
--- a/app/src/main/java/com/yizhuan/erban/audio/viewmodel/SoundViewModel.kt
+++ b/app/src/main/java/com/yizhuan/erban/audio/viewmodel/SoundViewModel.kt
@@ -10,7 +10,6 @@ import com.yizhuan.erban.R
 import com.yizhuan.erban.audio.SoundSignatureActivity
 import com.yizhuan.erban.audio.helper.AudioPlayerHelper
 import com.yizhuan.erban.audio.helper.OnPlayListener
-import com.yizhuan.erban.audio.presenter.RecordingVoicePresenter
 import com.yizhuan.erban.base.BaseViewModel
 import com.yizhuan.xchat_android_core.audio.AudioPlayAndRecordManager
 import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
@@ -22,7 +21,6 @@ import com.yizhuan.xchat_android_library.utils.ResUtil
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil
 import com.yizhuan.xchat_android_library.utils.log.MLog
 import java.io.File
-import kotlin.math.roundToInt
 
 /**
  * @author wushaocheng
@@ -135,7 +133,7 @@ class SoundViewModel : BaseViewModel() {
                     recordType: RecordType
                 ) {
                     val dura = audioLength.toDouble() / 1000
-                    audioDur = dura.roundToInt()
+                    audioDur = dura.toInt()
                     audioFile = file
                     Log.d(
                         TAG, "onRecordSuccess : " + file.path
@@ -224,7 +222,7 @@ class SoundViewModel : BaseViewModel() {
         }
         // 正在播放：停止播放
         AudioPlayerHelper.get().onPause()
-        if(audioState != STATE_RECORD_NORMAL) {
+        if (audioState != STATE_RECORD_NORMAL) {
             _refreshPlayStatusLiveData.value = false // onPause() 停止播放并显示停止状态（播放按钮）
         }
     }
@@ -287,7 +285,11 @@ class SoundViewModel : BaseViewModel() {
                                 TAG,
                                 "duration = $currDuration"
                             )
-                            _showCountDownLiveData.value = (currDuration / 1000).toInt()
+                            if ((SoundSignatureActivity.MAX_RECORD_VOICE_DURATION * 1000L) - currDuration <= 500) {
+                                _showCountDownLiveData.value = (currDuration / 1000).toInt() + 1
+                            } else {
+                                _showCountDownLiveData.value = (currDuration / 1000).toInt()
+                            }
                         }
 
                         override fun onCompletion() {
@@ -295,7 +297,7 @@ class SoundViewModel : BaseViewModel() {
                         }
                     })
                     _refreshPlayStatusLiveData.value = true// 点击试听按钮此时并没有正在播放声音，则播放声音并显示正在播放状态（暂停按钮）
-                }else if(null != audioUrl && audioUrl?.contains("http") == true){
+                } else if (null != audioUrl && audioUrl?.contains("http") == true) {
                     MLog.debug(TAG, "play audioUrl: $audioUrl")
                     AudioPlayerHelper.get().playInThread(audioUrl, object : OnPlayListener {
                         override fun onError(error: String) {
@@ -311,7 +313,11 @@ class SoundViewModel : BaseViewModel() {
                                 TAG,
                                 "duration = $currDuration"
                             )
-                            _showCountDownLiveData.value = (currDuration / 1000).toInt()
+                            if ((SoundSignatureActivity.MAX_RECORD_VOICE_DURATION * 1000L) - currDuration <= 500) {
+                                _showCountDownLiveData.value = (currDuration / 1000).toInt() + 1
+                            } else {
+                                _showCountDownLiveData.value = (currDuration / 1000).toInt()
+                            }
                         }
 
                         override fun onCompletion() {
diff --git a/app/src/main/java/com/yizhuan/erban/audio/widget/RoundProgressView.java b/app/src/main/java/com/yizhuan/erban/audio/widget/RoundProgressView.java
index bbbb47754..f0ac686a1 100644
--- a/app/src/main/java/com/yizhuan/erban/audio/widget/RoundProgressView.java
+++ b/app/src/main/java/com/yizhuan/erban/audio/widget/RoundProgressView.java
@@ -148,9 +148,9 @@ public class RoundProgressView extends View {
             canvas.drawArc(oval, -90, ((float)mProgress / mTotalProgress) * 360, false, mRingPaint); //
 
             //字体
-            String txt = mProgress + "%";
-            mTxtWidth = mTextPaint.measureText(txt, 0, txt.length());
-            canvas.drawText(txt, mXCenter - mTxtWidth / 2, mYCenter + mTxtHeight / 4, mTextPaint);
+//            String txt = mProgress + "%";
+//            mTxtWidth = mTextPaint.measureText(txt, 0, txt.length());
+//            canvas.drawText(txt, mXCenter - mTxtWidth / 2, mYCenter + mTxtHeight / 4, mTextPaint);
         }
     }
     public void setText(String string){